As WebKit takes "expires" as String, we can pass it directly with the rest of the headers.
diff --git a/WebKit/android/jni/WebCoreResourceLoader.cpp b/WebKit/android/jni/WebCoreResourceLoader.cpp
index 2f997f5..5ccd09c 100644
--- a/WebKit/android/jni/WebCoreResourceLoader.cpp
+++ b/WebKit/android/jni/WebCoreResourceLoader.cpp
@@ -134,7 +134,7 @@
jint WebCoreResourceLoader::CreateResponse(JNIEnv* env, jobject obj, jstring url, jint statusCode,
jstring statusText, jstring mimeType, jlong expectedLength,
- jstring encoding, jstring expireTime)
+ jstring encoding)
{
#ifdef ANDROID_INSTRUMENT
TimeCounterAuto counter(TimeCounter::ResourceTimeCounter);
@@ -160,11 +160,6 @@
response->setHTTPStatusText(status);
LOGV("Response setStatusText: %s", status.latin1().data());
}
- if (expireTime) {
- WebCore::String expire = to_string(env, expireTime);
- response->setHTTPHeaderField("expires", expire);
- LOGV("Response setHTTPHeaderField for expires: %s", expire.latin1().data());
- }
return (int)response;
}
@@ -287,7 +282,7 @@
/* name, signature, funcPtr */
{ "nativeSetResponseHeader", "(ILjava/lang/String;Ljava/lang/String;)V",
(void*) WebCoreResourceLoader::SetResponseHeader },
- { "nativeCreateResponse", "(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;)I",
+ { "nativeCreateResponse", "(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;)I",
(void*) WebCoreResourceLoader::CreateResponse },
{ "nativeReceivedResponse", "(I)V",
(void*) WebCoreResourceLoader::ReceivedResponse },
diff --git a/WebKit/android/jni/WebCoreResourceLoader.h b/WebKit/android/jni/WebCoreResourceLoader.h
index 1e24937..60c0d0e 100644
--- a/WebKit/android/jni/WebCoreResourceLoader.h
+++ b/WebKit/android/jni/WebCoreResourceLoader.h
@@ -58,7 +58,7 @@
// Native jni functions
static void SetResponseHeader(JNIEnv*, jobject, jint, jstring, jstring);
static jint CreateResponse(JNIEnv*, jobject, jstring, jint, jstring,
- jstring, jlong, jstring, jstring);
+ jstring, jlong, jstring);
static void ReceivedResponse(JNIEnv*, jobject, jint);
static void AddData(JNIEnv*, jobject, jbyteArray, jint);
static void Finished(JNIEnv*, jobject);
