From 94a7f63cda2516a3ec35be7a11faf098dda31014 Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@vdnsbg.com>
Date: Sat, 21 Nov 2015 21:04:07 +0200
Subject: [PATCH] fix static handler

---
 .../ESP8266WebServer/src/detail/RequestHandlersImpl.h     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h b/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
index 9ce8441e1..54522b1d9 100644
--- a/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
+++ b/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
@@ -70,9 +70,6 @@ public:
         if (!requestUri.startsWith(_uri))
             return false; 
 
-        if (requestUri != _uri)
-            return false;
-
         return true;
     }
 
@@ -91,6 +88,11 @@ public:
             // URI in request to get the file path.
             path += requestUri.substring(_baseUriLength); 
         }
+        
+        else if (requestUri != _uri) {
+            // Base URI points to a file but request doesn't match this URI exactly
+            return false;
+        }
         DEBUGV("StaticRequestHandler::handle: path=%s, isFile=%d\r\n", path.c_str(), _isFile);
 
         String contentType = getContentType(path);