Commit323ea3b

authored

Merge pull request#203 from t0mmy742/bugfix/202

Fix test Uri with multiple slashes

2 parents4325f19 +9131791 commit323ea3bCopy full SHA for 323ea3b

File tree

+18

-2

lines changed

+18

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,10 @@ protected function toHeader(string $name, array $properties): string`
`170`	`170`	`$result .='; HttpOnly';`
`171`	`171`	`}`
`172`	`172`
`173`		`-if (isset($properties['samesite']) &&in_array(strtolower($properties['samesite']), ['lax','strict','none'],true)) {`
	`173`	`+if (`
	`174`	`+isset($properties['samesite'])`
	`175`	`+ &&in_array(strtolower($properties['samesite']), ['lax','strict','none'],true)`
	`176`	`+ ) {`
`174`	`177`	`// While strtolower is needed for correct comparison, the RFC doesn't care about case`
`175`	`178`	`$result .='; SameSite=' .$properties['samesite'];`
`176`	`179`	`}`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -484,7 +484,20 @@ public function __toString(): string`
`484`	`484`	`$query =$this->getQuery();`
`485`	`485`	`$fragment =$this->getFragment();`
`486`	`486`
`487`		`-$path ='/' .ltrim($path,'/');`
	`487`	`+if ($path !=='') {`
	`488`	`+if ($path[0] !=='/') {`
	`489`	`+if ($authority !=='') {`
	`490`	`+// If the path is rootless and an authority is present, the path MUST be prefixed by "/".`
	`491`	`+$path ='/' .$path;`
	`492`	`+ }`
	`493`	`+ }elseif (isset($path[1]) &&$path[1] ==='/') {`
	`494`	`+if ($authority ==='') {`
	`495`	`+// If the path is starting with more than one "/" and no authority is present,`
	`496`	`+// the starting slashes MUST be reduced to one.`
	`497`	`+$path ='/' .ltrim($path,'/');`
	`498`	`+ }`
	`499`	`+ }`
	`500`	`+ }`
`488`	`501`
`489`	`502`	`return ($scheme !=='' ?$scheme .':' :'')`
`490`	`503`	`. ($authority !=='' ?'//' .$authority :'')`

Comments

(0)