Merge pull request #12 from esp8266/master

Jason2866 · web-flow · commit 1db5fdd5817e · 2020-09-22T16:48:17.000+02:00
FIX StaticRequestHandler crashes when cache_header is null and DEBUG_…
diff --git a/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h b/libraries/ESP8266WebServer/src/detail/RequestHandlersImpl.h
@@ -81,7 +81,7 @@ class StaticRequestHandler : public RequestHandler<ServerType> {
             _isFile = false;
         }
 
-        DEBUGV("StaticRequestHandler: path=%s uri=%s isFile=%d, cache_header=%s\r\n", path, uri, _isFile, cache_header);
+        DEBUGV("StaticRequestHandler: path=%s uri=%s isFile=%d, cache_header=%s\r\n", path, uri, _isFile, cache_header == __null ? "" : cache_header);
         _baseUriLength = _uri.length();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ class StaticRequestHandler : public RequestHandler<ServerType> {`
`81`	`81`	`_isFile = false;`
`82`	`82`	`}`
`83`	`83`
`84`		`- DEBUGV("StaticRequestHandler: path=%s uri=%s isFile=%d, cache_header=%s\r\n", path, uri, _isFile, cache_header);`
	`84`	`+ DEBUGV("StaticRequestHandler: path=%s uri=%s isFile=%d, cache_header=%s\r\n", path, uri, _isFile, cache_header == __null ? "" : cache_header);`
`85`	`85`	`_baseUriLength = _uri.length();`
`86`	`86`	`}`
`87`	`87`