]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4.40' into PHP-5.5.24
authorStanislav Malyshev <stas@php.net>
Mon, 13 Apr 2015 06:49:16 +0000 (23:49 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 13 Apr 2015 06:49:16 +0000 (23:49 -0700)
* PHP-5.4.40:
  fix memory leak & add test
  Fix tests

1  2 
ext/standard/http_fopen_wrapper.c

Simple merge