esp8266 · igrr · Jun 28, 2016 · Apr 20, 2016 · Apr 27, 2016 · May 8, 2016
diff --git a/libraries/ESP8266WebServer/examples/SimpleAuthentification/SimpleAuthentification.ino b/libraries/ESP8266WebServer/examples/SimpleAuthentification/SimpleAuthentification.ino
@@ -10,7 +10,7 @@ ESP8266WebServer server(80);
 //Check if header is present and correct
 bool is_authentified(){
   Serial.println("Enter is_authentified");
-  if (server.hasHeader("Cookie")){   
+  if (server.hasHeader("Cookie")){
     Serial.print("Found cookie: ");
     String cookie = server.header("Cookie");
     Serial.println(cookie);
@@ -20,27 +20,31 @@ bool is_authentified(){
     }
   }
   Serial.println("Authentification Failed");
-  return false;	
+  return false;
 }
 
 //login page, also called for disconnect
 void handleLogin(){
   String msg;
-  if (server.hasHeader("Cookie")){   
+  if (server.hasHeader("Cookie")){
     Serial.print("Found cookie: ");
     String cookie = server.header("Cookie");
     Serial.println(cookie);
   }
   if (server.hasArg("DISCONNECT")){
     Serial.println("Disconnection");
-    String header = "HTTP/1.1 301 OK\r\nSet-Cookie: ESPSESSIONID=0\r\nLocation: /login\r\nCache-Control: no-cache\r\n\r\n";
-    server.sendContent(header);
+    server.sendHeader("Location","/login");
+    server.sendHeader("Cache-Control","no-cache");
+    server.sendHeader("Set-Cookie","ESPSESSIONID=0");
+    server.send(301);
     return;
   }
   if (server.hasArg("USERNAME") && server.hasArg("PASSWORD")){
     if (server.arg("USERNAME") == "admin" &&  server.arg("PASSWORD") == "admin" ){
-      String header = "HTTP/1.1 301 OK\r\nSet-Cookie: ESPSESSIONID=1\r\nLocation: /\r\nCache-Control: no-cache\r\n\r\n";
-      server.sendContent(header);
+      server.sendHeader("Location","/");
+      server.sendHeader("Cache-Control","no-cache");
+      server.sendHeader("Set-Cookie","ESPSESSIONID=1");
+      server.send(301);
       Serial.println("Log in Successful");
       return;
     }
@@ -60,8 +64,9 @@ void handleRoot(){
   Serial.println("Enter handleRoot");
   String header;
   if (!is_authentified()){
-    String header = "HTTP/1.1 301 OK\r\nLocation: /login\r\nCache-Control: no-cache\r\n\r\n";
-    server.sendContent(header);
+    server.sendHeader("Location","/login");
+    server.sendHeader("Cache-Control","no-cache");
+    server.send(301);
     return;
   }
   String content = "<html><body><H2>hello, you successfully connected to esp8266!</H2><br>";

diff --git a/libraries/ESP8266WebServer/examples/WebUpdate/WebUpdate.ino b/libraries/ESP8266WebServer/examples/WebUpdate/WebUpdate.ino
@@ -24,12 +24,10 @@ void setup(void){
     MDNS.begin(host);
     server.on("/", HTTP_GET, [](){
       server.sendHeader("Connection", "close");
-      server.sendHeader("Access-Control-Allow-Origin", "*");
       server.send(200, "text/html", serverIndex);
     });
     server.on("/update", HTTP_POST, [](){
       server.sendHeader("Connection", "close");
-      server.sendHeader("Access-Control-Allow-Origin", "*");
       server.send(200, "text/plain", (Update.hasError())?"FAIL":"OK");
       ESP.restart();
     },[](){
@@ -58,14 +56,14 @@ void setup(void){
     });
     server.begin();
     MDNS.addService("http", "tcp", 80);
-  
+
     Serial.printf("Ready! Open http://%s.local in your browser\n", host);
   } else {
     Serial.println("WiFi Failed");
   }
 }
- 
+
 void loop(void){
   server.handleClient();
   delay(1);
-} 
+}
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@@ -41,6 +41,7 @@ const char * AUTHORIZATION_HEADER = "Authorization";
 ESP8266WebServer::ESP8266WebServer(IPAddress addr, int port)
 : _server(addr, port)
 , _currentMethod(HTTP_ANY)
+, _currentVersion(0)
 , _currentHandler(0)
 , _firstHandler(0)
 , _lastHandler(0)
@@ -49,12 +50,14 @@ ESP8266WebServer::ESP8266WebServer(IPAddress addr, int port)
 , _headerKeysCount(0)
 , _currentHeaders(0)
 , _contentLength(0)
+, _chunked(false)
 {
 }
 
 ESP8266WebServer::ESP8266WebServer(int port)
 : _server(port)
 , _currentMethod(HTTP_ANY)
+, _currentVersion(0)
 , _currentHandler(0)
 , _firstHandler(0)
 , _lastHandler(0)
@@ -63,6 +66,7 @@ ESP8266WebServer::ESP8266WebServer(int port)
 , _headerKeysCount(0)
 , _currentHeaders(0)
 , _contentLength(0)
+, _chunked(false)
 {
 }
 
@@ -246,7 +250,7 @@ void ESP8266WebServer::setContentLength(size_t contentLength) {
 }
 
 void ESP8266WebServer::_prepareHeader(String& response, int code, const char* content_type, size_t contentLength) {
-    response = "HTTP/1.1 ";
+    response = "HTTP/1."+String(_currentVersion)+" ";
     response += String(code);
     response += " ";
     response += _responseCodeToString(code);
@@ -260,9 +264,13 @@ void ESP8266WebServer::_prepareHeader(String& response, int code, const char* co
         sendHeader("Content-Length", String(contentLength));
     } else if (_contentLength != CONTENT_LENGTH_UNKNOWN) {
         sendHeader("Content-Length", String(_contentLength));
+    } else if(_contentLength == CONTENT_LENGTH_UNKNOWN && _currentVersion){ //HTTP/1.1 or above client
+      //let's do chunked
+      _chunked = true;
+      sendHeader("Accept-Ranges","none");
+      sendHeader("Transfer-Encoding","chunked");
     }
     sendHeader("Connection", "close");
-    sendHeader("Access-Control-Allow-Origin", "*");
 
     response += _responseHeaders;
     response += "\r\n";
@@ -271,9 +279,13 @@ void ESP8266WebServer::_prepareHeader(String& response, int code, const char* co
 
 void ESP8266WebServer::send(int code, const char* content_type, const String& content) {
     String header;
+    // Can we asume the following?
+    //if(code == 200 && content.length() == 0 && _contentLength == CONTENT_LENGTH_NOT_SET)
+    //  _contentLength = CONTENT_LENGTH_UNKNOWN;
     _prepareHeader(header, code, content_type, content.length());
-    sendContent(header);
-    sendContent(content);
+    _currentClient.write(header.c_str(), header.length());
+    if(content.length())
+      sendContent(content);
 }
 
 void ESP8266WebServer::send_P(int code, PGM_P content_type, PGM_P content) {
@@ -287,7 +299,7 @@ void ESP8266WebServer::send_P(int code, PGM_P content_type, PGM_P content) {
     char type[64];
     memccpy_P((void*)type, (PGM_VOID_P)content_type, 0, sizeof(type));
     _prepareHeader(header, code, (const char* )type, contentLength);
-    sendContent(header);
+    _currentClient.write(header.c_str(), header.length());
     sendContent_P(content);
 }
 
@@ -309,15 +321,40 @@ void ESP8266WebServer::send(int code, const String& content_type, const String&
 }
 
 void ESP8266WebServer::sendContent(const String& content) {
-  _currentClient.write(content.c_str(), content.length());
+  const char * footer = "\r\n";
+  size_t len = content.length();
+  if(_chunked) {
+    char * chunkSize = (char *)malloc(11);
+    if(chunkSize){
+      sprintf(chunkSize, "%x%s", len, footer);
+      _currentClient.write(chunkSize, strlen(chunkSize));
+      free(chunkSize);
+    }
+  }
+  _currentClient.write(content.c_str(), len);
+  if(_chunked){
+    _currentClient.write(footer, 2);
+  }
 }
 
 void ESP8266WebServer::sendContent_P(PGM_P content) {
-  _currentClient.write_P(content, strlen_P(content));
+  sendContent_P(content, strlen_P(content));
 }
 
 void ESP8266WebServer::sendContent_P(PGM_P content, size_t size) {
+  const char * footer = "\r\n";
+  if(_chunked) {
+    char * chunkSize = (char *)malloc(11);
+    if(chunkSize){
+      sprintf(chunkSize, "%x%s", size, footer);
+      _currentClient.write(chunkSize, strlen(chunkSize));
+      free(chunkSize);
+    }
+  }
   _currentClient.write_P(content, size);
+  if(_chunked){
+    _currentClient.write(footer, 2);
+  }
 }
 
 

diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
@@ -156,6 +156,7 @@ template<typename T> size_t streamFile(T &file, const String& contentType){
   WiFiClient  _currentClient;
   HTTPMethod  _currentMethod;
   String      _currentUri;
+  uint8_t     _currentVersion;
   HTTPClientStatus _currentStatus;
   unsigned long _statusChange;
 
@@ -175,6 +176,7 @@ template<typename T> size_t streamFile(T &file, const String& contentType){
   String           _responseHeaders;
 
   String           _hostHeader;
+  bool             _chunked;
 
 };
 

diff --git a/libraries/ESP8266WebServer/src/Parsing.cpp b/libraries/ESP8266WebServer/src/Parsing.cpp
@@ -86,13 +86,16 @@ bool ESP8266WebServer::_parseRequest(WiFiClient& client) {
 
   String methodStr = req.substring(0, addr_start);
   String url = req.substring(addr_start + 1, addr_end);
+  String versionEnd = req.substring(addr_end + 8);
+  _currentVersion = atoi(versionEnd.c_str());
   String searchStr = "";
   int hasSearch = url.indexOf('?');
   if (hasSearch != -1){
     searchStr = url.substring(hasSearch + 1);
     url = url.substring(0, hasSearch);
   }
   _currentUri = url;
+  _chunked = false;
 
   HTTPMethod method = HTTP_GET;
   if (methodStr == "POST") {