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
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.
Arpad Ray [Thu, 27 Jun 2013 11:33:56 +0000 (12:33 +0100)]
BC fix for PR 109 merge - create_sid() method in SessionHandler
Creates a new SessionIdInterface and moves create_sid() into it, so existing
handlers implementing SessionHandlerInterface don't require create_sid().
SessionHandler still includes the method so the default mod can be called, but
now implements both interfaces.
Leigh [Tue, 26 Jun 2012 13:57:10 +0000 (14:57 +0100)]
Tests, fixes and optimisations
* Amended existing tests to cater for new functionality.
* Implemented fixes and optimisations recommended by NikiC
* Added create_sid to the registered interface. This was breaking
tests. It also now breaks BC for people implementing the interface
directly instead of extending the class.
Leigh [Fri, 15 Jun 2012 14:06:47 +0000 (15:06 +0100)]
Add create_sid to session_set_save_handler and SessionHandler
A lot of code already existed to allow a custom create_sid handler, but
lacked a specific implementation.
Therefore I have added a 7th (optional) argument
session_set_save_handler, to allow a user function to be supplied for
session id generation.
If a create_sid function is not supplied, the default function is
called in its absence to preserve backwards compatibility.
Likewise create_sid only added to SessionHandler class, and not the
interface to maintain backwards compatibility. If the result is not
overridden, the default is called.
Arpad Ray [Thu, 27 Jun 2013 11:33:56 +0000 (12:33 +0100)]
BC fix for PR 109 merge - create_sid() method in SessionHandler
Creates a new SessionIdInterface and moves create_sid() into it, so existing
handlers implementing SessionHandlerInterface don't require create_sid().
SessionHandler still includes the method so the default mod can be called, but
now implements both interfaces.
Arpad Ray [Thu, 27 Jun 2013 10:27:49 +0000 (11:27 +0100)]
Merge PR 109 - Add create_sid to session_set_save_handler and SessionHandler
Allows user session handlers to create session IDs by adding an optional
7th argument to session_set_save_handler() and a create_sid() method
to SessionHandler.
Merge branch 'master' of https://git.php.net/repository/php-src
# By Felipe Pena
# Via Felipe Pena (8) and Christopher Jones (3)
* 'master' of https://git.php.net/repository/php-src:
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.5' of https://git.php.net/repository/php-src:
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.4' of https://git.php.net/repository/php-src:
- BFN
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
- Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
projects / php / log