diff options
-rw-r--r-- | include/mbgl/util/constants.hpp (renamed from src/mbgl/util/constants.hpp) | 1 | ||||
-rw-r--r-- | platform/darwin/http_request_baton_cocoa.mm | 3 | ||||
-rw-r--r-- | platform/default/http_request_baton_curl.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/util/constants.cpp | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/src/mbgl/util/constants.hpp b/include/mbgl/util/constants.hpp index 98365e0f32..2270f53072 100644 --- a/src/mbgl/util/constants.hpp +++ b/include/mbgl/util/constants.hpp @@ -8,6 +8,7 @@ namespace mbgl { namespace util { extern const float tileSize; +extern const char *userAgent; } diff --git a/platform/darwin/http_request_baton_cocoa.mm b/platform/darwin/http_request_baton_cocoa.mm index 1c256d0ba8..4030138970 100644 --- a/platform/darwin/http_request_baton_cocoa.mm +++ b/platform/darwin/http_request_baton_cocoa.mm @@ -2,6 +2,7 @@ #include <mbgl/util/std.hpp> #include <mbgl/util/parsedate.h> #include <mbgl/util/time.hpp> +#include <mbgl/util/constants.hpp> #include <uv.h> @@ -40,6 +41,8 @@ void HTTPRequestBaton::start(const util::ptr<HTTPRequestBaton> &ptr) { } } + [request addValue:@(util::userAgent) forHTTPHeaderField:@"User-Agent"]; + NSURLSessionDataTask *task = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *res, NSError *error) { if (error) { diff --git a/platform/default/http_request_baton_curl.cpp b/platform/default/http_request_baton_curl.cpp index f05ee5acf9..42915d3e79 100644 --- a/platform/default/http_request_baton_curl.cpp +++ b/platform/default/http_request_baton_curl.cpp @@ -3,6 +3,7 @@ #include <mbgl/util/time.hpp> #include <mbgl/util/string.hpp> #include <mbgl/util/std.hpp> +#include <mbgl/util/constants.hpp> #include <uv.h> #include <curl/curl.h> @@ -444,6 +445,7 @@ void start_request(void *const ptr) { curl_easy_setopt(context->handle, CURLOPT_HEADERFUNCTION, curl_header_cb); curl_easy_setopt(context->handle, CURLOPT_HEADERDATA, &context->baton->response); curl_easy_setopt(context->handle, CURLOPT_ACCEPT_ENCODING, "gzip, deflate"); + curl_easy_setopt(context->handle, CURLOPT_USERAGENT, util::userAgent); curl_easy_setopt(context->handle, CURLOPT_SHARE, share); // Start requesting the information. diff --git a/src/mbgl/util/constants.cpp b/src/mbgl/util/constants.cpp index 3d1422e6c7..c37bc14801 100644 --- a/src/mbgl/util/constants.cpp +++ b/src/mbgl/util/constants.cpp @@ -1,6 +1,7 @@ #include <mbgl/util/constants.hpp> const float mbgl::util::tileSize = 512.0f; +const char *mbgl::util::userAgent = "MapboxGL/1.0 (+https://mapbox.com/mapbox-gl/)"; #if defined(DEBUG) const bool mbgl::debug::tileParseWarnings = false; |