From: Mateusz Kocielski Date: Tue, 18 Mar 2014 08:53:58 +0000 (+0100) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHPNG_MERGE~471^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=888f467d63ba6d35d3d2142747b04870e94824a3;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Fixed off-by-one in php_url_parse_ex --- 888f467d63ba6d35d3d2142747b04870e94824a3