Web server: disconnect at the end of callback, not after sendContent (esp8266#304)

igrr · igrr · commit 0480205c6baf · 2015-05-22T16:19:08.000+03:00
diff --git a/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/hardware/esp8266com/esp8266/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@@ -172,10 +172,6 @@ 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) {
@@ -245,6 +241,10 @@ void ESP8266WebServer::_handleRequest() {
     }
   }
 
+  uint16_t maxWait = HTTP_MAX_CLOSE_WAIT;
+  while(_currentClient.connected() && maxWait--) {
+    delay(1);
+  }
   _currentClient   = WiFiClient();
   _currentUri      = String();
 }

Original file line number	Diff line number	Diff line change
`@@ -172,10 +172,6 @@ void ESP8266WebServer::sendContent(String content) {`
`172`	`172`	`break;`
`173`	`173`	`}`
`174`	`174`	`}`
`175`		`- uint16_t maxWait = HTTP_MAX_CLOSE_WAIT;`
`176`		`- while(_currentClient.connected() && maxWait--) {`
`177`		`- delay(1);`
`178`		`- }`
`179`	`175`	`}`
`180`	`176`
`181`	`177`	`String ESP8266WebServer::arg(const char* name) {`
`@@ -245,6 +241,10 @@ void ESP8266WebServer::_handleRequest() {`
`245`	`241`	`}`
`246`	`242`	`}`
`247`	`243`
	`244`	`+ uint16_t maxWait = HTTP_MAX_CLOSE_WAIT;`
	`245`	`+ while(_currentClient.connected() && maxWait--) {`
	`246`	`+ delay(1);`
	`247`	`+ }`
`248`	`248`	`_currentClient = WiFiClient();`
`249`	`249`	`_currentUri = String();`
`250`	`250`	`}`