From: Stanislav Malyshev <stas@php.net>
Date: Mon, 13 Apr 2015 03:13:00 +0000 (-0700)
Subject: Merge branch 'PHP-5.4.40' into PHP-5.5.24
X-Git-Tag: php-5.5.25RC1~45^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed7d4977bb0e99153c67d2873488b8f572627c8a;p=php

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
---

ed7d4977bb0e99153c67d2873488b8f572627c8a