Skip to content

Commit 0bc2657

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Fix binary-safety of parse_url
2 parents 0d157cf + 81811db commit 0bc2657

12 files changed

+33
-13
lines changed

ext/standard/tests/url/parse_url_basic_001.phpt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -868,6 +868,11 @@ echo "Done";
868868
string(19) "filter={"id":"123"}"
869869
}
870870

871+
--> %:x: array(1) {
872+
["path"]=>
873+
string(3) "%:x"
874+
}
875+
871876
--> http:///blah.com: bool(false)
872877

873878
--> http://:80: bool(false)

ext/standard/tests/url/parse_url_basic_002.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ echo "Done";
106106
--> : NULL
107107
--> / : NULL
108108
--> /rest/Users?filter={"id":"123"} : NULL
109+
--> %:x : NULL
109110
--> http:///blah.com : bool(false)
110111
--> http://:80 : bool(false)
111112
--> http://user@:80 : bool(false)

ext/standard/tests/url/parse_url_basic_003.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ echo "Done";
105105
--> : NULL
106106
--> / : NULL
107107
--> /rest/Users?filter={"id":"123"} : NULL
108+
--> %:x : NULL
108109
--> http:///blah.com : bool(false)
109110
--> http://:80 : bool(false)
110111
--> http://user@:80 : bool(false)

ext/standard/tests/url/parse_url_basic_004.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ echo "Done";
105105
--> : NULL
106106
--> / : NULL
107107
--> /rest/Users?filter={"id":"123"} : NULL
108+
--> %:x : NULL
108109
--> http:///blah.com : bool(false)
109110
--> http://:80 : bool(false)
110111
--> http://user@:80 : bool(false)

ext/standard/tests/url/parse_url_basic_005.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ echo "Done";
105105
--> : NULL
106106
--> / : NULL
107107
--> /rest/Users?filter={"id":"123"} : NULL
108+
--> %:x : NULL
108109
--> http:///blah.com : bool(false)
109110
--> http://:80 : bool(false)
110111
--> http://user@:80 : bool(false)

ext/standard/tests/url/parse_url_basic_006.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ echo "Done";
105105
--> : NULL
106106
--> / : NULL
107107
--> /rest/Users?filter={"id":"123"} : NULL
108+
--> %:x : NULL
108109
--> http:///blah.com : bool(false)
109110
--> http://:80 : bool(false)
110111
--> http://user@:80 : bool(false)

ext/standard/tests/url/parse_url_basic_007.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ echo "Done";
105105
--> : string(0) ""
106106
--> / : string(1) "/"
107107
--> /rest/Users?filter={"id":"123"} : string(11) "/rest/Users"
108+
--> %:x : string(3) "%:x"
108109
--> http:///blah.com : bool(false)
109110
--> http://:80 : bool(false)
110111
--> http://user@:80 : bool(false)

ext/standard/tests/url/parse_url_basic_008.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ echo "Done";
105105
--> : NULL
106106
--> / : NULL
107107
--> /rest/Users?filter={"id":"123"} : string(19) "filter={"id":"123"}"
108+
--> %:x : NULL
108109
--> http:///blah.com : bool(false)
109110
--> http://:80 : bool(false)
110111
--> http://user@:80 : bool(false)

ext/standard/tests/url/parse_url_basic_009.phpt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ echo "Done";
105105
--> : NULL
106106
--> / : NULL
107107
--> /rest/Users?filter={"id":"123"} : NULL
108+
--> %:x : NULL
108109
--> http:///blah.com : bool(false)
109110
--> http://:80 : bool(false)
110111
--> http://user@:80 : bool(false)

ext/standard/tests/url/parse_url_unterminated.phpt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -876,6 +876,11 @@ echo "Done";
876876
string(19) "filter={"id":"123"}"
877877
}
878878

879+
--> %:x: array(1) {
880+
["path"]=>
881+
string(3) "%:x"
882+
}
883+
879884
--> http:///blah.com: bool(false)
880885

881886
--> http://:80: bool(false)

0 commit comments

Comments
 (0)