Merge pull request esp8266#988 from JohnSL/issue_987

igrr · igrr · commit 6af4bf5496d7 · 2015-11-11T01:11:31.000+03:00
Exclude the terminator in sendContent_P
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@@ -226,8 +226,8 @@ void ESP8266WebServer::sendContent_P(PGM_P content) {
             contentUnitLen = HTTP_DOWNLOAD_UNIT_SIZE;
         }
         else {
-            // reached terminator
-            contentUnitLen = contentNext - contentUnit;
+            // reached terminator. Do not send the terminator
+            contentUnitLen = contentNext - contentUnit - 1;
             content = NULL;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -226,8 +226,8 @@ void ESP8266WebServer::sendContent_P(PGM_P content) {`
`226`	`226`	`contentUnitLen = HTTP_DOWNLOAD_UNIT_SIZE;`
`227`	`227`	`}`
`228`	`228`	`else {`
`229`		`- // reached terminator`
`230`		`- contentUnitLen = contentNext - contentUnit;`
	`229`	`+ // reached terminator. Do not send the terminator`
	`230`	`+ contentUnitLen = contentNext - contentUnit - 1;`
`231`	`231`	`content = NULL;`
`232`	`232`	`}`
`233`	`233`