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
Nikita Popov [Sat, 29 Jun 2013 19:51:54 +0000 (21:51 +0200)]
Don't try to clean up generator stack on unclean shutdown
This fixes bugs #65035 and #65161. In one of the bugs the issue is
that function_state.arguments is NULL, but the arg count is pushed
to the stack and the code tries to free it. In the other bug the
stack of the generator is freed twice, once in generator_close and
later during shutdown.
It's rather hard (if at all possible) to do a proper stack cleanup
on an unclean shutdown, so I'm just disabling it in this case.
* PHP-5.5:
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
* PHP-5.4:
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 'master' of https://git.php.net/repository/php-src
# By Felipe Pena (11) and others
# Via Felipe Pena (14) and others
* 'master' of https://git.php.net/repository/php-src: (27 commits)
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
BC fix for PR 109 merge - create_sid() method in SessionHandler
Tests, fixes and optimisations
Add create_sid to session_set_save_handler and SessionHandler
Fixed symbol export
Update NEWS
BC fix for PR 109 merge - create_sid() method in SessionHandler
Update NEWS:w
Fixed bug #65136 (RecursiveDirectoryIterator segfault)
- BFN
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
- Reclassify bug
- BFN
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
- Fixed test
add new test
Update NEWS
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
- Fixed typo on condition
...
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Felipe Pena (11) and others
# Via Felipe Pena (7) and others
* 'PHP-5.5' of https://git.php.net/repository/php-src: (22 commits)
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
Update NEWS
BC fix for PR 109 merge - create_sid() method in SessionHandler
Update NEWS:w
Fixed bug #65136 (RecursiveDirectoryIterator segfault)
- BFN
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
- Reclassify bug
- BFN
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
- Fixed test
add new test
Update NEWS
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
- Fixed typo on condition
- BFN
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
Update NEWS
- BFN
...
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Felipe Pena (9) and others
# Via Arpad Ray (1) and Felipe Pena (1)
* 'PHP-5.4' of https://git.php.net/repository/php-src:
Update NEWS
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
Fixed bug #65136 (RecursiveDirectoryIterator segfault)
- BFN
- Fixed bug #64467 (Segmentation fault after imap_reopen failure) patch by: askalski at gmail dot com
- Reclassify bug
- BFN
- Fixed bug #63983 (enabling FPM borks compile on FreeBSD) patch by: chibisuke at web dot de
- Fixed bug #63409 (php-dba function test fails on big-endian machine) patch by: tianhonglouis at gmail dot com
- Fixed test
add new test
Update NEWS
Fixed bug #65015 (pg_send_query does not flush send buffer) patch submitted by: adam at vektah dot net
- BFN
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
Arpad Ray [Thu, 27 Jun 2013 18:25:11 +0000 (19:25 +0100)]
Merge branch 'PHP-5.5'
* PHP-5.5:
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
Update NEWS
BC fix for PR 109 merge - create_sid() method in SessionHandler
Tests, fixes and optimisations
Add create_sid to session_set_save_handler and SessionHandler
Arpad Ray [Thu, 27 Jun 2013 18:05:23 +0000 (19:05 +0100)]
Fix bug #62535 - $_SESSION[$key]["cancel_upload"] doesn't work as documented
When uploading multiple files, the array in the session where the progress
data is stored (and cancel_upload key is set) was overwritten whenever the
progress data was updated, so pending uploads would proceed anyway.
projects / php / log