From 0e3f111a79ecd81f0bd4663daa0a1cb6deca161d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Tue, 4 Nov 2014 16:35:08 +0100
Subject: [PATCH] also use custom formatter for OS X

---
 platform/darwin/http_request_baton_cocoa.mm | 13 +++----------
 test/suite                                  |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/platform/darwin/http_request_baton_cocoa.mm b/platform/darwin/http_request_baton_cocoa.mm
index a9992fad8..03fa3bb82 100644
--- a/platform/darwin/http_request_baton_cocoa.mm
+++ b/platform/darwin/http_request_baton_cocoa.mm
@@ -1,14 +1,13 @@
 #include <mbgl/storage/http_request_baton.hpp>
 #include <mbgl/util/std.hpp>
 #include <mbgl/util/parsedate.h>
+#include <mbgl/util/time.hpp>
 
 #include <uv.h>
 
 #include <mbgl/util/uv.hpp>
 
 #import <Foundation/Foundation.h>
-#include <ctime>
-#include <xlocale.h>
 
 namespace mbgl {
 
@@ -21,9 +20,6 @@ void HTTPRequestBaton::start(const util::ptr<HTTPRequestBaton> &ptr) {
     // Starts the request.
     util::ptr<HTTPRequestBaton> baton = ptr;
 
-    // Create a C locale
-    static locale_t locale = newlocale(LC_ALL_MASK, nullptr, nullptr);
-
     dispatch_once(&request_initialize, ^{
         NSURLSessionConfiguration *sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
         sessionConfig.timeoutIntervalForResource = 30;
@@ -39,11 +35,8 @@ void HTTPRequestBaton::start(const util::ptr<HTTPRequestBaton> &ptr) {
         if (!baton->response->etag.empty()) {
             [request addValue:@(baton->response->etag.c_str()) forHTTPHeaderField:@"If-None-Match"];
         } else if (baton->response->modified) {
-            const time_t modified = baton->response->modified;
-            struct tm *timeinfo = std::gmtime(&modified);
-            char buffer[32];
-            strftime_l(buffer, 32, "%a, %d %b %Y %H:%M:%S GMT", timeinfo, locale);
-            [request addValue:@(buffer) forHTTPHeaderField:@"If-Modified-Since"];
+            const std::string time = util::rfc1123(baton->response->modified);
+            [request addValue:@(time.c_str()) forHTTPHeaderField:@"If-Modified-Since"];
         }
     }
 
diff --git a/test/suite b/test/suite
index 8f03d5dab..0f5f8f302 160000
--- a/test/suite
+++ b/test/suite
@@ -1 +1 @@
-Subproject commit 8f03d5dabfb7ec6447696b25691794280f399477
+Subproject commit 0f5f8f302202261c19810ea856fdcfb624989731