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
13 years ago · 497b918e62
1 changed files with 2 additions and 2 deletions
--- 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 == ':') {