aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Sardara <msardara+fdio@cisco.com>2017-08-09 13:24:33 +0200
committerMauro Sardara <msardara+fdio@cisco.com>2017-08-09 13:24:33 +0200
commit0475d783825a6f649853da581df5d812cf5f3bae (patch)
tree9c7c183c25d402253a2850b5534a2254e2d28dd5
parentd80dcfd06b5be6b950cde09194161ff0f10dde27 (diff)
Removed sequential content forward when acting as http proxy.
Change-Id: I19a146a9b306b3504cd40d15b909b3a923af8840 Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>
-rw-r--r--http-client/http_client.cc7
-rw-r--r--main.cc8
2 files changed, 6 insertions, 9 deletions
diff --git a/http-client/http_client.cc b/http-client/http_client.cc
index a2e9800b..221e7bbe 100644
--- a/http-client/http_client.cc
+++ b/http-client/http_client.cc
@@ -13,7 +13,6 @@
* limitations under the License.
*/
-#include "response.h"
#include "http_client.h"
#include <curl/curl.h>
@@ -21,11 +20,9 @@
#include <iostream>
using namespace std;
-using namespace icn_httpserver;
size_t write_data(void *ptr, size_t size, size_t nmemb, void *stream) {
- ((Response*) stream)->write((const char*)ptr, size * nmemb);
- ((Response*) stream)->send();
+ ((ostream*) stream)->write((const char*)ptr, size * nmemb);
return size * nmemb;
}
@@ -59,4 +56,4 @@ bool HTTPClient::download(const std::string& url, std::ostream& out) {
}
return true;
-}
+} \ No newline at end of file
diff --git a/main.cc b/main.cc
index 56e8fedc..e3b6e078 100644
--- a/main.cc
+++ b/main.cc
@@ -153,14 +153,14 @@ int main(int argc, char **argv) {
boost::filesystem::path path = web_root_path;
path /= request->getPath();
+ if (path.extension().string() == ".mpd") {
+ response->setResponseLifetime(std::chrono::milliseconds(1000));
+ }
+
if (boost::filesystem::exists(path)) {
path = boost::filesystem::canonical(path);
- if (path.extension().string() == ".mpd") {
- response->setResponseLifetime(std::chrono::milliseconds(1000));
- }
-
//Check if path is within web_root_path
if (distance(web_root_path.begin(), web_root_path.end()) <= distance(path.begin(), path.end())
&& equal(web_root_path.begin(), web_root_path.end(), path.begin())) {