From 555813545caddcc168d77451f389702922652c72 Mon Sep 17 00:00:00 2001
From: ficeto <ficeto@Hristos-Mac-mini-2.local>
Date: Tue, 19 May 2015 14:06:34 +0300
Subject: [PATCH] Make the web server not waste heap

added some helper methods as well
---
 .../ESP8266WebServer/src/ESP8266WebServer.cpp | 20 ++++++++++++++++++-
 .../ESP8266WebServer/src/ESP8266WebServer.h   | 11 +++++++++-
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
index 391cc556c..054929971 100644
--- a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
+++ b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@@ -101,7 +101,8 @@ void ESP8266WebServer::handleClient()
 #endif
 
   // Wait for data from client to become available
-  while(client.connected() && !client.available()){
+  uint16_t maxWait = HTTP_MAX_DATA_WAIT;
+  while(client.connected() && !client.available() && maxWait--){
     delay(1);
   }
 
@@ -136,7 +137,12 @@ void ESP8266WebServer::send(int code, const char* content_type, String content)
 
   if (!content_type)
     content_type = "text/html";
+  
+  String len(content.length());
   sendHeader("Content-Type", content_type, true);
+  sendHeader("Content-Length", len.c_str());
+  sendHeader("Connection", "close");
+  sendHeader("Access-Control-Allow-Origin", "*");
   
   response += _responseHeaders;
   response += "\r\n";
@@ -145,6 +151,14 @@ void ESP8266WebServer::send(int code, const char* content_type, String content)
   sendContent(response);
 }
 
+void ESP8266WebServer::send(int code, char* content_type, String content) {
+  send(code, (const char*)content_type, content);
+}
+
+void ESP8266WebServer::send(int code, String content_type, String content) {
+  send(code, (const char*)content_type.c_str(), content);
+}
+
 void ESP8266WebServer::sendContent(String content) {
   size_t size_to_send = content.length();
   size_t size_sent = 0;
@@ -158,6 +172,10 @@ void ESP8266WebServer::sendContent(String content) {
       break;
     }
   }
+  uint16_t maxWait = HTTP_MAX_CLOSE_WAIT;
+  while(_currentClient.connected() && maxWait--) {
+    delay(1);
+  }
 }
 
 String ESP8266WebServer::arg(const char* name) {
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
index d957e15ba..9f2b16480 100644
--- a/libraries/ESP8266WebServer/src/ESP8266WebServer.h
+++ b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
@@ -31,6 +31,8 @@ enum HTTPUploadStatus { UPLOAD_FILE_START, UPLOAD_FILE_WRITE, UPLOAD_FILE_END };
 
 #define HTTP_DOWNLOAD_UNIT_SIZE 1460
 #define HTTP_UPLOAD_BUFLEN 2048
+#define HTTP_MAX_DATA_WAIT 1000 //ms to wait for the client to send the request
+#define HTTP_MAX_CLOSE_WAIT 2000 //ms to wait for the client to close the connection
 
 typedef struct {
   HTTPUploadStatus status;
@@ -73,6 +75,8 @@ public:
   // content_type - HTTP content type, like "text/plain" or "image/png"
   // content - actual content body
   void send(int code, const char* content_type = NULL, String content = String(""));
+  void send(int code, char* content_type, String content);
+  void send(int code, String content_type, String content);
 
   void sendHeader(String name, String value, bool first = false);
   void sendContent(String content);
@@ -87,7 +91,12 @@ template<typename T> size_t streamFile(T &file, String contentType){
   head += "\r\n\r\n";
   _currentClient.print(head);
   head = String();
-  return _currentClient.write(file, HTTP_DOWNLOAD_UNIT_SIZE);
+  size_t res =  _currentClient.write(file, HTTP_DOWNLOAD_UNIT_SIZE);
+  uint16_t maxWait = HTTP_MAX_CLOSE_WAIT;
+  while(_currentClient.connected() && maxWait--) {
+    delay(1);
+  }
+  return res;
 }
   
 protected: