com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: Zend/zend_object_handlers.c
| From: | Anatol Belski | Date: | Thu, 20 Feb 2014 23:31:32 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/str_size _and_int64_56_backport' into str_size _and_int64: Zend/zend_object_handlers.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76144@lists.php.net to get a copy of this message | ||
Commit: d6591ba1e37ea38f16f15ae5c2d7fab6d9fc32e7
Author: Anatol Belski <ab@php.net> Fri, 21 Feb 2014 00:31:32 +0100
Parents: ee690ae2a672e05bc918d3ae6de740c7b720b2f0 175ab7702989d6ff73484baff6fe2c93a86488c1
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d6591ba1e37ea38f16f15ae5c2d7fab6d9fc32e7
Log:
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into
str_size_and_int64
* origin/str_size_and_int64_56_backport:
fixed path separator in the tests
Add more tests for __debugInfo() and fix leak
updated libmagic.patch for 5.6+
updated libmagic.patch in 5.4/5
fixed leak introduced after CVE/upgrade
Use nicer output for characters < 32 and > 126 in exception strings Using question marks
might confuse more than it helps. Users are wondering what happened to their string...
Update pgsql document
Fixes #66714: imageconvolution breakage in 5.5.9
Conflicts:
UPGRADING
Bugs:
https://bugs.php.net/66714
Changed paths:
MM Zend/zend_object_handlers.c
Diff: