Merge pull request esp8266#8 from esp8266/master

Update

Author: Jason2866

libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp

@@ -225,6 +225,11 @@ bool HTTPClient::begin(String url, String httpsFingerprint)
         return false;
     }
     _transportTraits = TransportTraitsPtr(new TLSTraits(httpsFingerprint));
+    if(!_transportTraits) {
+        DEBUG_HTTPCLIENT("[HTTP-Client][begin] could not create transport traits\n");
+        return false;
+    }
+
     DEBUG_HTTPCLIENT("[HTTP-Client][begin] httpsFingerprint: %s\n", httpsFingerprint.c_str());
     return true;
 }
@@ -242,6 +247,11 @@ bool HTTPClient::begin(String url, const uint8_t httpsFingerprint[20])
         return false;
     }
     _transportTraits = TransportTraitsPtr(new BearSSLTraits(httpsFingerprint));
+    if(!_transportTraits) {
+        DEBUG_HTTPCLIENT("[HTTP-Client][begin] could not create transport traits\n");
+        return false;
+    }
+
     DEBUG_HTTPCLIENT("[HTTP-Client][begin] BearSSL-httpsFingerprint:");
     for (size_t i=0; i < 20; i++) {
         DEBUG_HTTPCLIENT(" %02x", httpsFingerprint[i]);
@@ -409,7 +419,7 @@ bool HTTPClient::begin(String host, uint16_t port, String uri, const uint8_t htt
  */
 void HTTPClient::end(void)
 {
-    disconnect();
+    disconnect(false);
     clear();
     _redirectCount = 0;
 }
@@ -563,6 +573,7 @@ void HTTPClient::setRedirectLimit(uint16_t limit)
 void HTTPClient::useHTTP10(bool useHTTP10)
 {
     _useHTTP10 = useHTTP10;
+    _reuse = !useHTTP10;
 }
 
 /**
@@ -980,7 +991,7 @@ int HTTPClient::writeToStream(Stream * stream)
         return returnError(HTTPC_ERROR_ENCODING);
     }
 
-    disconnect();
+    disconnect(true);
     return ret;
 }
 
@@ -1139,7 +1150,11 @@ bool HTTPClient::hasHeader(const char* name)
 bool HTTPClient::connect(void)
 {
     if(connected()) {
-        DEBUG_HTTPCLIENT("[HTTP-Client] connect. already connected, try reuse!\n");
+        if(_reuse) {
+            DEBUG_HTTPCLIENT("[HTTP-Client] connect: already connected, reusing connection\n");
+        } else {
+            DEBUG_HTTPCLIENT("[HTTP-Client] connect: already connected, try reuse!\n");
+        }
         while(_client->available() > 0) {
             _client->read();
         }
@@ -1149,6 +1164,10 @@ bool HTTPClient::connect(void)
 #if HTTPCLIENT_1_1_COMPATIBLE
     if(!_client && _transportTraits) {
         _tcpDeprecated = _transportTraits->create();
+        if(!_tcpDeprecated) {
+            DEBUG_HTTPCLIENT("[HTTP-Client] connect: could not create tcp\n");
+            return false;
+        }
         _client = _tcpDeprecated.get();
     }
 #endif
@@ -1246,9 +1265,12 @@ int HTTPClient::handleHeaderResponse()
         return HTTPC_ERROR_NOT_CONNECTED;
     }
 
+    clear();
+
+    _canReuse = _reuse;
+
     String transferEncoding;
-    _returnCode = -1;
-    _size = -1;
+
     _transferEncoding = HTTPC_TE_IDENTITY;
     unsigned long lastDataTime = millis();
 
@@ -1263,6 +1285,9 @@ int HTTPClient::handleHeaderResponse()
             DEBUG_HTTPCLIENT("[HTTP-Client][handleHeaderResponse] RX: '%s'\n", headerLine.c_str());
 
             if(headerLine.startsWith("HTTP/1.")) {
+                if(_canReuse) {
+                    _canReuse = (headerLine[sizeof "HTTP/1." - 1] != '0');
+                }
                 _returnCode = headerLine.substring(9, headerLine.indexOf(' ', 9)).toInt();
             } else if(headerLine.indexOf(':')) {
                 String headerName = headerLine.substring(0, headerLine.indexOf(':'));
@@ -1273,8 +1298,10 @@ int HTTPClient::handleHeaderResponse()
                     _size = headerValue.toInt();
                 }
 
-                if(headerName.equalsIgnoreCase("Connection")) {
-                    _canReuse = headerValue.equalsIgnoreCase("keep-alive");
+                if(_canReuse && headerName.equalsIgnoreCase("Connection")) {
+                    if(headerValue.indexOf("close") >= 0 && headerValue.indexOf("keep-alive") < 0) {
+                        _canReuse = false;
+                    }
                 }
 
                 if(headerName.equalsIgnoreCase("Transfer-Encoding")) {

libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h

@@ -235,7 +235,7 @@ class HTTPClient
     /// request handling
     String _host;
     uint16_t _port = 0;
-    bool _reuse = false;
+    bool _reuse = true;
     uint16_t _tcpTimeout = HTTPCLIENT_DEFAULT_TCP_TIMEOUT;
     bool _useHTTP10 = false;
 

libraries/ESP8266WiFi/src/include/ClientContext.h

@@ -128,14 +128,14 @@ class ClientContext
         if (err != ERR_OK) {
             return 0;
         }
-        _connect_pending = 1;
+        _delaying = true;
         _op_start_time = millis();
         // Following delay will be interrupted by connect callback
-        for (decltype(_timeout_ms) i = 0; _connect_pending && i < _timeout_ms; i++) {
+        for (decltype(_timeout_ms) i = 0; _delaying && i < _timeout_ms; i++) {
                // Give scheduled functions a chance to run (e.g. Ethernet uses recurrent)
                delay(1);
-       }
-        _connect_pending = 0;
+        }
+        _delaying = false;
         if (!_pcb) {
             DEBUGV(":cabrt\r\n");
             return 0;
@@ -432,15 +432,16 @@ class ClientContext
 
     void _notify_error()
     {
-        if (_connect_pending || _send_waiting) {
-            esp_schedule();
+        if (_delaying) {
+            _delaying = false;
+            esp_schedule(); // break current delay()
         }
     }
 
     size_t _write_from_source(DataSource* ds)
     {
         assert(_datasource == nullptr);
-        assert(!_send_waiting);
+        assert(!_delaying);
         _datasource = ds;
         _written = 0;
         _op_start_time = millis();
@@ -458,14 +459,14 @@ class ClientContext
                 break;
             }
 
-            _send_waiting = true;
+            _delaying = true;
             // Following delay will be interrupted by on next received ack
-            for (decltype(_timeout_ms) i = 0; _send_waiting && i < _timeout_ms; i++) {
+            for (decltype(_timeout_ms) i = 0; _delaying && i < _timeout_ms; i++) {
                // Give scheduled functions a chance to run (e.g. Ethernet uses recurrent)
                delay(1);
             }
+            _delaying = false;
         } while(true);
-        _send_waiting = false;
 
         if (_sync)
             wait_until_sent();
@@ -532,9 +533,9 @@ class ClientContext
 
     void _write_some_from_cb()
     {
-        if (_send_waiting) {
-            _send_waiting = false;
-            esp_schedule();
+        if (_delaying) {
+            _delaying = false;
+            esp_schedule(); // break current delay()
         }
     }
 
@@ -608,9 +609,9 @@ class ClientContext
         (void) err;
         (void) pcb;
         assert(pcb == _pcb);
-        assert(_connect_pending);
-        _connect_pending = 0;
-        esp_schedule();
+        assert(_delaying);
+        _delaying = false;
+        esp_schedule(); // break current delay()
         return ERR_OK;
     }
 
@@ -658,8 +659,7 @@ class ClientContext
     size_t _written = 0;
     uint32_t _timeout_ms = 5000;
     uint32_t _op_start_time = 0;
-    bool _send_waiting = false;
-    uint8_t _connect_pending = 0;
+    bool _delaying = false;
 
     int8_t _refcnt;
     ClientContext* _next;