summaryrefslogtreecommitdiffstats
path: root/WebKit/android/jni/WebCoreResourceLoader.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-12-17 06:37:39 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-12-17 06:37:39 -0800
commiteabb0d15c6f21c671c86c9ceed1ec4b03e7bec1e (patch)
treef2bc1363b597b05b1e1a02cca2716950969d45e3 /WebKit/android/jni/WebCoreResourceLoader.cpp
parent3938b0eba27eaf7799cd92cf5bfd2ed8d0bbad62 (diff)
parent131b7162d14fa221abb6ce77275244687c3f4bbb (diff)
downloadexternal_webkit-eabb0d15c6f21c671c86c9ceed1ec4b03e7bec1e.zip
external_webkit-eabb0d15c6f21c671c86c9ceed1ec4b03e7bec1e.tar.gz
external_webkit-eabb0d15c6f21c671c86c9ceed1ec4b03e7bec1e.tar.bz2
Merge "Don't strip HTTP response headers with empty values"
Diffstat (limited to 'WebKit/android/jni/WebCoreResourceLoader.cpp')
-rw-r--r--WebKit/android/jni/WebCoreResourceLoader.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/WebKit/android/jni/WebCoreResourceLoader.cpp b/WebKit/android/jni/WebCoreResourceLoader.cpp
index 0c7bad9..d44df4c 100644
--- a/WebKit/android/jni/WebCoreResourceLoader.cpp
+++ b/WebKit/android/jni/WebCoreResourceLoader.cpp
@@ -141,11 +141,8 @@ void WebCoreResourceLoader::SetResponseHeader(JNIEnv* env, jobject obj, jint nat
LOG_ASSERT(response, "nativeSetResponseHeader must take a valid response pointer!");
LOG_ASSERT(key, "How did a null value become a key?");
- if (val) {
- WTF::String valStr = jstringToWtfString(env, val);
- if (!valStr.isEmpty())
- response->setHTTPHeaderField(jstringToWtfString(env, key), valStr);
- }
+ if (val)
+ response->setHTTPHeaderField(jstringToWtfString(env, key), jstringToWtfString(env, val));
}
jint WebCoreResourceLoader::CreateResponse(JNIEnv* env, jobject obj, jstring url, jint statusCode,