- #50563, removing E_WARNING from parse_url()

diff --git a/NEWS b/NEWS
index 79348ce27720cc5c6c6eb30729fd805e9022ab90..e848150da508ef6e9693e4d5d8743a5ef73630a7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -194,6 +194,10 @@ PHP                                                                        NEWS
   if defined in WSDL). (mephius at gmail dot com)
 - Fixed bug #50731 (Inconsistent namespaces sent to functions registered with
   spl_autoload_register). (Felipe)
+- Fixed bug #50563 (removing E_WARNING from parse_url). (ralph at smashlabs dot 
+  com, Pierre)
+- Fixed bug #50578 (incorrect shebang in phar.phar). (Fedora at FamilleCollet
+  dot com)
 - Fixed bug #50555 (DateTime::sub() allows 'relative' time modifications). (Derick)
 - Fixed bug #50392 (date_create_from_format enforces 6 digits for 'u' format
   character). (Derick)
@@ -202,6 +206,8 @@ PHP                                                                        NEWS
 - Fixed bug #50358 (Compile failure compiling ext/phar/util.lo). (Felipe)
 - Fixed bug #50101 (name clash between global and local variable).
   (patch by yoarvi at gmail dot com)
+- Fixed bug #51002 (fix possible memory corruption with very long names).
+  (Pierre)
 - Fixed bug #49893 (Crash while creating an instance of Zend_Mail_Storage_Pop3).
   (Dmitry)
 - Fixed bug #49819 (STDOUT losing data with posix_isatty()). (Mike)

diff --git a/ext/standard/tests/url/parse_url_basic_001.phpt b/ext/standard/tests/url/parse_url_basic_001.phpt
index 3d50689a4d0d67cbf81fc11b79247c654e399a42..7b9d51399a802240560669a71eaee8ef38437a0d 100644 (file)
--- a/ext/standard/tests/url/parse_url_basic_001.phpt
+++ b/ext/standard/tests/url/parse_url_basic_001.phpt
@@ -845,55 +845,29 @@ echo "Done";
   string(1) "/"
 }
 
---> http:///blah.com: 
-Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15
-bool(false)
+--> http:///blah.com: bool(false)
 
---> http://:80: 
-Warning: parse_url(http://:80): Unable to parse URL in %s on line 15
-bool(false)
+--> http://:80: bool(false)
 
---> http://user@:80: 
-Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15
-bool(false)
+--> http://user@:80: bool(false)
 
---> http://user:pass@:80: 
-Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15
-bool(false)
+--> http://user:pass@:80: bool(false)
 
---> http://:: 
-Warning: parse_url(http://:): Unable to parse URL in %s on line 15
-bool(false)
+--> http://:: bool(false)
 
---> http://@/: 
-Warning: parse_url(http://@/): Unable to parse URL in %s on line 15
-bool(false)
+--> http://@/: bool(false)
 
---> http://@:/: 
-Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15
-bool(false)
+--> http://@:/: bool(false)
 
---> http://:/: 
-Warning: parse_url(http://:/): Unable to parse URL in %s on line 15
-bool(false)
+--> http://:/: bool(false)
 
---> http://?: 
-Warning: parse_url(http://?): Unable to parse URL in %s on line 15
-bool(false)
+--> http://?: bool(false)
 
---> http://?:: 
-Warning: parse_url(http://?:): Unable to parse URL in %s on line 15
-bool(false)
+--> http://?:: bool(false)
 
---> http://:?: 
-Warning: parse_url(http://:?): Unable to parse URL in %s on line 15
-bool(false)
+--> http://:?: bool(false)
 
---> http://blah.com:123456: 
-Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15
-bool(false)
+--> http://blah.com:123456: bool(false)
 
---> http://blah.com:abcdef: 
-Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15
-bool(false)
+--> http://blah.com:abcdef: bool(false)
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/url/parse_url_basic_002.phpt b/ext/standard/tests/url/parse_url_basic_002.phpt
index e25ab8dcd140654a1228ae85ba2c7e917a1a0bfa..f3ac770f0a166648d179d06b6aa38fd0deae5def 100644 (file)
--- a/ext/standard/tests/url/parse_url_basic_002.phpt
+++ b/ext/standard/tests/url/parse_url_basic_002.phpt
@@ -109,43 +109,17 @@ echo "Done";
 --> http://[x:80]/   : string(4) "http"
 -->    : NULL
 --> /   : NULL
---> http:///blah.com   : 
-Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15
-bool(false)
---> http://:80   : 
-Warning: parse_url(http://:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user@:80   : 
-Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user:pass@:80   : 
-Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://:   : 
-Warning: parse_url(http://:): Unable to parse URL in %s on line 15
-bool(false)
---> http://@/   : 
-Warning: parse_url(http://@/): Unable to parse URL in %s on line 15
-bool(false)
---> http://@:/   : 
-Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://:/   : 
-Warning: parse_url(http://:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://?   : 
-Warning: parse_url(http://?): Unable to parse URL in %s on line 15
-bool(false)
---> http://?:   : 
-Warning: parse_url(http://?:): Unable to parse URL in %s on line 15
-bool(false)
---> http://:?   : 
-Warning: parse_url(http://:?): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:123456   : 
-Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:abcdef   : 
-Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15
-bool(false)
+--> http:///blah.com   : bool(false)
+--> http://:80   : bool(false)
+--> http://user@:80   : bool(false)
+--> http://user:pass@:80   : bool(false)
+--> http://:   : bool(false)
+--> http://@/   : bool(false)
+--> http://@:/   : bool(false)
+--> http://:/   : bool(false)
+--> http://?   : bool(false)
+--> http://?:   : bool(false)
+--> http://:?   : bool(false)
+--> http://blah.com:123456   : bool(false)
+--> http://blah.com:abcdef   : bool(false)
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/url/parse_url_basic_003.phpt b/ext/standard/tests/url/parse_url_basic_003.phpt
index e34dc2d1943022dcbd61d8351d4bcafd38bb3dec..dbd92088ae31227c3a02b274e01d5df14f32753a 100644 (file)
--- a/ext/standard/tests/url/parse_url_basic_003.phpt
+++ b/ext/standard/tests/url/parse_url_basic_003.phpt
@@ -108,43 +108,17 @@ echo "Done";
 --> http://[x:80]/   : string(6) "[x:80]"
 -->    : NULL
 --> /   : NULL
---> http:///blah.com   : 
-Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15
-bool(false)
---> http://:80   : 
-Warning: parse_url(http://:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user@:80   : 
-Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user:pass@:80   : 
-Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://:   : 
-Warning: parse_url(http://:): Unable to parse URL in %s on line 15
-bool(false)
---> http://@/   : 
-Warning: parse_url(http://@/): Unable to parse URL in %s on line 15
-bool(false)
---> http://@:/   : 
-Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://:/   : 
-Warning: parse_url(http://:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://?   : 
-Warning: parse_url(http://?): Unable to parse URL in %s on line 15
-bool(false)
---> http://?:   : 
-Warning: parse_url(http://?:): Unable to parse URL in %s on line 15
-bool(false)
---> http://:?   : 
-Warning: parse_url(http://:?): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:123456   : 
-Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:abcdef   : 
-Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15
-bool(false)
+--> http:///blah.com   : bool(false)
+--> http://:80   : bool(false)
+--> http://user@:80   : bool(false)
+--> http://user:pass@:80   : bool(false)
+--> http://:   : bool(false)
+--> http://@/   : bool(false)
+--> http://@:/   : bool(false)
+--> http://:/   : bool(false)
+--> http://?   : bool(false)
+--> http://?:   : bool(false)
+--> http://:?   : bool(false)
+--> http://blah.com:123456   : bool(false)
+--> http://blah.com:abcdef   : bool(false)
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/url/parse_url_basic_004.phpt b/ext/standard/tests/url/parse_url_basic_004.phpt
index af327954700c7b82ee9a36fcde9f35fd9f1c34f4..387907f0ee9e32a4856b9acd6f59f06a01d2e272 100644 (file)
--- a/ext/standard/tests/url/parse_url_basic_004.phpt
+++ b/ext/standard/tests/url/parse_url_basic_004.phpt
@@ -108,43 +108,17 @@ echo "Done";
 --> http://[x:80]/   : NULL
 -->    : NULL
 --> /   : NULL
---> http:///blah.com   : 
-Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15
-bool(false)
---> http://:80   : 
-Warning: parse_url(http://:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user@:80   : 
-Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user:pass@:80   : 
-Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://:   : 
-Warning: parse_url(http://:): Unable to parse URL in %s on line 15
-bool(false)
---> http://@/   : 
-Warning: parse_url(http://@/): Unable to parse URL in %s on line 15
-bool(false)
---> http://@:/   : 
-Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://:/   : 
-Warning: parse_url(http://:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://?   : 
-Warning: parse_url(http://?): Unable to parse URL in %s on line 15
-bool(false)
---> http://?:   : 
-Warning: parse_url(http://?:): Unable to parse URL in %s on line 15
-bool(false)
---> http://:?   : 
-Warning: parse_url(http://:?): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:123456   : 
-Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:abcdef   : 
-Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15
-bool(false)
+--> http:///blah.com   : bool(false)
+--> http://:80   : bool(false)
+--> http://user@:80   : bool(false)
+--> http://user:pass@:80   : bool(false)
+--> http://:   : bool(false)
+--> http://@/   : bool(false)
+--> http://@:/   : bool(false)
+--> http://:/   : bool(false)
+--> http://?   : bool(false)
+--> http://?:   : bool(false)
+--> http://:?   : bool(false)
+--> http://blah.com:123456   : bool(false)
+--> http://blah.com:abcdef   : bool(false)
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/url/parse_url_basic_005.phpt b/ext/standard/tests/url/parse_url_basic_005.phpt
index 5eb2541c110ac1709c1e4be96c010de7237fa78f..d44dcfef3904fd7f482b7fa509cef2b936bccbcc 100644 (file)
--- a/ext/standard/tests/url/parse_url_basic_005.phpt
+++ b/ext/standard/tests/url/parse_url_basic_005.phpt
@@ -108,43 +108,17 @@ echo "Done";
 --> http://[x:80]/   : NULL
 -->    : NULL
 --> /   : NULL
---> http:///blah.com   : 
-Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15
-bool(false)
---> http://:80   : 
-Warning: parse_url(http://:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user@:80   : 
-Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user:pass@:80   : 
-Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://:   : 
-Warning: parse_url(http://:): Unable to parse URL in %s on line 15
-bool(false)
---> http://@/   : 
-Warning: parse_url(http://@/): Unable to parse URL in %s on line 15
-bool(false)
---> http://@:/   : 
-Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://:/   : 
-Warning: parse_url(http://:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://?   : 
-Warning: parse_url(http://?): Unable to parse URL in %s on line 15
-bool(false)
---> http://?:   : 
-Warning: parse_url(http://?:): Unable to parse URL in %s on line 15
-bool(false)
---> http://:?   : 
-Warning: parse_url(http://:?): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:123456   : 
-Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:abcdef   : 
-Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15
-bool(false)
+--> http:///blah.com   : bool(false)
+--> http://:80   : bool(false)
+--> http://user@:80   : bool(false)
+--> http://user:pass@:80   : bool(false)
+--> http://:   : bool(false)
+--> http://@/   : bool(false)
+--> http://@:/   : bool(false)
+--> http://:/   : bool(false)
+--> http://?   : bool(false)
+--> http://?:   : bool(false)
+--> http://:?   : bool(false)
+--> http://blah.com:123456   : bool(false)
+--> http://blah.com:abcdef   : bool(false)
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/url/parse_url_basic_006.phpt b/ext/standard/tests/url/parse_url_basic_006.phpt
index 926200a1a0a33d728618f9e3b0d267f859c0c0a4..bd6d03efdeaa7ac01ae3834d84731dba4645572b 100644 (file)
--- a/ext/standard/tests/url/parse_url_basic_006.phpt
+++ b/ext/standard/tests/url/parse_url_basic_006.phpt
@@ -108,43 +108,17 @@ echo "Done";
 --> http://[x:80]/   : NULL
 -->    : NULL
 --> /   : NULL
---> http:///blah.com   : 
-Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15
-bool(false)
---> http://:80   : 
-Warning: parse_url(http://:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user@:80   : 
-Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user:pass@:80   : 
-Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://:   : 
-Warning: parse_url(http://:): Unable to parse URL in %s on line 15
-bool(false)
---> http://@/   : 
-Warning: parse_url(http://@/): Unable to parse URL in %s on line 15
-bool(false)
---> http://@:/   : 
-Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://:/   : 
-Warning: parse_url(http://:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://?   : 
-Warning: parse_url(http://?): Unable to parse URL in %s on line 15
-bool(false)
---> http://?:   : 
-Warning: parse_url(http://?:): Unable to parse URL in %s on line 15
-bool(false)
---> http://:?   : 
-Warning: parse_url(http://:?): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:123456   : 
-Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:abcdef   : 
-Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15
-bool(false)
+--> http:///blah.com   : bool(false)
+--> http://:80   : bool(false)
+--> http://user@:80   : bool(false)
+--> http://user:pass@:80   : bool(false)
+--> http://:   : bool(false)
+--> http://@/   : bool(false)
+--> http://@:/   : bool(false)
+--> http://:/   : bool(false)
+--> http://?   : bool(false)
+--> http://?:   : bool(false)
+--> http://:?   : bool(false)
+--> http://blah.com:123456   : bool(false)
+--> http://blah.com:abcdef   : bool(false)
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/url/parse_url_basic_007.phpt b/ext/standard/tests/url/parse_url_basic_007.phpt
index d99ccb66741ae92da3e42c12e1722b916ff503a0..aa9f88ba546c4e8db567d11ff578315b37901977 100644 (file)
--- a/ext/standard/tests/url/parse_url_basic_007.phpt
+++ b/ext/standard/tests/url/parse_url_basic_007.phpt
@@ -108,43 +108,17 @@ echo "Done";
 --> http://[x:80]/   : string(1) "/"
 -->    : string(0) ""
 --> /   : string(1) "/"
---> http:///blah.com   : 
-Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15
-bool(false)
---> http://:80   : 
-Warning: parse_url(http://:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user@:80   : 
-Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user:pass@:80   : 
-Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://:   : 
-Warning: parse_url(http://:): Unable to parse URL in %s on line 15
-bool(false)
---> http://@/   : 
-Warning: parse_url(http://@/): Unable to parse URL in %s on line 15
-bool(false)
---> http://@:/   : 
-Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://:/   : 
-Warning: parse_url(http://:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://?   : 
-Warning: parse_url(http://?): Unable to parse URL in %s on line 15
-bool(false)
---> http://?:   : 
-Warning: parse_url(http://?:): Unable to parse URL in %s on line 15
-bool(false)
---> http://:?   : 
-Warning: parse_url(http://:?): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:123456   : 
-Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:abcdef   : 
-Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15
-bool(false)
+--> http:///blah.com   : bool(false)
+--> http://:80   : bool(false)
+--> http://user@:80   : bool(false)
+--> http://user:pass@:80   : bool(false)
+--> http://:   : bool(false)
+--> http://@/   : bool(false)
+--> http://@:/   : bool(false)
+--> http://:/   : bool(false)
+--> http://?   : bool(false)
+--> http://?:   : bool(false)
+--> http://:?   : bool(false)
+--> http://blah.com:123456   : bool(false)
+--> http://blah.com:abcdef   : bool(false)
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/url/parse_url_basic_008.phpt b/ext/standard/tests/url/parse_url_basic_008.phpt
index d2d2ebb594c77b108e9211a25c6ee0e29dbbd8db..7b166127f82c5595751760e11a184de9f736863a 100644 (file)
--- a/ext/standard/tests/url/parse_url_basic_008.phpt
+++ b/ext/standard/tests/url/parse_url_basic_008.phpt
@@ -108,43 +108,17 @@ echo "Done";
 --> http://[x:80]/   : NULL
 -->    : NULL
 --> /   : NULL
---> http:///blah.com   : 
-Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15
-bool(false)
---> http://:80   : 
-Warning: parse_url(http://:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user@:80   : 
-Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user:pass@:80   : 
-Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://:   : 
-Warning: parse_url(http://:): Unable to parse URL in %s on line 15
-bool(false)
---> http://@/   : 
-Warning: parse_url(http://@/): Unable to parse URL in %s on line 15
-bool(false)
---> http://@:/   : 
-Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://:/   : 
-Warning: parse_url(http://:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://?   : 
-Warning: parse_url(http://?): Unable to parse URL in %s on line 15
-bool(false)
---> http://?:   : 
-Warning: parse_url(http://?:): Unable to parse URL in %s on line 15
-bool(false)
---> http://:?   : 
-Warning: parse_url(http://:?): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:123456   : 
-Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:abcdef   : 
-Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15
-bool(false)
+--> http:///blah.com   : bool(false)
+--> http://:80   : bool(false)
+--> http://user@:80   : bool(false)
+--> http://user:pass@:80   : bool(false)
+--> http://:   : bool(false)
+--> http://@/   : bool(false)
+--> http://@:/   : bool(false)
+--> http://:/   : bool(false)
+--> http://?   : bool(false)
+--> http://?:   : bool(false)
+--> http://:?   : bool(false)
+--> http://blah.com:123456   : bool(false)
+--> http://blah.com:abcdef   : bool(false)
 Done
\ No newline at end of file

diff --git a/ext/standard/tests/url/parse_url_basic_009.phpt b/ext/standard/tests/url/parse_url_basic_009.phpt
index b23a30edfc0206f5764c73ee45722ef49addd1d5..a814546c52bb635c6cb121b4e4034ce7d398ff7f 100644 (file)
--- a/ext/standard/tests/url/parse_url_basic_009.phpt
+++ b/ext/standard/tests/url/parse_url_basic_009.phpt
@@ -108,43 +108,17 @@ echo "Done";
 --> http://[x:80]/   : NULL
 -->    : NULL
 --> /   : NULL
---> http:///blah.com   : 
-Warning: parse_url(http:///blah.com): Unable to parse URL in %s on line 15
-bool(false)
---> http://:80   : 
-Warning: parse_url(http://:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user@:80   : 
-Warning: parse_url(http://user@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://user:pass@:80   : 
-Warning: parse_url(http://user:pass@:80): Unable to parse URL in %s on line 15
-bool(false)
---> http://:   : 
-Warning: parse_url(http://:): Unable to parse URL in %s on line 15
-bool(false)
---> http://@/   : 
-Warning: parse_url(http://@/): Unable to parse URL in %s on line 15
-bool(false)
---> http://@:/   : 
-Warning: parse_url(http://@:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://:/   : 
-Warning: parse_url(http://:/): Unable to parse URL in %s on line 15
-bool(false)
---> http://?   : 
-Warning: parse_url(http://?): Unable to parse URL in %s on line 15
-bool(false)
---> http://?:   : 
-Warning: parse_url(http://?:): Unable to parse URL in %s on line 15
-bool(false)
---> http://:?   : 
-Warning: parse_url(http://:?): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:123456   : 
-Warning: parse_url(http://blah.com:123456): Unable to parse URL in %s on line 15
-bool(false)
---> http://blah.com:abcdef   : 
-Warning: parse_url(http://blah.com:abcdef): Unable to parse URL in %s on line 15
-bool(false)
+--> http:///blah.com   : bool(false)
+--> http://:80   : bool(false)
+--> http://user@:80   : bool(false)
+--> http://user:pass@:80   : bool(false)
+--> http://:   : bool(false)
+--> http://@/   : bool(false)
+--> http://@:/   : bool(false)
+--> http://:/   : bool(false)
+--> http://?   : bool(false)
+--> http://?:   : bool(false)
+--> http://:?   : bool(false)
+--> http://blah.com:123456   : bool(false)
+--> http://blah.com:abcdef   : bool(false)
 Done
\ No newline at end of file

diff --git a/ext/standard/url.c b/ext/standard/url.c
index f25c770dabfee3c9d063861e446e3d46650c5f91..b6e01d5513dcbaa9381f382f475b7273bf85c6b8 100644 (file)
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -355,7 +355,7 @@ PHP_FUNCTION(parse_url)
 
        resource = php_url_parse_ex(str, str_len);
        if (resource == NULL) {
-               php_error_docref1(NULL TSRMLS_CC, str, E_WARNING, "Unable to parse URL");
+               /* @todo Find a method to determine why php_url_parse_ex() failed */
                RETURN_FALSE;
        }