diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-19 18:32:33 -0800 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-22 18:41:54 -0800 |
commit | cef5c331fe6ab827e71aed1e4e0387983083c88e (patch) | |
tree | 47c71da0e81f25678640032d5708212ef022072e /platform/default/http_request_curl.cpp | |
parent | 5cd123422ed026912c53c44a393f141f990a09df (diff) | |
download | qtlocation-mapboxgl-cef5c331fe6ab827e71aed1e4e0387983083c88e.tar.gz |
[core] Merge rfc1123, iso8601, and parse_date into chrono.hpp and fix their API
Diffstat (limited to 'platform/default/http_request_curl.cpp')
-rw-r--r-- | platform/default/http_request_curl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/platform/default/http_request_curl.cpp b/platform/default/http_request_curl.cpp index 078a172c2b..3129dc7a94 100644 --- a/platform/default/http_request_curl.cpp +++ b/platform/default/http_request_curl.cpp @@ -3,7 +3,6 @@ #include <mbgl/storage/response.hpp> #include <mbgl/platform/log.hpp> -#include <mbgl/util/time.hpp> #include <mbgl/util/util.hpp> #include <mbgl/util/run_loop.hpp> #include <mbgl/util/string.hpp> @@ -368,7 +367,7 @@ HTTPCURLRequest::HTTPCURLRequest(HTTPCURLContext* context_, const std::string& u headers = curl_slist_append(headers, header.c_str()); } else if (existingResponse->modified) { const std::string time = - std::string("If-Modified-Since: ") + util::rfc1123(SystemClock::to_time_t(*existingResponse->modified)); + std::string("If-Modified-Since: ") + util::rfc1123(*existingResponse->modified); headers = curl_slist_append(headers, time.c_str()); } } |