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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 9edba4d4dc528904ab7605cea6111f366a90fd53
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 6 19:26:00 2002 +0000

    	Support MacBinary I by checking that bytes 99-127 are 0. Also check byte 82 for all formats.
    
            * Downloads.subproj/WebMacBinaryDecoder.m:
            (+[WebMacBinaryDecoder canDecodeHeaderData:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2575 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9b4fe91..8638253 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-06  Chris Blumenberg  <cblu at apple.com>
+
+	Support MacBinary I by checking that bytes 99-127 are 0. Also check byte 82 for all formats.
+
+        * Downloads.subproj/WebMacBinaryDecoder.m:
+        (+[WebMacBinaryDecoder canDecodeHeaderData:]):
+
 2002-11-06  Ken Kocienda  <kocienda at apple.com>
 
 	Call new WebHTTPResourceRequest method to set the amount of time
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 9b4fe91..8638253 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-11-06  Chris Blumenberg  <cblu at apple.com>
+
+	Support MacBinary I by checking that bytes 99-127 are 0. Also check byte 82 for all formats.
+
+        * Downloads.subproj/WebMacBinaryDecoder.m:
+        (+[WebMacBinaryDecoder canDecodeHeaderData:]):
+
 2002-11-06  Ken Kocienda  <kocienda at apple.com>
 
 	Call new WebHTTPResourceRequest method to set the amount of time
diff --git a/WebKit/Downloads.subproj/WebMacBinaryDecoder.m b/WebKit/Downloads.subproj/WebMacBinaryDecoder.m
index 8282680..b6140c7 100644
--- a/WebKit/Downloads.subproj/WebMacBinaryDecoder.m
+++ b/WebKit/Downloads.subproj/WebMacBinaryDecoder.m
@@ -28,7 +28,7 @@
 
     // Version must be 0, also the zero fill byte at byte 74,
     // and the last two bytes of the header.
-    if (header[0] || header[74] || header[126] || header[127]) {
+    if (header[0] || header[74] || header[82] || header[126] || header[127]) {
         return NO;
     }
 
@@ -39,7 +39,15 @@
 
     // And the CRC is the most important check.
     if (((header[124] << 8) | header[125]) != CRC16(header, 124, 0)) {
-        return NO;
+        // MacBinary I doesn't have a CRC. Make MacBinary I specific checks.
+
+        // 99-127 is 0 in MacBinary I
+        int i;
+        for(i=99; i<=127; i++){
+            if(header[i]){
+                return NO;
+            }
+        }
     }
 
     // FIXME: Specification says we should also check the minimum version at byte 123.

-- 
WebKit Debian packaging