Merge pull request #2890 from travismiller/8x-fix-runserver-files-wit…

…h-encoded-characters 8.x Fix serving existing files with encoded characters like `%20`
drush-ops · Aug 28, 2017 · fbeb981 · fbeb981
2 parents 0a53de4 + c80e6a5
commit fbeb981
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/commands/runserver/d7-rs-router.php b/commands/runserver/d7-rs-router.php
@@ -46,7 +46,7 @@ function runserver_env($key) {
 }
 
 $url = parse_url($_SERVER["REQUEST_URI"]);
-if (file_exists('.' . $url['path'])) {
+if (file_exists('.' . urldecode($url['path']))) {
   // Serve the requested resource as-is.
   return FALSE;
 }

diff --git a/commands/runserver/d8-rs-router.php b/commands/runserver/d8-rs-router.php
@@ -46,7 +46,7 @@ function runserver_env($key) {
 }
 
 $url = parse_url($_SERVER["REQUEST_URI"]);
-if (file_exists('.' . $url['path'])) {
+if (file_exists('.' . urldecode($url['path']))) {
   // Serve the requested resource as-is.
   return FALSE;
 }