From: Christopher Jones Date: Tue, 20 Aug 2013 00:55:26 +0000 (-0700) Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 X-Git-Tag: php-5.5.6RC1~20 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33ff44199676d72948a6a3b03f6017ba799b09f8;p=php Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5 * 'PHP-5.5' of https://git.php.net/repository/php-src: Update NEWS fix bug #65481 (shutdown segfault due to serialize) Track created curl_slist structs by option so they can be updated in situ. Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse'). Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse'). --- 33ff44199676d72948a6a3b03f6017ba799b09f8