From: Mauro Sardara <msardara+fdio@cisco.com>
Date: Wed, 12 Jul 2017 11:18:10 +0000 (+0200)
Subject: Adapt http-server to last modifications to libicnet.
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F7528%2F1;p=cicn.git

Adapt http-server to last modifications to libicnet.

Change-Id: I5a22a857adee4b7861f1daabbc7450ca6a4208cf
Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>
---

diff --git a/http-server/http_server.cc b/http-server/http_server.cc
index 6bdf18f2..51994686 100644
--- a/http-server/http_server.cc
+++ b/http-server/http_server.cc
@@ -54,7 +54,6 @@ HttpServer::HttpServer(unsigned short port,
 void HttpServer::onIcnRequest(std::shared_ptr<libl4::http::HTTPServerPublisher> &publisher,
                               const uint8_t *buffer,
                               std::size_t size) {
-  publisher->setTimeout(5);
   std::shared_ptr<Request> request = std::make_shared<IcnRequest>(publisher);
   request->getContent().rdbuf()->sputn((char*)buffer, size);
 
@@ -71,6 +70,8 @@ void HttpServer::onIcnRequest(std::shared_ptr<libl4::http::HTTPServerPublisher>
     if (icn_publishers_.find(request_id) == icn_publishers_.end()) {
       std::cout << "Received request for: " << request->getPath() << std::endl;
       icn_publishers_[request_id] = publisher;
+      icn_publishers_[request_id]->attachPublisher();
+      icn_publishers_[request_id]->setTimeout(5);
       std::cout << "Starting new thread" << std::endl;
       io_service_.dispatch([this, request, request_id]() {
         find_resource(nullptr, request);