diff options
| -rw-r--r-- | http-client/http_client.cc | 7 | ||||
| -rw-r--r-- | main.cc | 8 |
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 @@ -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())) { |