diff options
| author | Mateusz Kocielski <shm@php.net> | 2014-03-18 08:54:57 +0100 |
|---|---|---|
| committer | Mateusz Kocielski <shm@php.net> | 2014-03-18 08:54:57 +0100 |
| commit | 497b918e6213264402758089b04dad34c24bf2f3 (patch) | |
| tree | 49df6fbdd1628cdfac1e1d425b378b41e5770762 | |
| parent | 87a87c668207ee3a1f6a9352c28eaf2cbc6e371e (diff) | |
| parent | 46566b78c9811b24e9339a6652e26bbf48a80585 (diff) | |
| download | php-git-497b918e6213264402758089b04dad34c24bf2f3.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed off-by-one in php_url_parse_ex
Conflicts:
ext/standard/url.c
| -rw-r--r-- | ext/standard/url.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/url.c b/ext/standard/url.c index e4eb9c48b9..d8271a18ed 100644 --- a/ext/standard/url.c +++ b/ext/standard/url.c @@ -266,8 +266,8 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length) p = s; } else { /* memrchr is a GNU specific extension - Emulate for wide compatibility */ - for(p = e; *p != ':' && p >= s; p--); + Emulate for wide compatability */ + for(p = e; p >= s && *p != ':'; p--); } if (p >= s && *p == ':') { |