diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-11-03 11:37:43 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-11-03 11:37:43 -0800 |
| commit | 279550ee85493c87dca91feefe9d5b97af82d323 (patch) | |
| tree | 0901af217943c2ce8aa47060f7b53dd4ea103744 /ext/json/php_json.h | |
| parent | 3918e544d86532ffede42f45ac278daf5c4e8e0f (diff) | |
| parent | c351b47ce85a3a147cfa801fa9f0149ab4160834 (diff) | |
| download | php-git-279550ee85493c87dca91feefe9d5b97af82d323.tar.gz | |
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
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions