[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:13:06 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 0d9fbce475ce4e8917e9e9a61ce99d446f7dc4ca
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 17 23:35:21 2003 +0000

            Reviewed by John.
    
            - fixed 3485572 -- secure form check in KHTML uses case-sensitive comparison with "https"
    
            * khtml/html/html_formimpl.h:
            * khtml/html/html_formimpl.cpp: (HTMLFormElementImpl::formWouldHaveSecureSubmission):
            Changed to take a DOMString reference for slightly better efficiency, and to use startsWith
            so the prefix check is not case sensitive and for slightly better efficiency and clarity
            than calling latin1() and using strncmp.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5548 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 8503c90..950217c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-11-17  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed 3485572 -- secure form check in KHTML uses case-sensitive comparison with "https"
+
+        * khtml/html/html_formimpl.h:
+        * khtml/html/html_formimpl.cpp: (HTMLFormElementImpl::formWouldHaveSecureSubmission):
+        Changed to take a DOMString reference for slightly better efficiency, and to use startsWith
+        so the prefix check is not case sensitive and for slightly better efficiency and clarity
+        than calling latin1() and using strncmp.
+
 2003-11-17  Maciej Stachowiak  <mjs at apple.com>
 
 	- commit updated .lut.h file that I forgot to commit before
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index ff7b82e..51b834b 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -91,15 +91,15 @@ NodeImpl::Id HTMLFormElementImpl::id() const
 }
 
 #if APPLE_CHANGES
-bool HTMLFormElementImpl::formWouldHaveSecureSubmission(DOMString url)
+
+bool HTMLFormElementImpl::formWouldHaveSecureSubmission(const DOMString &url)
 {
     if (url.isNull()) {
         return false;
-    } else {
-        QString fullUrl = getDocument()->completeURL( url.string() );
-        return strncmp(fullUrl.latin1(), "https:", 6) == 0;
     }
+    return getDocument()->completeURL(url.string()).startsWith("https:", false);
 }
+
 #endif
 
 void HTMLFormElementImpl::attach()
diff --git a/WebCore/khtml/html/html_formimpl.h b/WebCore/khtml/html/html_formimpl.h
index 81c47bb..7de462d 100644
--- a/WebCore/khtml/html/html_formimpl.h
+++ b/WebCore/khtml/html/html_formimpl.h
@@ -123,7 +123,7 @@ public:
     QString oldIdAttr;
     QString oldNameAttr;
 #if APPLE_CHANGES
-    bool formWouldHaveSecureSubmission(DOMString url);
+    bool formWouldHaveSecureSubmission(const DOMString &url);
 #endif
 };
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list