Skip earlier if value is an empty string

michalbundyra · weierophinney · commit 22f86ae64557 · 2019-10-08T15:08:44.000-05:00
diff --git a/src/functions/marshal_headers_from_sapi.php b/src/functions/marshal_headers_from_sapi.php
@@ -28,6 +28,10 @@ function marshalHeadersFromSapi(array $server) : array
             continue;
         }
 
+        if ($value === '') {
+            continue;
+        }
+
         // Apache prefixes environment variables with REDIRECT_
         // if they are added by rewrite rules
         if (strpos($key, 'REDIRECT_') === 0) {
@@ -40,10 +44,6 @@ function marshalHeadersFromSapi(array $server) : array
             }
         }
 
-        if ($value === '') {
-            continue;
-        }
-
         if (strpos($key, 'HTTP_') === 0) {
             $name = strtr(strtolower(substr($key, 5)), '_', '-');
             $headers[$name] = $value;

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,10 @@ function marshalHeadersFromSapi(array $server) : array`
`28`	`28`	`continue;`
`29`	`29`	`}`
`30`	`30`
	`31`	`+ if ($value === '') {`
	`32`	`+ continue;`
	`33`	`+ }`
	`34`	`+`
`31`	`35`	`// Apache prefixes environment variables with REDIRECT_`
`32`	`36`	`// if they are added by rewrite rules`
`33`	`37`	`if (strpos($key, 'REDIRECT_') === 0) {`
`@@ -40,10 +44,6 @@ function marshalHeadersFromSapi(array $server) : array`
`40`	`44`	`}`
`41`	`45`	`}`
`42`	`46`
`43`		`- if ($value === '') {`
`44`		`- continue;`
`45`		`- }`
`46`		`-`
`47`	`47`	`if (strpos($key, 'HTTP_') === 0) {`
`48`	`48`	`$name = strtr(strtolower(substr($key, 5)), '_', '-');`
`49`	`49`	`$headers[$name] = $value;`