diff --git a/.gitignore b/.gitignore index d88f1f2daf..3c8c0fe5c3 100644 --- a/.gitignore +++ b/.gitignore @@ -72,4 +72,3 @@ nbproject build/macosx/esptool-*-osx.zip build/macosx/dist/osx-xtensa-lx106-elf.tgz -/hardware/esp8266com/esp8266/tools diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp index 5c94ee8181..df067f0c9d 100644 --- a/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp +++ b/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp @@ -140,11 +140,10 @@ void ESP8266WebServer::send(int code, const char* content_type, String content) content_type = "text/html"; sendHeader("Content-Type", content_type, true); - if (_contentLength != CONTENT_LENGTH_UNKNOWN) { - size_t length = (_contentLength == CONTENT_LENGTH_NOT_SET) ? - content.length() : _contentLength; - String lengthStr(length); - sendHeader("Content-Length", lengthStr.c_str()); + if (_contentLength != CONTENT_LENGTH_UNKNOWN && _contentLength != CONTENT_LENGTH_NOT_SET) { + sendHeader("Content-Length", String(_contentLength).c_str()); + } else if(content.length() > 0){ + sendHeader("Content-Length", String(content.length()).c_str()); } sendHeader("Connection", "close"); sendHeader("Access-Control-Allow-Origin", "*"); diff --git a/hardware/esp8266com/esp8266/tools/sdk/include/ets_sys.h b/hardware/esp8266com/esp8266/tools/sdk/include/ets_sys.h index c21826cbd7..2aaa3321a2 100644 --- a/hardware/esp8266com/esp8266/tools/sdk/include/ets_sys.h +++ b/hardware/esp8266com/esp8266/tools/sdk/include/ets_sys.h @@ -39,6 +39,7 @@ typedef struct _ETSTIMER_ { typedef void (*int_handler_t)(void*); +#define ETS_SLC_INUM 1 #define ETS_SPI_INUM 2 #define ETS_GPIO_INUM 4 #define ETS_UART_INUM 5 @@ -54,6 +55,12 @@ typedef void (*int_handler_t)(void*); #define ETS_INTR_UNLOCK() \ ets_intr_unlock() +#define ETS_INTR_ENABLE(inum) \ + ets_isr_unmask((1<