Use HeaderUtils for X-Accel-Mapping

c960657 · c960657 · commit 3674a7ddcb05 · 2017-10-29T00:47:17.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
@@ -218,17 +218,12 @@ public function prepare(Request $request)
             if ('x-accel-redirect' === strtolower($type)) {
                 // Do X-Accel-Mapping substitutions.
                 // @link http://wiki.nginx.org/X-accel#X-Accel-Redirect
-                foreach (explode(',', $request->headers->get('X-Accel-Mapping', '')) as $mapping) {
-                    $mapping = explode('=', $mapping, 2);
-
-                    if (2 === count($mapping)) {
-                        $pathPrefix = trim($mapping[0]);
-                        $location = trim($mapping[1]);
-
-                        if (substr($path, 0, strlen($pathPrefix)) === $pathPrefix) {
-                            $path = $location.substr($path, strlen($pathPrefix));
-                            break;
-                        }
+                $parts = HeaderUtils::split($request->headers->get('X-Accel-Mapping', ''), ',=');
+                $mappings = HeaderUtils::combineParts($parts);
+                foreach ($mappings as $pathPrefix => $location) {
+                    if (substr($path, 0, strlen($pathPrefix)) === $pathPrefix) {
+                        $path = $location.substr($path, strlen($pathPrefix));
+                        break;
                     }
                 }
             }
