]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Mon, 20 Aug 2012 05:20:30 +0000 (22:20 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 20 Aug 2012 05:20:30 +0000 (22:20 -0700)
* PHP-5.4:
  Fix for #62844
  relative-scheme
  bug #62844; relative URL schemes in parse_url()


Trivial merge