com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/ var_unserializer.c
| From: | Michael Wallner | Date: | Mon, 19 Aug 2013 22:08:55 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/ var_unserializer.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-73002@lists.php.net to get a copy of this message | ||
Commit: 9d2cdacf4a36045120aab049b03229bf0064df4e
Author: Michael Wallner <mike@php.net> Tue, 20 Aug 2013 00:08:55 +0200
Parents: 69f12ad582c102c1d7b3b2c0ae6cf7cd633dfe1d 1ac4d8f2c632f5be5a02d49c1e0d3b1fb515e4a8
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9d2cdacf4a36045120aab049b03229bf0064df4e
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix bug #65481 (shutdown segfault due to serialize)
Conflicts:
ext/standard/var_unserializer.c
Bugs:
https://bugs.php.net/65481
Changed paths:
MM ext/standard/var_unserializer.c
Diff: