archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- #50563, removing E_WARNING from parse_url()

Browse source
This commit is contained in:
Pierre Joye 2010-06-16 18:56:24 +00:00
parent 4029454a0d
commit cfd930d218
11 changed files with 124 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

6
NEWS
View file

@ -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)

52
ext/standard/tests/url/parse_url_basic_001.phpt
View file

@ -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

52
ext/standard/tests/url/parse_url_basic_002.phpt
View file

@ -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

52
ext/standard/tests/url/parse_url_basic_003.phpt
View file

@ -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

52
ext/standard/tests/url/parse_url_basic_004.phpt
View file

@ -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

52
ext/standard/tests/url/parse_url_basic_005.phpt
View file

@ -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

52
ext/standard/tests/url/parse_url_basic_006.phpt
View file

@ -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

52
ext/standard/tests/url/parse_url_basic_007.phpt
View file

@ -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

52
ext/standard/tests/url/parse_url_basic_008.phpt
View file

@ -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

52
ext/standard/tests/url/parse_url_basic_009.phpt
View file

@ -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

2
ext/standard/url.c
View file

@ -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;
}