[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 07:42:54 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 3013525903827dcd5ec822aedc97709da7c10e73
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 22 16:55:36 2003 +0000

            Reviewed by John.
    
            - removed all entries except for jaguar.com because:
                a) most of these sites now work fine without the spoofing or have gone away
                b) nj.com and oregonlive.com do not work, but the spoofing committee (Mark,
                   Don, Dave, and me) decided we should stop spoofing and get them to fix
                   the sites instead
              If we can resolve jaguar.com in a similar way, we can remove the spoofing
              feature altogether.
    
            * WebView.subproj/WebUserAgentSpoofTable.gperf: Removed all but jaguar.com.
            * WebView.subproj/WebUserAgentSpoofTable.c: Regenerated.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4413 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index dc371e6..8e00983 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2003-05-22  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - removed all entries except for jaguar.com because:
+            a) most of these sites now work fine without the spoofing or have gone away
+            b) nj.com and oregonlive.com do not work, but the spoofing committee (Mark,
+               Don, Dave, and me) decided we should stop spoofing and get them to fix
+               the sites instead
+          If we can resolve jaguar.com in a similar way, we can remove the spoofing
+          feature altogether.
+
+        * WebView.subproj/WebUserAgentSpoofTable.gperf: Removed all but jaguar.com.
+        * WebView.subproj/WebUserAgentSpoofTable.c: Regenerated.
+
 2003-05-21  Richard Williamson   <rjw at apple.com>
 
         *** Public API Change ***
diff --git a/WebKit/WebView.subproj/WebUserAgentSpoofTable.c b/WebKit/WebView.subproj/WebUserAgentSpoofTable.c
index 7538e58..0693f4e 100644
--- a/WebKit/WebView.subproj/WebUserAgentSpoofTable.c
+++ b/WebKit/WebView.subproj/WebUserAgentSpoofTable.c
@@ -1,7 +1,7 @@
 /* ANSI-C code produced by gperf version 2.7.2 */
 /* Command-line: gperf -CEot -L ANSI-C -k '*' -N _web_findSpoofTableEntry -F ,0 WebView.subproj/WebUserAgentSpoofTable.gperf  */
 struct UserAgentSpoofTableEntry { const char *name; UserAgentStringType type; };
-/* maximum key range = 26, duplicates = 0 */
+/* maximum key range = 1, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -15,58 +15,38 @@ hash (register const char *str, register unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32,  5,  0, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32,  0, 10,  0,
-       0,  0,  0,  0,  0,  0,  0, 32,  0,  0,
-       0,  0,  0, 32,  0,  0, 10,  0,  0,  0,
-      32,  5,  0, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
-      32, 32, 32, 32, 32, 32
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11,  0, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11,  0, 11,  0,
+      11, 11, 11,  0, 11, 11,  0, 11, 11,  0,
+      11,  0, 11, 11,  0, 11, 11,  0, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+      11, 11, 11, 11, 11, 11
     };
   register int hval = 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:
-        hval += asso_values[(unsigned char)str[16]];
-      case 16:
-        hval += asso_values[(unsigned char)str[15]];
-      case 15:
-        hval += asso_values[(unsigned char)str[14]];
-      case 14:
-        hval += asso_values[(unsigned char)str[13]];
-      case 13:
-        hval += asso_values[(unsigned char)str[12]];
-      case 12:
-        hval += asso_values[(unsigned char)str[11]];
-      case 11:
-        hval += asso_values[(unsigned char)str[10]];
       case 10:
         hval += asso_values[(unsigned char)str[9]];
       case 9:
@@ -100,36 +80,18 @@ _web_findSpoofTableEntry (register const char *str, register unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 14,
-      MIN_WORD_LENGTH = 6,
-      MAX_WORD_LENGTH = 20,
-      MIN_HASH_VALUE = 6,
-      MAX_HASH_VALUE = 31
+      TOTAL_KEYWORDS = 1,
+      MIN_WORD_LENGTH = 10,
+      MAX_WORD_LENGTH = 10,
+      MIN_HASH_VALUE = 10,
+      MAX_HASH_VALUE = 10
     };
 
   static const struct UserAgentSpoofTableEntry wordlist[] =
     {
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"nj.com", MacIE},
+      {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
       {"",0}, {"",0}, {"",0},
-      {"jaguar.com", MacIE},
-      {"porsche.com", MacIE},
-      {"mazdausa.com", MacIE},
-      {"hondacars.com", MacIE},
-      {"oregonlive.com", MacIE},
-      {"",0},
-      {"olympic.org", MacIE},
-      {"",0},
-      {"hondaredriders.com", MacIE},
-      {"watch.com", MacIE},
-      {"",0},
-      {"freebsd.org", MacIE},
-      {"firstusa.com", MacIE},
-      {"microsoft.com", MacIE},
-      {"",0},
-      {"wap.sonyericsson.com", MacIE},
-      {"",0}, {"",0}, {"",0}, {"",0}, {"",0},
-      {"bang-olufsen.com", MacIE}
+      {"jaguar.com", MacIE}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
diff --git a/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf b/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf
index 309a6c7..128cf32 100644
--- a/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf
+++ b/WebKit/WebView.subproj/WebUserAgentSpoofTable.gperf
@@ -4,25 +4,4 @@ struct UserAgentSpoofTableEntry { const char *name; UserAgentStringType type; };
 # Entries must have either one dot or two dots in them.
 #
 # pretend to be Mac IE because these sites forbid unknown browsers
-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 because the site has JavaScript that works only for "Netscape" or "Microsoft"
-firstusa.com, MacIE
-#
-# pretend to be Mac IE to avoid bad-quality CSS the site gives us otherwise
-microsoft.com, MacIE
-olympic.org, MacIE
-#
-# pretend to be Mac IE to avoid gzipped HTML which we don't support yet
-freebsd.org, MacIE

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list