diff --git a/src/app/WEBServerManager.cpp b/src/app/WEBServerManager.cpp index 88ac8d2..342462a 100644 --- a/src/app/WEBServerManager.cpp +++ b/src/app/WEBServerManager.cpp @@ -316,13 +316,8 @@ boolean WEBServerManager::sendPageToClientFromSdCard(WiFiClient *wifiClient) while(pageToSend.available()) { - if(wifiClient->write(sendBuffer, pageToSend.read(sendBuffer,2048)) == 0) break; - - /*readChar = (char) pageToSend.read(); - wifiClient->write(readChar); - Serial.print(readChar);*/ } pageToSend.close(); @@ -369,6 +364,7 @@ WEBServerManager::HttpMIMEType WEBServerManager::getMIMETypeByExtension(const ch else if(strcmp(extension,"css") == 0) return TEXT_CSS; else if(strcmp(extension,"js") == 0) return TEXT_JAVASCRIPT; else if(strcmp(extension,"png") == 0) return IMAGE_PNG; + else if(strcmp(extension,"jpg") == 0) return IMAGE_JPEG; else if(strcmp(extension, "mp3") == 0) return AUDIO_MPEG; else return UNKNOWN_MIME; } @@ -391,6 +387,9 @@ char *WEBServerManager::getHTTPHeader(HttpMIMEType httpMIMEType, unsigned long s case IMAGE_PNG: sprintf(header,"HTTP/1.1 200 OK\r\nContent-Type: %s\r\nContent-Length: %lu\r\n\r\n","image/png",size); break; + case IMAGE_JPEG: + sprintf(header,"HTTP/1.1 200 OK\r\nContent-Type: %s\r\nContent-Length: %lu\r\n\r\n","image/jpeg",size); + break; case TEXT_PLAIN: sprintf(header,"HTTP/1.1 200 OK\r\nContent-Type: %s\r\nContent-Length: %lu\r\n\r\n","text/plain",size); break; diff --git a/src/app/WEBServerManager.h b/src/app/WEBServerManager.h index 9c195a2..87a9760 100644 --- a/src/app/WEBServerManager.h +++ b/src/app/WEBServerManager.h @@ -16,7 +16,7 @@ class WEBServerManager enum HttpRequestMethod {UNDEFINED, GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE, PATCH}; enum HttpVersion {UNKNOWN, HTTP_0_9, HTTP_1_1, HTTP_1_0, HTTP_2_0}; enum HttpParserStatus {INIT, LINE_BREAK, HTTP_VERB_SECTION, HTTP_RESOURCE_SECTION, HTTP_RESOURCE_PARAM_SECTION, HTTP_VER_SECTION, PARAMETER_SECTION, BODY_SECTION, IGNORED, ERROR}; - enum HttpMIMEType{UNKNOWN_MIME, TEXT_PLAIN, TEXT_CSS, TEXT_HTML, TEXT_JAVASCRIPT, APPLICATION_JSON, APPLICATION_X_WWW_FORM_URLENCODED, IMAGE_PNG, AUDIO_MPEG, APPLICATION_OCTET_STREAM}; + enum HttpMIMEType{UNKNOWN_MIME, TEXT_PLAIN, TEXT_CSS, TEXT_HTML, TEXT_JAVASCRIPT, APPLICATION_JSON, APPLICATION_X_WWW_FORM_URLENCODED, IMAGE_PNG, IMAGE_JPEG, AUDIO_MPEG, APPLICATION_OCTET_STREAM}; struct HttpRequestData{ HttpRequestMethod HRM; HttpVersion HV;