From: Mateusz Kocielski <shm@php.net>
Date: Tue, 18 Mar 2014 07:57:30 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=156cc39e21cb5badbad11d42b5aa37e7b917f2a5;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed off-by-one in php_url_parse_ex
---

156cc39e21cb5badbad11d42b5aa37e7b917f2a5