Tweaks to remove fragments when loading urls via wininet or cookies.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@14653 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/platform/win/CookieJarWin.cpp b/WebCore/platform/win/CookieJarWin.cpp
index b700d26c599d95170e5137f90e027fba30290144..cd2432f251d2f8782c01454ae95ab0021726aa01 100755 (executable)
--- a/WebCore/platform/win/CookieJarWin.cpp
+++ b/WebCore/platform/win/CookieJarWin.cpp
@@ -33,19 +33,27 @@
 namespace WebCore
 {
 
-void setCookies(KURL const& url,KURL const& policyURL, String const& value)
+void setCookies(const KURL& url, const KURL& policyURL, const String& value)
 {
     // FIXME: Deal with the policy URL.
     DeprecatedString str = url.url();
+    int fragmentIndex = str.find('#');
+    if (fragmentIndex != -1)
+        str = str.left(fragmentIndex);
+
     str.append((UChar)'\0');
     DeprecatedString val = value.deprecatedString();
     val.append((UChar)'\0');
     InternetSetCookie((UChar*)str.unicode(), 0, (UChar*)val.unicode());
 }
 
-String cookies(KURL const& url)
+String cookies(const KURL& url)
 {
     DeprecatedString str = url.url();
+    int fragmentIndex = str.find('#');
+    if (fragmentIndex != -1)
+        str = str.left(fragmentIndex);
+
     str.append((UChar)'\0');
 
     DWORD count;

diff --git a/WebCore/platform/win/TransferJobWin.cpp b/WebCore/platform/win/TransferJobWin.cpp
index ffafdb9e400d621c68ee8613f26a6be2e6e4260d..8297314a2f95c27b36dc16e43fabcc6d4d623726 100644 (file)
--- a/WebCore/platform/win/TransferJobWin.cpp
+++ b/WebCore/platform/win/TransferJobWin.cpp
@@ -216,7 +216,12 @@ bool TransferJob::start(DocLoader* docLoader)
         initializeOffScreenTransferJobWindow();
         d->m_jobId = addToOutstandingJobs(this);
 
-        HINTERNET urlHandle = InternetOpenUrlA(internetHandle, d->URL.url().ascii(), NULL, -1, 0, (DWORD_PTR)d->m_jobId);
+        DeprecatedString urlStr = d->URL.url();
+        int fragmentIndex = urlStr.find('#');
+        if (fragmentIndex != -1)
+            urlStr = urlStr.left(fragmentIndex);
+
+        HINTERNET urlHandle = InternetOpenUrlA(internetHandle, urlStr.ascii(), NULL, -1, 0, (DWORD_PTR)d->m_jobId);
 
         if (urlHandle == INVALID_HANDLE_VALUE) {
             delete this;