Commit Graph

92952 Commits

Author SHA1 Message Date
Christopher Jones
e4a48ab6b3 Prepare for a PECL release 2015-12-12 16:07:57 +11:00
Christopher Jones
915a00cd8b Merge branch 'PHP-5.6' into PHP-7.0 2015-12-12 16:06:44 +11:00
Christopher Jones
8f7e98ac4a Prepare for a PECL release 2015-12-12 16:06:08 +11:00
Xinchen Hui
1358743f9c Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-12-11 09:13:00 -08:00
Xinchen Hui
778e5f3da5 Fixed bug #71092 (Segmentation fault with return type hinting) 2015-12-11 09:11:28 -08:00
Anatol Belski
050e21beed Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
  backported 7c981192eb from 7.0
2015-12-11 17:43:36 +01:00
Anatol Belski
57eecd4e29 update NEWS 2015-12-11 17:42:01 +01:00
Anatol Belski
157d0372e0 backported 7c981192eb from 7.0
the way it doesn't hurt BC
2015-12-11 17:39:57 +01:00
Nikita Popov
04407b79df Fixed bug #71094
I didn't see any non-dummy readline tests to work off, so this
change is tested manually only.

While at it also fix other zval_dtors and use ZVAL_COPY.
2015-12-11 16:33:07 +01:00
Nikita Popov
fd3ece8578 Fix bug #71086 2015-12-11 16:05:49 +01:00
Remi Collet
7a5c7e00cd NEWS 2015-12-11 13:23:21 +01:00
Remi Collet
66398757fc Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  NEWS
  Fix Bug #71089 No check to duplicate zend_extension
2015-12-11 13:22:55 +01:00
Remi Collet
d403a91c6f NEWS 2015-12-11 13:22:13 +01:00
Remi Collet
410eacc1a9 Fix Bug #71089 No check to duplicate zend_extension 2015-12-11 13:21:24 +01:00
Xinchen Hui
b5adfee320 Fixed bug memleak in header_register_callback 2015-12-11 17:26:31 +08:00
Nikita Popov
5c5209d676 Fix cleanup in bug70748.phpt
git add Zend/tests usable again...
2015-12-10 19:14:49 +01:00
Nikita Popov
798d168d73 Make update_opN_const implementation symmetric
So the main structure is the same...
2015-12-10 18:18:10 +01:00
Nikita Popov
37f3425263 Fix Foo::${42} and similar
Fixes segfault on direct use, segfault on opcache evaluated use,
leak on temporary use.

Fixes analogeous segfault for ${42} on opcache eval as well.
2015-12-10 18:14:40 +01:00
Lior Kaplan
a19f511345 Align NEWS entry format for bug #71024 2015-12-10 15:31:06 +02:00
Xinchen Hui
c096a281be The first arg is optional 2015-12-10 19:36:41 +08:00
Xinchen Hui
e4ad9ed8ad Return -1 seems bug here 2015-12-10 17:35:35 +08:00
Anatol Belski
e2e39f3bfc set release date 2015-12-10 08:11:23 +01:00
Xinchen Hui
29b615cfcf iFixed key leak with invalid resource 2015-12-10 15:02:01 +08:00
Xinchen Hui
7c1ddcc67f Fixed bug #71077 (ReflectionMethod for ArrayObject constructor returns wrong number of parameters) 2015-12-10 08:58:28 +08:00
Ferenc Kovacs
91adffb4d1 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  5.6.18 will be next
2015-12-10 01:31:51 +01:00
Ferenc Kovacs
7d5dbaed76 5.6.18 will be next 2015-12-10 01:30:27 +01:00
Anatol Belski
6f9819db38 fixed NEWS 2015-12-09 14:48:44 +01:00
Xinchen Hui
8ba6fea7b1 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-12-09 21:08:57 +08:00
Xinchen Hui
4c379392b2 Fixed bug #71067 (Local object in class method stays in memory for each call) 2015-12-09 21:07:59 +08:00
Anatol Belski
f444c7619e update NEWS 2015-12-09 13:39:07 +01:00
Anatol Belski
3d487fb8d1 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
2015-12-09 13:38:41 +01:00
Anatol Belski
e4238f4bf5 update NEWS 2015-12-09 13:37:37 +01:00
Anatol Belski
906670b817 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  ext/imap/config.m4: fix conftest segfault in utf8_to_mutf7 check, bug #66909.
  ext/dba/config.m4: Autodetect Berkeley DB v5.3.
  fix path separator in test
  Bumped SAPI version to 6.9
  Added "mod_auth_basic" to apache module list.
  Add sanitizing checks for request data.
  Clear secret after use.
  Fixed __DIR__ in CLI mode.
  Add PDO_Firebird fix in NEWS
2015-12-09 12:05:01 +01:00
Michael Orlitzky
24f21a3012 ext/imap/config.m4: fix conftest segfault in utf8_to_mutf7 check, bug #66909.
The test program for utf8_to_mutf7 attempts to call it without
arguments. The function expects one argument, however, and this leads
to a segfault as reported in PHP bug #66909.

The test program is using the PHP_IMAP_TEST_BUILD macro which
complicates things a little. To keep this diff small, the
PHP_IMAP_TEST_BUILD macro was modified to pass a fifth argument
"extra-source" to the PHP_TEST_BUILD macro. The check for
utf8_to_mutf7 was then modified to check for a dummy function,
utf8_to_mutf7_php, which passes the correct number of arguments to
utf8_to_mutf7.

PHP-Bug: https://bugs.php.net/bug.php?id=66909
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=376735
2015-12-09 12:04:16 +01:00
Anatol Belski
843341954e update NEWS 2015-12-09 11:57:03 +01:00
Michael Orlitzky
05f00e5060 ext/dba/config.m4: Autodetect Berkeley DB v5.3.
When the user passes --with-db4=DIR to ./configure, the directory DIR
is searched for a number of paths in order of preference. These paths
contain possible locations for Berkeley DB (BDB) to be installed, and
since PHP only supports BDB-4.x and BDB-5.x, it's important that (for
example) version 5.1 be autodetected before falling back to
/usr/include/db.h which can point to BDB-6.x.

The newer BDB-5.3 works with PHP, and if only BDB-5.3 is installed on
the user's system, the current ./configure script is fine. However, if
both BDB-5.3 and BDB-6.0 are installed, version 5.3 is not
autodetected, causing BDB-6.0 to be used. The ./configure step then fails.

This commit adds autodetection for BDB-5.3, and fixes a bug reported
on Gentoo at https://bugs.gentoo.org/show_bug.cgi?id=564824.
2015-12-09 11:37:50 +01:00
George Wang
6d933b463e Bumped SAPI version to 6.9 2015-12-09 11:37:46 +01:00
George Wang
b3458eddfd Added "mod_auth_basic" to apache module list. 2015-12-09 11:37:45 +01:00
George Wang
5a319a02d8 Add sanitizing checks for request data. 2015-12-09 11:37:43 +01:00
George Wang
af1ac753fe Clear secret after use. 2015-12-09 11:37:42 +01:00
George Wang
42789e2b8a Fixed __DIR__ in CLI mode. 2015-12-09 11:37:40 +01:00
Dmitry Stogov
4b16082e94 More verbose error messages 2015-12-09 13:34:45 +03:00
Michael Orlitzky
38b68fc042 ext/dba/config.m4: Autodetect Berkeley DB v5.3.
When the user passes --with-db4=DIR to ./configure, the directory DIR
is searched for a number of paths in order of preference. These paths
contain possible locations for Berkeley DB (BDB) to be installed, and
since PHP only supports BDB-4.x and BDB-5.x, it's important that (for
example) version 5.1 be autodetected before falling back to
/usr/include/db.h which can point to BDB-6.x.

The newer BDB-5.3 works with PHP, and if only BDB-5.3 is installed on
the user's system, the current ./configure script is fine. However, if
both BDB-5.3 and BDB-6.0 are installed, version 5.3 is not
autodetected, causing BDB-6.0 to be used. The ./configure step then fails.

This commit adds autodetection for BDB-5.3, and fixes a bug reported
on Gentoo at https://bugs.gentoo.org/show_bug.cgi?id=564824.
2015-12-09 11:20:36 +01:00
Anatol Belski
56e7903131 fix path separator in test 2015-12-09 11:18:25 +01:00
Francois Laupretre
25abf2f028 Fix bug #70781 (Extension tests fail on dynamic ext dependency) 2015-12-09 11:05:34 +01:00
George Wang
00ed55005a Bumped SAPI version to 6.9 2015-12-09 00:28:08 -05:00
George Wang
0d84097d44 Added "mod_auth_basic" to apache module list. 2015-12-09 00:27:55 -05:00
George Wang
08080c18f5 Add sanitizing checks for request data. 2015-12-09 00:26:41 -05:00
George Wang
c60d4b9770 Clear secret after use. 2015-12-09 00:26:24 -05:00
George Wang
84fd8ffa2a Fixed __DIR__ in CLI mode. 2015-12-09 00:25:48 -05:00