MFB51: Fixed bug #36351 (parse_url() does not parse numeric paths properly).

diff --git a/ext/standard/tests/strings/url_t.phpt b/ext/standard/tests/strings/url_t.phpt
index be95e0294974647babf41c60e6e89766c89009da..2d18fa5c036aac1f464bcfe8cb9553d095a4edbc 100644 (file)
--- a/ext/standard/tests/strings/url_t.phpt
+++ b/ext/standard/tests/strings/url_t.phpt
@@ -70,6 +70,7 @@ $sample_urls = array (
 'http://foo.com#bar',
 'scheme:',
 'foo+bar://baz@bang/bla',
+'gg:9130731',
 );
 
     foreach ($sample_urls as $url) {
@@ -678,6 +679,12 @@ array(4) {
   ["path"]=>
   string(4) "/bla"
 }
+array(2) {
+  ["scheme"]=>
+  string(2) "gg"
+  ["path"]=>
+  string(7) "9130731"
+}
 string(4) "http"
 string(11) "www.php.net"
 int(80)

diff --git a/ext/standard/url.c b/ext/standard/url.c
index 43c47b38d9c8f08cbfff257d6aa245c5a8fb3e93..d425e985c71888f319ebe1ccde0e81e3317e4459 100644 (file)
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -138,7 +138,7 @@ PHPAPI php_url *php_url_parse_ex(char const *str, int length)
                                p++;
                        }
                        
-                       if ((*p) == '\0' || *p == '/') {
+                       if ((*p == '\0' || *p == '/') && (p - e) < 7) {
                                goto parse_port;
                        }