Generalize send_header into its own method

Reduces duplication

Also enables users to only send the header using this API and to pass
the client to a function that prints to a stream

Author: MarcelRobitaille

src/internals/StreamHttpReply.cpp

@@ -18,42 +18,37 @@ ArduinoHttpServer::AbstractStreamHttpReply::AbstractStreamHttpReply(Stream& stre
 
 }
 
-//------------------------------------------------------------------------------
-//! \brief Send this reply / print this reply to stream.
-//! \todo: Accept char* also for data coming directly from flash.
-void ArduinoHttpServer::AbstractStreamHttpReply::send(const String& data, const String& title)
+void ArduinoHttpServer::AbstractStreamHttpReply::sendHeader(size_t size)
 {
    // Read away remaining bytes.
    while(getStream().read()>=0);
 
-   DEBUG_ARDUINO_HTTP_SERVER_PRINT("Printing Reply ... ");
-
    getStream().print( AHS_F("HTTP/1.1 ") );
    getStream().print( getCode() + " ");
-   getStream().print( title + "\r\n" );
    getStream().print( AHS_F("Connection: close\r\n") );
-   getStream().print( AHS_F("Content-Length: ") ); getStream().print( data.length()); getStream().print( AHS_F("\r\n") );
+   if (size > 0)
+   {
+      getStream().print( AHS_F("Content-Length: ") ); getStream().print(size); getStream().print( AHS_F("\r\n") );
+   }
    getStream().print( AHS_F("Content-Type: ") ); getStream().print( m_contentType ); getStream().print( AHS_F("\r\n") );
    getStream().print( AHS_F("\r\n") );
-   getStream().print( data ); getStream().print( AHS_F("\r\n") );
+}
 
+//------------------------------------------------------------------------------
+//! \brief Send this reply / print this reply to stream.
+//! \todo: Accept char* also for data coming directly from flash.
+void ArduinoHttpServer::AbstractStreamHttpReply::send(const String& data, const String& title)
+{
+   DEBUG_ARDUINO_HTTP_SERVER_PRINT("Printing Reply ... ");
+   AbstractStreamHttpReply::sendHeader(data.length());
+   getStream().print( data ); getStream().print( AHS_F("\r\n") );
    DEBUG_ARDUINO_HTTP_SERVER_PRINTLN("done.");
 }
 
 void ArduinoHttpServer::AbstractStreamHttpReply::send(const uint8_t* buf, const size_t size) {
-   // Read away remaining bytes.
-   while(getStream().read()>=0);
-
    DEBUG_ARDUINO_HTTP_SERVER_PRINT("Printing Reply ... ");
-
-   getStream().print( AHS_F("HTTP/1.1 ") );
-   getStream().print( getCode() + " ");
-   getStream().print( AHS_F("Connection: close\r\n") );
-   getStream().print( AHS_F("Content-Length: ") ); getStream().print(size); getStream().print( AHS_F("\r\n") );
-   getStream().print( AHS_F("Content-Type: ") ); getStream().print( m_contentType ); getStream().print( AHS_F("\r\n") );
-   getStream().print( AHS_F("\r\n") );
+   AbstractStreamHttpReply::sendHeader(size);
    getStream().write(buf, size);
-
    DEBUG_ARDUINO_HTTP_SERVER_PRINTLN("done.");
 }
 

src/internals/StreamHttpReply.hpp

@@ -25,6 +25,7 @@ class AbstractStreamHttpReply
 {
 
 public:
+    virtual void sendHeader(size_t size);
     virtual void send(const String& data, const String& title);
     virtual void send(const uint8_t* buf, const size_t size);