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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 4282eae8f6acc345788aba637dbb9f8e457858d1
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 24 19:37:15 2004 +0000

    WebCore:
    
            Reviewed by John.
    
            - fixed <rdar://problem/3566805>: REGRESSION: When the subject of mailto is 2 byte Safari failed to send mail address and subject to Mail.app
    
            * kwq/KWQKURL.mm: (KURL::findHostnamesInMailToURL): Update to handle hostnames that end just before
            a '?' since a '?' ends the entire part of the URL that can contain hostnames. Also change the logic so
            that the '?' will successfully end the search.
    
    WebKit:
    
            Reviewed by John.
    
            - fixed <rdar://problem/3566805>: REGRESSION: When the subject of mailto is 2 byte Safari failed to send mail address and subject to Mail.app
    
            * Misc.subproj/WebNSURLExtras.m: (applyHostNameFunctionToMailToURLString): Update to handle hostnames
            that end just before a '?' since a '?' ends the entire part of the URL that can contain hostnames.
            Also change the logic so that the '?' will successfully end the search.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6255 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 09a9840..fa879ea 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,16 @@
 
         Reviewed by John.
 
+        - fixed <rdar://problem/3566805>: REGRESSION: When the subject of mailto is 2 byte Safari failed to send mail address and subject to Mail.app
+
+        * kwq/KWQKURL.mm: (KURL::findHostnamesInMailToURL): Update to handle hostnames that end just before
+        a '?' since a '?' ends the entire part of the URL that can contain hostnames. Also change the logic so
+        that the '?' will successfully end the search.
+
+2004-03-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
         - fixed <rdar://problem/3599650>: main image missing due to incorrect relative URL resolution at www.brother.com
 
         * kwq/KWQKURL.mm: (KURL::KURL): Implement compatibility rule from the URI RFC.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 0bf172a..91424b1 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -1535,7 +1535,7 @@ QString KURL::encodeHostname(const QString &s)
 
 QMemArray<KWQIntegerPair> KURL::findHostnamesInMailToURL(const QString &s)
 {
-    // In a mailto: URL, host names come after a '@' character and end with a '>' or ',' or end of string character.
+    // In a mailto: URL, host names come after a '@' character and end with a '>' or ',' or '?' or end of string character.
     // Skip quoted strings so that characters in them don't confuse us.
     // When we find a '?' character, we are past the part of the URL that contains host names.
 
@@ -1558,13 +1558,13 @@ QMemArray<KWQIntegerPair> KURL::findHostnamesInMailToURL(const QString &s)
         if (c == '@') {
             // Find end of host name.
             int hostnameStart = p;
-            int hostnameEnd = s.find(QRegExp("[>,]"), p);
+            int hostnameEnd = s.find(QRegExp("[>,?]"), p);
             bool done;
             if (hostnameEnd == -1) {
                 hostnameEnd = s.length();
                 done = true;
             } else {
-                p = hostnameEnd + 1;
+                p = hostnameEnd;
                 done = false;
             }
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index fd9237a..e978c16 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed <rdar://problem/3566805>: REGRESSION: When the subject of mailto is 2 byte Safari failed to send mail address and subject to Mail.app
+
+        * Misc.subproj/WebNSURLExtras.m: (applyHostNameFunctionToMailToURLString): Update to handle hostnames
+        that end just before a '?' since a '?' ends the entire part of the URL that can contain hostnames.
+        Also change the logic so that the '?' will successfully end the search.
+
 2004-03-24  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by me
diff --git a/WebKit/Misc.subproj/WebNSURLExtras.m b/WebKit/Misc.subproj/WebNSURLExtras.m
index fd5d6c2..2ca04be 100644
--- a/WebKit/Misc.subproj/WebNSURLExtras.m
+++ b/WebKit/Misc.subproj/WebNSURLExtras.m
@@ -62,7 +62,7 @@ static int hexDigitValue(char c)
 
 static void applyHostNameFunctionToMailToURLString(NSString *string, StringRangeApplierFunction f, void *context)
 {
-    // In a mailto: URL, host names come after a '@' character and end with a '>' or ',' character.
+    // In a mailto: URL, host names come after a '@' character and end with a '>' or ',' or '?' character.
     // Skip quoted strings so that characters in them don't confuse us.
     // When we find a '?' character, we are past the part of the URL that contains host names.
 
@@ -72,7 +72,7 @@ static void applyHostNameFunctionToMailToURLString(NSString *string, StringRange
     }
     static NSCharacterSet *hostNameEndCharacters;
     if (hostNameEndCharacters == nil) {
-        hostNameEndCharacters = [[NSCharacterSet characterSetWithCharactersInString:@">,"] retain];
+        hostNameEndCharacters = [[NSCharacterSet characterSetWithCharactersInString:@">,?"] retain];
     }
     static NSCharacterSet *quotedStringCharacters;
     if (quotedStringCharacters == nil) {
@@ -105,7 +105,7 @@ static void applyHostNameFunctionToMailToURLString(NSString *string, StringRange
                 hostNameEnd.location = stringLength;
                 done = YES;
             } else {
-                remaining.location = NSMaxRange(hostNameEnd);
+                remaining.location = hostNameEnd.location;
                 remaining.length = stringLength - remaining.location;
                 done = NO;
             }

-- 
WebKit Debian packaging