com php-src: Merge branch 'PHP-5.5-security' into PHP-5.5.24: ext/xmlwriter/php_xmlwriter.c

Commit: 9bbd995679cfd6f9d2d04a64a18f9caeabcb548b Author: Stanislav Malyshev <stas@php.net> Sun, 12 Apr 2015 20:12:38 -0700 Parents: 0cb9d75cb6dfea4ad31ea794856489854ff20e16 d19842f613f7e63c41d35c0f2a0ba0c3513edb62 Branches: PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9bbd995679cfd6f9d2d04a64a18f9caeabcb548b Log: Merge branch 'PHP-5.5-security' into PHP-5.5.24 * PHP-5.5-security: (22 commits) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) updated NEWS added test for bug #69354 revert skipif, this should run everywhere further ODBC 3.0 compliance more compliance with the ODBC 3.0 test fixes Prevent GC from changing zval or object 'color' before they are actually inserted into possible roots buffer. sigh, can't even copypaste without screwing up oop, put both the error number and message for both db object to the error message test fixes Fixed bug #69281 (opcache_is_script_cached no longer works) Fix typo: unitialized -> uninitialized Fix typo: unitialized -> uninitialized Fixed bug #68739 (Missing break / control flow). Fixed bug #68740 (NULL Pointer Dereference). Fixed bug #68677 (Use After Free). Fixed bug #68739 (Missing break / control flow in curl) Fixed bug #68740 (NULL Pointer Dereference) Fixed bug #68677 (Use After Free in OPcache) ... Conflicts: configure.in ext/curl/tests/bug69316.phpt main/php_version.h Bugs: https://bugs.php.net/69316 https://bugs.php.net/68486 https://bugs.php.net/69218 https://bugs.php.net/68819 https://bugs.php.net/69354 https://bugs.php.net/69281 https://bugs.php.net/68739 https://bugs.php.net/68740 https://bugs.php.net/68677 Changed paths: MM ext/xmlwriter/php_xmlwriter.c Diff: