]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorPierrick Charron <pierrick@php.net>
Sun, 23 Dec 2012 00:10:35 +0000 (19:10 -0500)
committerPierrick Charron <pierrick@php.net>
Sun, 23 Dec 2012 00:10:35 +0000 (19:10 -0500)
* PHP-5.4:
  Update NEWS file
  Fixed segfault due to libcurl connection caching

1  2 
ext/curl/interface.c

Simple merge