[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 f0827061fb93bac1dede1a55221866b12f883eae
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 17 23:56:35 2002 +0000

    	- fixed 3050818 -- Crash in relative-KURL constructor at site with _ in host name
    
            * kwq/KWQKURL.mm: Change _ so that it's allowed in host names.
            (KURL::KURL): If base URL is invalid, make result invalid too.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2079 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a08cb4b..177ac56 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-09-17  Darin Adler  <darin at apple.com>
+
+	- fixed 3050818 -- Crash in relative-KURL constructor at site with _ in host name
+
+        * kwq/KWQKURL.mm: Change _ so that it's allowed in host names.
+        (KURL::KURL): If base URL is invalid, make result invalid too.
+
 2002-09-17  Richard Williamson   <rjw at apple.com>
 
         * khtml/khtmlview.cpp:
@@ -18,8 +25,7 @@
         
         * kwq/KWQColor.mm:
         (QColor::hsv):
-        Fixed marklar divide by 0 problemn.
-        
+        Fixed marklar divide by 0 problem.
         
 2002-09-17  Darin Adler  <darin at apple.com>
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a08cb4b..177ac56 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-09-17  Darin Adler  <darin at apple.com>
+
+	- fixed 3050818 -- Crash in relative-KURL constructor at site with _ in host name
+
+        * kwq/KWQKURL.mm: Change _ so that it's allowed in host names.
+        (KURL::KURL): If base URL is invalid, make result invalid too.
+
 2002-09-17  Richard Williamson   <rjw at apple.com>
 
         * khtml/khtmlview.cpp:
@@ -18,8 +25,7 @@
         
         * kwq/KWQColor.mm:
         (QColor::hsv):
-        Fixed marklar divide by 0 problemn.
-        
+        Fixed marklar divide by 0 problem.
         
 2002-09-17  Darin Adler  <darin at apple.com>
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a08cb4b..177ac56 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-09-17  Darin Adler  <darin at apple.com>
+
+	- fixed 3050818 -- Crash in relative-KURL constructor at site with _ in host name
+
+        * kwq/KWQKURL.mm: Change _ so that it's allowed in host names.
+        (KURL::KURL): If base URL is invalid, make result invalid too.
+
 2002-09-17  Richard Williamson   <rjw at apple.com>
 
         * khtml/khtmlview.cpp:
@@ -18,8 +25,7 @@
         
         * kwq/KWQColor.mm:
         (QColor::hsv):
-        Fixed marklar divide by 0 problemn.
-        
+        Fixed marklar divide by 0 problem.
         
 2002-09-17  Darin Adler  <darin at apple.com>
 
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index ffc2f15..8f4007b 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -40,6 +40,9 @@ typedef enum {
     UserInfoChar = 1 << 2,
 
     // alnum | "." | "-" | "%"
+    // The above is what the specification says, but we are lenient to
+    // match existing practice and also allow:
+    // "_"
     HostnameChar = 1 << 3,
 
     // hexdigit | ":" | "%"
@@ -119,7 +122,8 @@ static const unsigned char characterClassTable[256] = {
     /* 90  Z */ SchemeFirstChar | SchemeChar | UserInfoChar | HostnameChar,
     /* 91  [ */ BadChar,
     /* 92  \ */ BadChar,    /* 93  ] */ BadChar,
-    /* 94  ^ */ BadChar,    /* 95  _ */ UserInfoChar,
+    /* 94  ^ */ BadChar,
+    /* 95  _ */ UserInfoChar | HostnameChar,
     /* 96  ` */ BadChar,
     /* 97  a */ SchemeFirstChar | SchemeChar | UserInfoChar | HostnameChar | HexDigitChar | IPv6Char,
     /* 98  b */ SchemeFirstChar | SchemeChar | UserInfoChar | HostnameChar | HexDigitChar | IPv6Char, 
@@ -227,6 +231,11 @@ KURL::KURL(const QString &url, int encoding_hint) :
 
 KURL::KURL(const KURL &base, const QString &relative)
 {
+    if (!base.m_isValid) {
+        m_isValid = false;
+        return;
+    }
+    
     bool absolute = false;
     const char *str = relative.ascii();
     

-- 
WebKit Debian packaging