archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 22:48:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
97004 commits 526 branches 1434 tags 873 MiB
Commit graph

404 commits

Author SHA1 Message Date
Matteo Beccati
445cb529b2 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders
  Fixed bug #70313 PDO statement fails to throw exception
 2016-07-10 14:38:17 +02:00
Matteo Beccati
4d677ae0e2 Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders 2016-07-10 14:36:07 +02:00
Matteo Beccati
11d74b5b79 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #70313 PDO statement fails to throw exception
 2016-07-10 14:34:59 +02:00
Matteo Beccati
219ebcb689 Fixed bug #70313 PDO statement fails to throw exception 2016-07-10 14:33:56 +02:00
Dmitry Stogov
323b2733f6 Fixed compilation warnings 2016-06-22 00:40:50 +03:00
Dmitry Stogov
1616038698 Added ZEND_ATTRIBUTE_FORMAT to some middind functions. 
"%p" replaced by ZEND_LONG_FMT to avoid compilation warnings.
Fixed most incorrect use cases of format specifiers.
 2016-06-21 16:00:37 +03:00
Anatol Belski
2ca86bb860 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Add test for bug #72294
  Fixed bug #72294 Segmentation fault/invalid pointer in connection with pgsql_stmt_dtor
 2016-06-01 11:57:00 +02:00
Anatol Belski
79b978db9a Add test for bug #72294 2016-06-01 11:55:35 +02:00
Anatol Belski
af8fa8e937 Fixed bug #72294 Segmentation fault/invalid pointer in connection with pgsql_stmt_dtor 2016-06-01 11:55:35 +02:00
Xinchen Hui
5717faa1e5 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed test (keyword is local related)
 2016-05-31 16:56:12 +08:00
Xinchen Hui
47fa763fae Fixed test (keyword is local related) 2016-05-31 16:55:58 +08:00
Xinchen Hui
233562c2da Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound)
 2016-05-11 11:12:46 +08:00
Xinchen Hui
66ad4fc393 Fixed bug #71573 (Segfault (core dumped) if paramno beyond bound) 2016-05-11 11:12:27 +08:00
Anatol Belski
31abb8ab50 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix merge mistake
 2016-04-06 18:06:40 +02:00
Anatol Belski
6489edb958 fix merge mistake 2016-04-06 18:05:39 +02:00
Anatol Belski
fc90ddf1f3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix tests
  PostgreSQL's PDOStatement::getColumnMeta() fills in table's name.
  fix indent
 2016-04-06 17:45:31 +02:00
Anatol Belski
26f9aa7211 fix tests 2016-04-06 17:43:49 +02:00
Petr Sýkora
aeb9c81c09 PostgreSQL's PDOStatement::getColumnMeta() fills in table's name. 2016-04-06 17:43:49 +02:00
Anatol Belski
052c1d337c fix indent 2016-04-06 17:43:49 +02:00
Anatol Belski
9056a36c9b Merge branch 'PHP-7.0' 
* PHP-7.0:
  add 32-bit specific variont for #62498
  skip test on 32-bit
 2016-04-06 14:07:03 +02:00
Anatol Belski
4f7d89a335 add 32-bit specific variont for #62498 2016-04-06 14:05:25 +02:00
Anatol Belski
02fc9cb31f skip test on 32-bit 
The Postgres INT8 datatype is handled as string on 32-bit
 2016-04-06 13:55:32 +02:00
Anatol Belski
ea4d27f47c Merge branch 'PHP-7.0' 
* PHP-7.0:
  update NEWS
  fix and extend test
  Don't roundtrip to the database to get the column type if you already know it
 2016-04-05 15:13:17 +02:00
Anatol Belski
c2cb4664bc fix and extend test 2016-04-05 15:06:17 +02:00
Joe Bylund
e10257ba80 Don't roundtrip to the database to get the column type if you already know it 
add_assoc_string now takes just three args

nikic's fix to move pqclear outside the if, would be a possible memory leak inside the if

(joe) check behavior of getColumnMeta
 2016-04-05 15:03:04 +02:00
Nikita Popov
93dc91b386 Remove version checks 
PHP_VERSION_ID
PHP_API_VERSION
ZEND_MODULE_API_NO
PHP_MAJOR_VERSION, PHP_MINOR_VERSION
ZEND_ENGINE_2

I've left litespeed alone, as it seems to genuinely maintain support
for many PHP versions.
 2016-01-30 15:35:28 +01:00
Xinchen Hui
36b4311edd Do not edit the value in place (might be relates to #71261) 2016-01-04 05:38:15 -08:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Anatol Belski
1184f0aca5 add test for bug #70861 2015-11-05 19:48:08 +01:00
Anatol Belski
5ba763413b fix test redirection when run not from source root 2015-10-23 09:42:19 +02:00
Dmitry Stogov
560e4fa393 Removed or simplified incorrect SEPARATE_*() macros usage. 2015-09-29 11:17:43 +03:00
Anatol Belski
b460b530d6 fix test 
backport from master
 2015-08-23 17:27:53 +02:00
Dmitry Stogov
4a2e40bb86 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 04:05:24 +03:00
Rasmus Lerdorf
28d7bb97a1 Fix more proto comments 2015-06-23 17:46:20 -04:00
Matteo Beccati
1f9df49139 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix copy/paste error in test
 2015-06-13 08:08:30 +02:00
Matteo Beccati
b564aa95be Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix copy/paste error in test
 2015-06-13 08:08:21 +02:00
Matteo Beccati
9e4d720825 Fix copy/paste error in test 2015-06-13 08:07:49 +02:00
Matteo Beccati
730d7b8fca Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
	ext/pdo_pgsql/pgsql_statement.c
 2015-06-12 02:08:30 +02:00
Matteo Beccati
3bb1a4ffe3 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps)
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
	ext/pdo_pgsql/pgsql_driver.c
 2015-06-12 02:07:02 +02:00
Matteo Beccati
b60efdce9f Fix bug #69344 (PDO PgSQL Incorrect binding numeric array with gaps) 2015-06-12 02:05:28 +02:00
Matteo Beccati
cd5b7e9688 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote)
  Fixed bug #61574 - No MSI

Conflicts:
	ext/pdo_pgsql/pgsql_driver.c
	win32/install.txt
 2015-06-12 00:27:31 +02:00
Matteo Beccati
afa4c3e7c7 Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote) 2015-06-12 00:21:48 +02:00
Matteo Beccati
7c0b8f872e Fix bug #69362 (PDO-pgsql fails to connect if password contains a leading single quote) 2015-06-12 00:20:33 +02:00
Anatol Belski
8cfe28259e Merge branch 'PHP-5.6' 
* PHP-5.6:
  rework that test to allow delta for rounding errors
 2015-06-11 17:07:24 +02:00
Anatol Belski
702e349df4 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  rework that test to allow delta for rounding errors
 2015-06-11 17:06:46 +02:00
Anatol Belski
a037b6de21 rework that test to allow delta for rounding errors 
If this workout doesn't make travis happy, the patch needs to be
reviewed as the leak might still persist.
 2015-06-11 17:05:03 +02:00
Anatol Belski
227680d6da Merge branch 'PHP-5.6' 
* PHP-5.6:
  improve test
 2015-06-11 15:37:06 +02:00
Anatol Belski
d777669679 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  improve test
 2015-06-11 15:36:30 +02:00
Anatol Belski
dcfd1153ec improve test 2015-06-11 15:36:02 +02:00