Changeset 13751 in webkit

Timestamp:

Apr 9, 2006 9:40:28 PM (18 years ago)

Author:

ap

Message:

Reviewed by Darin.

• fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7877 XMLHttpRequest ignores username/password passed to open()

Test: http/tests/xmlhttprequest/basic-auth.html

• platform/KURL.cpp: (KURL::setUser): Enable a code path that handles non-empty user name - it was already present, but commented out and protected with an assertion. (KURL::setPass): Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/xmlhttprequest/basic-auth-expected.txt (added)
• LayoutTests/http/tests/xmlhttprequest/basic-auth.html (added)
• LayoutTests/http/tests/xmlhttprequest/resources/basic-auth.php (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/KURL.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-04-09  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        - test for http://bugzilla.opendarwin.org/show_bug.cgi?id=7877
+        XMLHttpRequest ignores username/password passed to open()
+
+        * http/tests/xmlhttprequest/basic-auth-expected.txt: Added.
+        * http/tests/xmlhttprequest/basic-auth.html: Added.
+        * http/tests/xmlhttprequest/resources/basic-auth.php: Added.
+
 2006-04-09  Darin Adler  <darin@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-04-09  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=7877
+        XMLHttpRequest ignores username/password passed to open()
+
+        Test: http/tests/xmlhttprequest/basic-auth.html
+
+        * platform/KURL.cpp:
+        (KURL::setUser): Enable a code path that handles non-empty user name -
+        it was already present, but commented out and protected with an assertion.
+        (KURL::setPass): Ditto.
+
 2006-04-09  Darin Adler  <darin@apple.com>
 

trunk/WebCore/platform/KURL.cpp

@@ -606 +606 @@
         int end = userEndPos;
         if (!user.isEmpty()) {
-            // Untested code, but this is never used.
-            ASSERT_NOT_REACHED();
-#if 0
             u = user;
-            if (userStartPos == schemeEndPos + 1) {
+            if (userStartPos == schemeEndPos + 1)
                 u = "//" + u;
-            }
             // Add '@' if we didn't have one before.
-            if (end == hostEndPos || (end == passwordEndPos && urlString[end] != '@')) {
+            if (end == hostEndPos || (end == passwordEndPos && urlString[end] != '@'))
                 u += '@';
-            }
-#endif
         } else {
             // Remove '@' if we now have neither user nor password.
-            if (userEndPos == passwordEndPos && end != hostEndPos && urlString[end] == '@') {
+            if (userEndPos == passwordEndPos && end != hostEndPos && urlString[end] == '@')
                 end += 1;
-            }
         }
         const DeprecatedString newURL = urlString.left(userStartPos) + u + urlString.mid(end);
@@ -635 +628 @@
         int end = passwordEndPos;
         if (!password.isEmpty()) {
-            // Untested code, but this is never used.
-            ASSERT_NOT_REACHED();
-#if 0
             p = ':' + password + '@';
-            if (userEndPos == schemeEndPos + 1) {
+            if (userEndPos == schemeEndPos + 1)
                 p = "//" + p;
-            }
             // Eat the existing '@' since we are going to add our own.
-            if (end != hostEndPos && urlString[end] == '@') {
+            if (end != hostEndPos && urlString[end] == '@')
                 end += 1;
-            }
-#endif
         } else {
             // Remove '@' if we now have neither user nor password.
-            if (userStartPos == userEndPos && end != hostEndPos && urlString[end] == '@') {
+            if (userStartPos == userEndPos && end != hostEndPos && urlString[end] == '@')
                 end += 1;
-            }
         }
         const DeprecatedString newURL = urlString.left(userEndPos) + p + urlString.mid(end);