]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bbd995 d82d687)
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)
* PHP-5.4.40:
  Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
  Fix test

1  2 
ext/standard/http_fopen_wrapper.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/http_fopen_wrapper.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.