ULF WENDEL [Tue, 23 Oct 2012 09:18:43 +0000 (11:18 +0200)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
merged changes for bug #63297 from 5.3
fixed a typo in the error message
Fixed bug #63297 Phar fails to write an openssl based signature
enabled libxpm for gd on windows
enabled libxpm for gd on windows
Add missed file
Use if_nametoindex in Vista
Update test script
Test for #63336, xfail now
Fixed bug #63305 (zend_mm_heap corrupted with traits)
fix crashes in newly introduced macros when normal trace is disabled but memory traced is enabled.
Anatoliy Belsky [Wed, 24 Oct 2012 11:38:44 +0000 (13:38 +0200)]
Fixed bug #63297 Phar fails to write an openssl based signature
Unitialized values warnings seem to be everyday life
when working with openssl. For more read
http://www.openssl.org/support/faq.html#PROG13
So just fixing so the bug, no care about those
warnings.
ULF WENDEL [Mon, 22 Oct 2012 11:35:06 +0000 (13:35 +0200)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: (27 commits)
Re-fixed bug #60901 (Improve "tail" syntax for AIX installation)
updated NEWS
update NEWS
updated NEWS
Fixed bug #63284 PCRE upgrade to 8.31
preg indenpent test script for #63055
Update libmagic.patch
Add fix & missing fix
Add fix & missing fix
Fixed bug #63307 (Unused variable in oci8.c)
Fixed bug #63265 (Add ORA-00028 to the PHP_OCI_HANDLE_ERROR macro)
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
add protection against core dumps if the underlying library returns 0x0 for some reason
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
I forgot that inconsistent is only avaliable in debug mode
Add comments
...
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src: (75 commits)
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
add protection against core dumps if the underlying library returns 0x0 for some reason
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
I forgot that inconsistent is only avaliable in debug mode
Add comments
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
fix NEWS
fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql
fix build with libmysql on Ubuntu 12.04 x64 probably other mixed 32/64 systems
fix newly introduced segfault
Fixed bug #63248 Load multiple magic files on win
Cover have_ssl=NO and have_ssl=DISABLED
Updating expected output in anticipation of mysqlnd_auth.c path
updated NEWS
Refactor to using a stack based zval instead of dynamic allocation
...
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src: (22 commits)
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
I forgot that inconsistent is only avaliable in debug mode
Add comments
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
fix NEWS
fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql
Fixed bug #63248 Load multiple magic files on win
Cover have_ssl=NO and have_ssl=DISABLED
- BFN
- Fixed bug #63214 (Large PDO Firebird Queries)
Fix bug #63240 on stream_get_line()
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
fixed tests for gd having freetype >= 2.4.10
Fixed bug #63258 (seg fault with PDO and dblib using DBSETOPT(H->link, DBQUOTEDIDENT, 1))
...
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
* 'PHP-5.3' of https://git.php.net/repository/php-src:
- Updated to version 2012.7 (2012g)
SUpport newer bisons.
Merge the fix for #61964 to 5.3, which will fix #63304
indent
better fix for #63055
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
PHP 5.3.18 NEWS
fix NEWS
fix compilation failure on 32/64bit linux systems, when libmysql is used with ext/mysql
Cover have_ssl=NO and have_ssl=DISABLED
Minor changes for MySQL 5.6
NEWS for 76601c4
Fix bug #63240 on stream_get_line()
extended the SKIPIF section with ICU 49 (sync with 5.4 branch)
fixed tests for gd having freetype >= 2.4.10
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
Fix warnings preventing this test from passing
Remove executable permission on inc
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Implemented FR #63242 (Default error page in PHP built-in web server uses outdated html/css)
Fix warnings preventing this test from passing
Remove executable permission on inc
projects / php / log