From 115a5d10f90b7da1726e9cb274bfaf58f806e54d Mon Sep 17 00:00:00 2001
From: "Thiago Marcos P. Santos" <thiago@mapbox.com>
Date: Thu, 17 Mar 2016 18:23:02 -0300
Subject: [core] Fix regression of prior expiration time not being respected

---
 platform/default/online_file_source.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/platform/default/online_file_source.cpp b/platform/default/online_file_source.cpp
index 77dddac112..944bcd56d5 100644
--- a/platform/default/online_file_source.cpp
+++ b/platform/default/online_file_source.cpp
@@ -206,7 +206,11 @@ OnlineFileRequestImpl::OnlineFileRequestImpl(FileRequest* key_, const Resource&
       resource(resource_),
       callback(std::move(callback_)) {
     // Force an immediate first request if we don't have an expiration time.
-    schedule(impl, SystemClock::now());
+    if (resource.priorExpires) {
+        schedule(impl, resource.priorExpires);
+    } else {
+        schedule(impl, SystemClock::now());
+    }
 }
 
 OnlineFileRequestImpl::~OnlineFileRequestImpl() {
-- 
cgit v1.2.1