[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 291f605a38f600c56f5e7fe1c7213feeef33849b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 22 21:50:53 2003 +0000

            Reviewed by Maciej.
    
    	- fixed 3153673 -- spoof as MacIE to get into http://www.mazdausa.com
    	- fixed 3153678 -- spoof as MacIE for http://wap.sonyericsson.com/
    
            * WebView.subproj/WebUserAgentSpoofTable.gperf: Add the two new entries.
    	Also reorganize existing entries a bit.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3404 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 1d589b9..ea07670 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-22  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3153673 -- spoof as MacIE to get into http://www.mazdausa.com
+	- fixed 3153678 -- spoof as MacIE for http://wap.sonyericsson.com/
+
+        * WebView.subproj/WebUserAgentSpoofTable.gperf: Add the two new entries.
+	Also reorganize existing entries a bit.
+
 2003-01-22  Chris Blumenberg  <cblu at apple.com>
 
 	Removed comment that I added by mistake.
diff --git a/WebKit/WebView.subproj/WebUserAgentSpoofTable.c b/WebKit/WebView.subproj/WebUserAgentSpoofTable.c
index c9a5e3a..2e66ffd 100644
--- a/WebKit/WebView.subproj/WebUserAgentSpoofTable.c
+++ b/WebKit/WebView.subproj/WebUserAgentSpoofTable.c
@@ -27,7 +27,7 @@ hash (register const char *str, register unsigned int len)
       27, 27, 27, 27, 27, 27, 27,  0,  0,  0,
        0,  0, 10,  0,  0,  0, 14, 27,  0,  0,
        0,  0,  0, 27,  0,  0,  0,  0,  5,  0,
-      27,  5, 27, 27, 27, 27, 27, 27, 27, 27,
+      27,  5,  0, 27, 27, 27, 27, 27, 27, 27,
       27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
       27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
       27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
@@ -47,6 +47,10 @@ hash (register const char *str, register unsigned int len)
   switch (hval)
     {
       default:
+      case 20:
+        hval += asso_values[(unsigned char)str[19]];
+      case 19:
+        hval += asso_values[(unsigned char)str[18]];
       case 18:
         hval += asso_values[(unsigned char)str[17]];
       case 17:
@@ -96,9 +100,9 @@ _web_findSpoofTableEntry (register const char *str, register unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 14,
+      TOTAL_KEYWORDS = 16,
       MIN_WORD_LENGTH = 6,
-      MAX_WORD_LENGTH = 18,
+      MAX_WORD_LENGTH = 20,
       MIN_HASH_VALUE = 9,
       MAX_HASH_VALUE = 26
     };
@@ -110,7 +114,7 @@ _web_findSpoofTableEntry (register const char *str, register unsigned int len)
       {"watch.com", MacIE},
       {"battle.net", MacIE},
       {"porsche.com", MacIE},
-      {"",0},
+      {"mazdausa.com", MacIE},
       {"hondacars.com", MacIE},
       {"abcnews.go.com", WinIE},
       {"",0},
@@ -123,7 +127,7 @@ _web_findSpoofTableEntry (register const char *str, register unsigned int len)
       {"firstusa.com", MacIE},
       {"microsoft.com", MacIE},
       {"jaguar.com", MacIE},
-      {"",0},
+      {"wap.sonyericsson.com", MacIE},
       {"bang-olufsen.com", MacIE}
     };
 
diff --git a/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf b/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf
index 1bd75c1..36f362b 100644
--- a/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf
+++ b/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf
@@ -8,9 +8,13 @@ bang-olufsen.com, MacIE
 hondacars.com, MacIE
 hondaredriders.com, MacIE
 jaguar.com, MacIE
+mazdausa.com, MacIE
 porsche.com, MacIE
+wap.sonyericsson.com, MacIE
 #
 # pretend to be Mac IE because otherwise the site tries to use layers
+nj.com, MacIE
+oregonlive.com, MacIE
 watch.com, MacIE
 #
 # pretend to be Mac IE to make the return key work to log in
@@ -26,10 +30,5 @@ battle.net, MacIE
 # pretend to be Mac IE to avoid gzipped HTML which we don't support yet
 freebsd.org, MacIE
 #
-# pretend to be Mac IE to work around bug and avoid "spewage" at the bottom of some pages
-# the problems is that if the site thinks we are netscape, it tries to use layers
-oregonlive.com, MacIE
-nj.com, MacIE
-#
 # pretend to be Win IE to get the smaller font sizes the site gives for Windows
 abcnews.go.com, WinIE

-- 
WebKit Debian packaging