]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca57ce5 4ee1ec4)
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
authorChristopher Jones <sixd@php.net>
Tue, 20 Aug 2013 00:55:26 +0000 (17:55 -0700)
committerChristopher Jones <sixd@php.net>
Tue, 20 Aug 2013 00:55:26 +0000 (17:55 -0700)
* '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').


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.