changed simplesvr to compute md5 of attached file. Fixed decompressor to work with multiple payloads. Tested with huge gzipped files uploaded with curl

Author: skok-gpfw

example/Makefile

@@ -3,7 +3,7 @@
 CXXFLAGS = -std=c++14 -I.. -Wall -Wextra -pthread
 #OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib -lssl -lcrypto
 #OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -lssl -lcrypto
-OPENSSL_SUPPORT =
+OPENSSL_SUPPORT = 
 ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
 
 all: server client hello simplesvr redirect benchmark
@@ -18,7 +18,7 @@ hello : hello.cc ../httplib.h Makefile
 	$(CXX) -o hello $(CXXFLAGS) hello.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT)
 
 simplesvr : simplesvr.cc ../httplib.h Makefile
-	$(CXX) -o simplesvr $(CXXFLAGS) simplesvr.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT)
+	$(CXX) -o simplesvr $(CXXFLAGS) simplesvr.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) -lcrypto
 
 redirect : redirect.cc ../httplib.h Makefile
 	$(CXX) -o redirect $(CXXFLAGS) redirect.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT)

example/simplesvr.cc

@@ -8,6 +8,9 @@
 #include <cstdio>
 #include <httplib.h>
 #include <iostream>
+#include <sstream>
+#include <iomanip>
+#include <openssl/md5.h>
 
 #define SERVER_CERT_FILE "./cert.pem"
 #define SERVER_PRIVATE_KEY_FILE "./key.pem"
@@ -110,19 +113,32 @@ int main(int argc, const char **argv) {
   });
 
   svr.Post("/multi2", [](Stream& strm, const Request &req, Response &res) {
-    std::string rsp="req body stream is :\n";
+    std::ostringstream rsp;
+    rsp << "req body stream:\n";
+    MD5_CTX ctx;
+    MD5_Init(&ctx);
+    int nCall=0;
 
     detail::read_content(
         strm, req, std::numeric_limits<size_t>::max(), res.status
-    ,   req.progress, [&rsp] (const char *buf, size_t n){
-            rsp+="cut(";
-            rsp.append(buf,n);
-            rsp+=")\n";
+    ,   req.progress, [&] (const char *buf, size_t n){
+            MD5_Update(&ctx, buf, n);
+            nCall++;
             return true;
         }
     );
+    unsigned char result[MD5_DIGEST_LENGTH+1];
 
-    res.set_content(rsp, "text/plain");
+    rsp << "nCall:" << nCall <<std::endl;
+
+    MD5_Final(result, &ctx);
+    rsp << "md5:" ;
+    for(int i =0; i<MD5_DIGEST_LENGTH; i++) {
+        rsp << std::hex << std::setw(2) << std::setfill('0') << (int) result[i];
+    }
+    rsp << std::endl;
+
+    res.set_content(rsp.str(), "text/plain");
   });
 
   svr.set_error_handler([](const Request & /*req*/, Response &res) {

httplib.h

@@ -1367,11 +1367,10 @@ class decompressor {
       case Z_DATA_ERROR:
       case Z_MEM_ERROR: inflateEnd(&strm); return false;
       }
-
       if (!callback(buff, bufsiz - strm.avail_out)) { return false; }
     } while (strm.avail_out == 0);
 
-    return ret == Z_STREAM_END;
+    return true;
   }
 
 private: