diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/platform/network/curl | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/platform/network/curl')
| -rw-r--r-- | WebCore/platform/network/curl/ResourceHandleCurl.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/network/curl/ResourceHandleManager.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/network/curl/ResourceHandleManager.h | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/WebCore/platform/network/curl/ResourceHandleCurl.cpp b/WebCore/platform/network/curl/ResourceHandleCurl.cpp index a2e692c..a6f5dca 100644 --- a/WebCore/platform/network/curl/ResourceHandleCurl.cpp +++ b/WebCore/platform/network/curl/ResourceHandleCurl.cpp @@ -179,7 +179,7 @@ void ResourceHandle::setDefersLoading(bool defers) #endif } -bool ResourceHandle::willLoadFromCache(ResourceRequest&) +bool ResourceHandle::willLoadFromCache(ResourceRequest&, Frame*) { notImplemented(); return false; diff --git a/WebCore/platform/network/curl/ResourceHandleManager.cpp b/WebCore/platform/network/curl/ResourceHandleManager.cpp index c61ad4f..2aa286a 100644 --- a/WebCore/platform/network/curl/ResourceHandleManager.cpp +++ b/WebCore/platform/network/curl/ResourceHandleManager.cpp @@ -582,7 +582,7 @@ void ResourceHandleManager::initializeHandle(ResourceHandle* job) KURL kurl = job->request().url(); // Remove any fragment part, otherwise curl will send it as part of the request. - kurl.removeRef(); + kurl.removeFragmentIdentifier(); ResourceHandleInternal* d = job->getInternal(); String url = kurl.string(); diff --git a/WebCore/platform/network/curl/ResourceHandleManager.h b/WebCore/platform/network/curl/ResourceHandleManager.h index f3ad234..d38e577 100644 --- a/WebCore/platform/network/curl/ResourceHandleManager.h +++ b/WebCore/platform/network/curl/ResourceHandleManager.h @@ -32,6 +32,11 @@ #include "Timer.h" #include "ResourceHandleClient.h" +#if PLATFORM(WIN) +#include <winsock2.h> +#include <windows.h> +#endif + #include <curl/curl.h> #include <wtf/Vector.h> |