Merge branch 'master' into webhook

Author: d-a-v

.gitmodules

@@ -19,6 +19,9 @@
 [submodule "tools/esptool"]
 	path = tools/esptool
 	url = https://github.com/espressif/esptool.git
+[submodule "libraries/Ethernet"]
+	path = libraries/Ethernet
+	url = https://github.com/arduino-libraries/Ethernet.git
 [submodule "tools/sdk/uzlib"]
 	path = tools/sdk/uzlib
 	url = https://github.com/earlephilhower/uzlib.git

libraries/ESP8266WebServer/README.rst

@@ -154,7 +154,7 @@ Other Function Calls
 
   const String & uri(); // get the current uri
   HTTPMethod  method(); // get the current method 
-  WiFiClient client(); // get the current client
+  WiFiClient & client(); // get the current client
   HTTPUpload & upload(); // get the current upload
   void setContentLength(); // set content length
   void sendHeader(); // send HTTP header

libraries/ESP8266WebServer/src/ESP8266WebServer-impl.h

@@ -41,6 +41,7 @@ ESP8266WebServerTemplate<ServerType>::ESP8266WebServerTemplate(IPAddress addr, i
 , _currentVersion(0)
 , _currentStatus(HC_NONE)
 , _statusChange(0)
+, _keepAlive(false)
 , _currentHandler(nullptr)
 , _firstHandler(nullptr)
 , _lastHandler(nullptr)
@@ -316,6 +317,10 @@ void ESP8266WebServerTemplate<ServerType>::handleClient() {
     "??");
 
   if (_currentClient.connected() || _currentClient.available()) {
+    if (_currentClient.available() && _keepAlive) {
+      _currentStatus = HC_WAIT_READ;
+    }
+
     switch (_currentStatus) {
     case HC_NONE:
       // No-op to avoid C++ compiler warning
@@ -443,7 +448,14 @@ void ESP8266WebServerTemplate<ServerType>::_prepareHeader(String& response, int
     if (_corsEnabled) {
       sendHeader(String(F("Access-Control-Allow-Origin")), String("*"));
     }
-    sendHeader(String(F("Connection")), String(F("close")));
+
+    if (_keepAlive && _server.hasClient()) { // Disable keep alive if another client is waiting.
+      _keepAlive = false;
+    }
+    sendHeader(String(F("Connection")), String(_keepAlive ? F("keep-alive") : F("close")));
+    if (_keepAlive) {
+      sendHeader(String(F("Keep-Alive")), String(F("timeout=")) + HTTP_MAX_CLOSE_WAIT);
+    }
 
     response += _responseHeaders;
     response += "\r\n";

libraries/ESP8266WebServer/src/ESP8266WebServer.h

@@ -119,7 +119,7 @@ class ESP8266WebServerTemplate
 
   const String& uri() const { return _currentUri; }
   HTTPMethod method() const { return _currentMethod; }
-  ClientType client() { return _currentClient; }
+  ClientType& client() { return _currentClient; }
   HTTPUpload& upload() { return *_currentUpload; }
 
   // Allows setting server options (i.e. SSL keys) by the instantiator
@@ -184,6 +184,14 @@ class ESP8266WebServerTemplate
     sendContent(emptyString);
   }
 
+  // Whether other requests should be accepted from the client on the
+  // same socket after a response is sent.
+  // This will automatically configure the "Connection" header of the response.
+  // Defaults to true when the client's HTTP version is 1.1 or above, otherwise it defaults to false.
+  // If the client sends the "Connection" header, the value given by the header is used.
+  void keepAlive(bool keepAlive) { _keepAlive = keepAlive; }
+  bool keepAlive() { return _keepAlive; }
+
   static String credentialHash(const String& username, const String& realm, const String& password);
 
   static String urlDecode(const String& text);
@@ -254,6 +262,7 @@ class ESP8266WebServerTemplate
   uint8_t     _currentVersion;
   HTTPClientStatus _currentStatus;
   unsigned long _statusChange;
+  bool _keepAlive;
 
   RequestHandlerType*  _currentHandler;
   RequestHandlerType*  _firstHandler;

libraries/ESP8266WebServer/src/Parsing-impl.h

@@ -109,8 +109,11 @@ typename ESP8266WebServerTemplate<ServerType>::ClientFuture ESP8266WebServerTemp
   }
   _currentMethod = method;
 
-  DBGWS("method: %s url: %s search: %s\n",
-      methodStr.c_str(), url.c_str(), searchStr.c_str());
+  _keepAlive = _currentVersion > 0; // Keep the connection alive by default
+                                    // if the protocol version is greater than HTTP 1.0
+
+  DBGWS("method: %s url: %s search: %s keepAlive=: %d\n",
+      methodStr.c_str(), url.c_str(), searchStr.c_str(), _keepAlive);
 
   //attach handler
   RequestHandlerType* handler;
@@ -133,7 +136,7 @@ typename ESP8266WebServerTemplate<ServerType>::ClientFuture ESP8266WebServerTemp
     while(1){
       req = client.readStringUntil('\r');
       client.readStringUntil('\n');
-      if (req.isEmpty()) break;//no moar headers
+      if (req.isEmpty()) break; //no more headers
       int headerDiv = req.indexOf(':');
       if (headerDiv == -1){
         break;
@@ -161,6 +164,8 @@ typename ESP8266WebServerTemplate<ServerType>::ClientFuture ESP8266WebServerTemp
         contentLength = headerValue.toInt();
       } else if (headerName.equalsIgnoreCase(F("Host"))){
         _hostHeader = headerValue;
+      } else if (headerName.equalsIgnoreCase(F("Connection"))){
+        _keepAlive = headerValue.equalsIgnoreCase(F("keep-alive"));
       }
     }
 
@@ -220,6 +225,8 @@ typename ESP8266WebServerTemplate<ServerType>::ClientFuture ESP8266WebServerTemp
 
       if (headerName.equalsIgnoreCase(F("Host"))){
         _hostHeader = headerValue;
+      } else if (headerName.equalsIgnoreCase(F("Connection"))){
+        _keepAlive = headerValue.equalsIgnoreCase(F("keep-alive"));
       }
     }
     _parseArguments(searchStr);

libraries/ESP8266WiFi/examples/BearSSL_CertStore/BearSSL_CertStore.ino

@@ -148,8 +148,8 @@ void setup() {
   BearSSL::WiFiClientSecure *bear = new BearSSL::WiFiClientSecure();
   // Integrate the cert store with this connection
   bear->setCertStore(&certStore);
-  Serial.printf("Attempting to fetch https://www.github.com/...\n");
-  fetchURL(bear, "www.github.com", 443, "/");
+  Serial.printf("Attempting to fetch https://github.com/...\n");
+  fetchURL(bear, "github.com", 443, "/");
   delete bear;
 }