Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Merge PHP 5.3.27 NEWS
add test for bug #65236
fix possible resource leak and make sure there's something to qsort()
Cleanup temp file
- Updated to version 2013.4 (2013d)
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:
Merge PHP 5.3.27 NEWS
add test for bug #65236
fix possible resource leak and make sure there's something to qsort()
- Updated to version 2013.4 (2013d)
Rob Richards [Sat, 6 Jul 2013 12:01:31 +0000 (08:01 -0400)]
Merge branch 'PHP-5.5'
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.5:
truncate results at depth of 255 to prevent corruption
fix assembly of safe_address() for x86 and x86_64
fix assembly of safe_address() for x86 and x86_64
Rob Richards [Sat, 6 Jul 2013 12:00:58 +0000 (08:00 -0400)]
Merge branch 'PHP-5.4' into PHP-5.5
# By Nuno Lopes (2) and Rob Richards (1)
* PHP-5.4:
truncate results at depth of 255 to prevent corruption
fix assembly of safe_address() for x86 and x86_64
fix assembly of safe_address() for x86 and x86_64
The msdn doc states 'strftime returns the number of characters', but prior
to VS2012 it seems to have returned the number of bytes. Locale independent.
The return is however \0-terminated, so strlen is just fine. The behaivor
seems to be persisting in the later VC++ versions as the corresponding
MSDN ticket is closed 'by design'.
See http://connect.microsoft.com/VisualStudio/feedback/details/766205/vs2012-strftime-has-incorrect-return-value-in-vc-11-with-multibyte-codepages#details
* PHP-5.5:
Fixed mysql tests parsing phpinfo()
Add a few links
Update NEWS
Fixed bug #35703: when session_name("123") consist only digits, should warning
Fixed bug #49175: mod_files.sh does not support hash bits
* PHP-5.4:
Fixed mysql tests parsing phpinfo()
Update NEWS
Fixed bug #35703: when session_name("123") consist only digits, should warning
Fixed bug #49175: mod_files.sh does not support hash bits
Merge branch 'master' of https://git.php.net/repository/php-src
# By Yasuo Ohgaki (5) and others
# Via Stanislav Malyshev (5) and others
* 'master' of https://git.php.net/repository/php-src:
added test code for #65045.
fixed #65045: mb_convert_encoding breaks well-formed character.
Don't try to clean up generator stack on unclean shutdown
NEWS
Added PHP_FCGI_BACKLOG, overrides the default listen backlog
Merge branch 'PHP-5.5' into master
Fixed bug #49175: mod_files.sh does not support hash bits
Fixed bug #35703: when session_name("123") consist only digits, should warning
Fixed bug #49175: mod_files.sh does not support hash bits
Fixed bug #49175: mod_files.sh does not support hash bits
add fix for #60560 into upgrading
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
Update NEWS
small optimization
fix bug #61860: use USearch for searches, it does the right thing
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Stanislav Malyshev (3) and others
# Via Stanislav Malyshev (3) and Nikita Popov (1)
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Don't try to clean up generator stack on unclean shutdown
NEWS
Added PHP_FCGI_BACKLOG, overrides the default listen backlog
Fixed bug #49175: mod_files.sh does not support hash bits
add fix for #60560 into upgrading
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
Update NEWS
small optimization
fix bug #61860: use USearch for searches, it does the right thing
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Stanislav Malyshev (3) and others
# Via Stanislav Malyshev (1) and Yasuo Ohgaki (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Update NEWS
Fixed bug #35703: when session_name("123") consist only digits, should warning
Fixed bug #49175: mod_files.sh does not support hash bits
add fix for #60560 into upgrading
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
small optimization
fix bug #61860: use USearch for searches, it does the right thing