From f505be9a08741796b9d4570184d0d8732d52b9c3 Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@vdnsbg.com>
Date: Tue, 22 Dec 2015 01:41:57 +0200
Subject: [PATCH] fixes

---
 examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino |  2 +-
 src/WebResponses.cpp                               |  4 ++--
 src/WebServerClient.cpp                            | 12 +++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino b/examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino
index 1139447..23c9e10 100644
--- a/examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino
+++ b/examples/ESP_AsyncFSBrowser/ESP_AsyncFSBrowser.ino
@@ -30,7 +30,7 @@ class SPIFFSEditor: public AsyncWebHandler {
     }
 
     void handleRequest(AsyncWebServerRequest *request){
-      if(_username.length() && (request->method() != HTTP_GET || (request->url() != "/edit" && request->url() != "/list")) && !request->authenticate(_username.c_str(),_password.c_str()))
+      if(_username.length() && (request->method() != HTTP_GET || request->url() == "/edit" || request->url() == "/list") && !request->authenticate(_username.c_str(),_password.c_str()))
         return request->requestAuthentication();
 
       if(request->method() == HTTP_GET && request->url() == "/edit"){
diff --git a/src/WebResponses.cpp b/src/WebResponses.cpp
index 01b5d0f..10031e0 100644
--- a/src/WebResponses.cpp
+++ b/src/WebResponses.cpp
@@ -218,11 +218,11 @@ size_t AsyncAbstractResponse::_ack(AsyncWebServerRequest *request, size_t len, u
   if(_state == RESPONSE_CONTENT){
     size_t remaining = _contentLength - _sentLength;
     size_t outLen = (remaining > space)?space:remaining;
-    uint8_t *buf = (uint8_t *)os_malloc(outLen);
+    uint8_t *buf = (uint8_t *)malloc(outLen);
     outLen = _fillBuffer(buf, outLen);
     request->client()->write((const char*)buf, outLen);
     _sentLength += outLen;
-    os_free(buf);
+    free(buf);
     if(_sentLength == _contentLength){
       _state = RESPONSE_WAIT_ACK;
     }
diff --git a/src/WebServerClient.cpp b/src/WebServerClient.cpp
index 2d0cf81..09436b5 100644
--- a/src/WebServerClient.cpp
+++ b/src/WebServerClient.cpp
@@ -79,7 +79,6 @@ AsyncWebServerRequest::~AsyncWebServerRequest(){
 }
 
 void AsyncWebServerRequest::_onData(void *buf, size_t len){
-  //os_printf("r:%u\n", len);
   if(_parseState < PARSE_REQ_BODY){
     size_t i;
     for(i=0; i<len; i++){
@@ -291,7 +290,8 @@ void AsyncWebServerRequest::_parsePlainPostChar(uint8_t data){
 void AsyncWebServerRequest::_handleUploadByte(uint8_t data, bool last){
   _itemBuffer[_itemBufferIndex++] = data;
   if(last){
-    if(_handler) _handler->handleUpload(this, _itemFilename, _itemSize - _itemBufferIndex, _itemBuffer, _itemBufferIndex, false);
+    if(_handler)
+      _handler->handleUpload(this, _itemFilename, _itemSize - _itemBufferIndex, _itemBuffer, _itemBufferIndex, false);
     _itemBufferIndex = 0;
   }
 }
@@ -312,6 +312,7 @@ enum {
 
 void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
 #define itemWriteByte(b) do { _itemSize++; if(_itemIsFile) _handleUploadByte(b, last); else _itemValue+=(char)(b); } while(0)
+
   if(!_parsedLength){
     _multiParseState = EXPECT_BOUNDARY;
     _temp = String();
@@ -377,8 +378,8 @@ void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
         _itemValue = String();
         if(_itemIsFile){
           if(_itemBuffer)
-            os_free(_itemBuffer);
-          _itemBuffer = (uint8_t*)os_malloc(1460);
+            free(_itemBuffer);
+          _itemBuffer = (uint8_t*)malloc(1460);
           _itemBufferIndex = 0;
         }
       }
@@ -429,13 +430,14 @@ void AsyncWebServerRequest::_parseMultipartPostByte(uint8_t data, bool last){
           _itemBufferIndex = 0;
           _addParam(new AsyncWebParameter(_itemName, _itemFilename, true, true, _itemSize));
         }
-        os_free(_itemBuffer);
+        free(_itemBuffer);
       }
 
     } else {
       _boundaryPosition++;
     }
   } else if(_multiParseState == DASH3_OR_RETURN2){
+    os_printf("X:%u:'%c'\n",_contentLength - _parsedLength - 4,data);
     if(data == '\r'){
       _multiParseState = EXPECT_FEED2;
     } else if(data == '-' && _contentLength == (_parsedLength + 4)){