com php-src: Merge branch 'PHP-5.4.40' into PHP-5.5.24: ext/standard/http_fopen_wrapper.c
| From: | Stanislav Malyshev | Date: | Mon, 13 Apr 2015 03:13:00 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4.40' into PHP-5.5.24: ext/standard/http_fopen_wrapper.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86206@lists.php.net to get a copy of this message | ||
Commit: ed7d4977bb0e99153c67d2873488b8f572627c8a
Author: Stanislav Malyshev <stas@php.net> Sun, 12 Apr 2015 20:13:00 -0700
Parents: 9bbd995679cfd6f9d2d04a64a18f9caeabcb548b d82d68742c69fc20a5180a2dbcca4cac52435931
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ed7d4977bb0e99153c67d2873488b8f572627c8a
Log:
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
Bugs:
https://bugs.php.net/69337
Changed paths:
MM ext/standard/http_fopen_wrapper.c
Diff: