]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4.40' into PHP-5.5.24
authorStanislav Malyshev <stas@php.net>
Mon, 13 Apr 2015 03:13:00 +0000 (20:13 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 13 Apr 2015 03:13:00 +0000 (20:13 -0700)
commited7d4977bb0e99153c67d2873488b8f572627c8a
treee968f9300594266ddb627c28f2fdbc849a0857f2
parent9bbd995679cfd6f9d2d04a64a18f9caeabcb548b
parentd82d68742c69fc20a5180a2dbcca4cac52435931
Merge branch 'PHP-5.4.40' into PHP-5.5.24

* PHP-5.4.40:
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test
ext/standard/http_fopen_wrapper.c