diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 14:57:50 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:06:55 +0000 |
| commit | d0825bca7fe65beaee391d30da42e937db621564 (patch) | |
| tree | 7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebCore/platform/network/soup/ResourceHandleSoup.cpp | |
| parent | 3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff) | |
| download | external_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2 | |
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebCore/platform/network/soup/ResourceHandleSoup.cpp')
| -rw-r--r-- | WebCore/platform/network/soup/ResourceHandleSoup.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/WebCore/platform/network/soup/ResourceHandleSoup.cpp b/WebCore/platform/network/soup/ResourceHandleSoup.cpp index 6367a3e..da16f4a 100644 --- a/WebCore/platform/network/soup/ResourceHandleSoup.cpp +++ b/WebCore/platform/network/soup/ResourceHandleSoup.cpp @@ -548,12 +548,6 @@ static bool startHttp(ResourceHandle* handle) // balanced by a deref() in finishedCallback, which should always run handle->ref(); - // FIXME: For now, we cannot accept content encoded in anything - // other than identity, so force servers to do it our way. When - // libsoup gets proper Content-Encoding support we will want to - // use it here instead. - soup_message_headers_replace(d->m_msg->request_headers, "Accept-Encoding", "identity"); - // Balanced in ResourceHandleInternal's destructor; we need to // keep our own ref, because after queueing the message, the // session owns the initial reference. @@ -882,7 +876,7 @@ static bool startGio(ResourceHandle* handle, KURL url) url.setQuery(String()); url.removePort(); -#if !PLATFORM(WIN_OS) +#if !OS(WINDOWS) // we avoid the escaping for local files, because // g_filename_from_uri (used internally by GFile) has problems // decoding strings with arbitrary percent signs |