tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Restore existing response body

Browse Source 
Until #2721 lands we still need this.
This commit is contained in:
John Firebaugh
2016-01-14 18:17:53 -08:00
parent e44db93f1c
commit f62d41ae05
4 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/src/http_request_android.cpp
View File

@@ -209,6 +209,8 @@ void HTTPAndroidRequest::onResponse(int code, std::string message, std::string e
response->notModified = true;
if (existingResponse) {
response->data = existingResponse->data;
if (response->expires == Seconds::zero()) {
response->expires = existingResponse->expires;
}

2
platform/darwin/http_request_nsurl.mm
View File

@@ -229,6 +229,8 @@ void HTTPNSURLRequest::handleResult(NSData *data, NSURLResponse *res, NSError *e
response->notModified = true;
if (existingResponse) {
response->data = existingResponse->data;
if (response->expires == Seconds::zero()) {
response->expires = existingResponse->expires;
}

2
platform/default/http_request_curl.cpp
View File

@@ -532,6 +532,8 @@ void HTTPCURLRequest::handleResult(CURLcode code) {
response->notModified = true;
if (existingResponse) {
response->data = existingResponse->data;
if (response->expires == Seconds::zero()) {
response->expires = existingResponse->expires;
}

4
test/storage/cache_revalidate.cpp
View File

@@ -49,6 +49,8 @@ TEST_F(Storage, CacheRevalidateSame) {
EXPECT_EQ(nullptr, res2.error);
EXPECT_EQ(false, res2.stale);
EXPECT_TRUE(res2.notModified);
ASSERT_TRUE(res2.data.get());
EXPECT_EQ("Response", *res2.data);
EXPECT_LT(Seconds::zero(), res2.expires);
EXPECT_EQ(Seconds::zero(), res2.modified);
// We're not sending the ETag in the 304 reply, but it should still be there.
@@ -107,6 +109,8 @@ TEST_F(Storage, CacheRevalidateModified) {
EXPECT_EQ(nullptr, res2.error);
EXPECT_EQ(false, res2.stale);
EXPECT_TRUE(res2.notModified);
ASSERT_TRUE(res2.data.get());
EXPECT_EQ("Response", *res2.data);
EXPECT_LT(Seconds::zero(), res2.expires);
EXPECT_EQ(1420070400, res2.modified.count());
EXPECT_EQ("", res2.etag);