com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pcre/php _pcre.c
| From: | Stanislav Malyshev | Date: | Mon, 03 Nov 2014 19:37:43 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pcre/php _pcre.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82938@lists.php.net to get a copy of this message | ||
Commit: 279550ee85493c87dca91feefe9d5b97af82d323
Author: Stanislav Malyshev <stas@php.net> Mon, 3 Nov 2014 11:37:43 -0800
Parents: 3918e544d86532ffede42f45ac278daf5c4e8e0f c351b47ce85a3a147cfa801fa9f0149ab4160834
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php..net/?p=php-src.git;a=commitdiff;h=279550ee85493c87dca91feefe9d5b97af82d323
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Initialize the offset table - PCRE may sometimes miss offsets
set default response code to 200
fix NEWS & version
NEWS
Fix bug #68283: fileinfo: out-of-bounds read in elf note headers
Fix bug #68113 (Heap corruption in exif_thumbnail())
Fix bug #68089 - do not accept options with embedded \0
Fixed bug #68044: Integer overflow in unserialize() (32-bits only)
Fix bug #68027 - fix date parsing in XMLRPC lib
Conflicts:
configure.in
ext/curl/interface.c
main/php_version.h
Bugs:
https://bugs.php.net/68283
https://bugs.php.net/68113
https://bugs.php.net/68089
https://bugs.php.net/68044
https://bugs.php.net/68027
Changed paths:
MM ext/pcre/php_pcre.c
Diff: