Anatol Belski [Wed, 9 Dec 2015 11:05:18 +0000 (12:05 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
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
Anatol Belski [Wed, 9 Dec 2015 11:05:01 +0000 (12:05 +0100)]
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
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.
Anatol Belski [Wed, 9 Dec 2015 10:38:54 +0000 (11:38 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
ext/dba/config.m4: Autodetect Berkeley DB v5.3.
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.
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.
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.
Dmitry Stogov [Wed, 9 Dec 2015 02:17:22 +0000 (05:17 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Fixed bug #71066 (mb_send_mail: Program terminated with signal SIGSEGV, Segmentation fault)
move the entry into the correct NEWS block
Update NEWS
Fixed test if PATH is not set
Fixed bug #71063 (filter_input(INPUT_ENV, ..) does not work)
Refactored immplementation of https://wiki.php.net/rfc/class_const_visibility
@reeze created an RFC here and I emailed internals here and didn't get any responses positive/negative.
projects / php / log