Merge branch 'master' into patch-1

libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp

@@ -33,6 +33,10 @@
 class TransportTraits
 {
 public:
+    virtual ~TransportTraits() 
+    {
+    }
+
     virtual std::unique_ptr<WiFiClient> create()
     {
         return std::unique_ptr<WiFiClient>(new WiFiClient());
@@ -624,6 +628,13 @@ int HTTPClient::writeToStream(Stream * stream)
                 break;
             }
 
+            // read trailing \r\n at the end of the chunk
+            char buf[2];
+            auto trailing_seq_len = _tcp->readBytes((uint8_t*)buf, 2);
+            if (trailing_seq_len != 2 || buf[0] != '\r' || buf[1] != '\n') {
+                return returnError(HTTPC_ERROR_READ_TIMEOUT);
+            }
+
             delay(0);
         }
     } else {

libraries/ESP8266WiFi/src/include/UdpContext.h

@@ -213,7 +213,7 @@ public:
         return size;
     }
 
-    char peek()
+    int peek()
     {
         if (!_rx_buf || _rx_buf_offset == _rx_buf->len)
             return -1;