[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 5c85ae91a31f2c5088a056dc72c57bb79b503c39
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 15 02:37:25 2003 +0000

    	Backed out changes to WebBaseNetscapePluginView. Unintentional commit.
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView postURLNotify:target:len:buf:file:notifyData:]):
            (-[WebBaseNetscapePluginView postURL:target:len:buf:file:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3841 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index cccd19f..83f8ac7 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,13 @@
 2003-03-14  Chris Blumenberg  <cblu at apple.com>
 
+	Backed out changes to WebBaseNetscapePluginView. Unintentional commit.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView postURLNotify:target:len:buf:file:notifyData:]):
+        (-[WebBaseNetscapePluginView postURL:target:len:buf:file:]):
+
+2003-03-14  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: 3198961 - REGRESSION: Stopping load of plug-in content is not reflected in UI
 
         Reviewed by mjs.
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 1b43a73..61213d2 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -22,7 +22,6 @@
 
 #import <WebFoundation/WebAssertions.h>
 #import <WebFoundation/WebHTTPRequest.h>
-#import <WebFoundation/WebNSDataExtras.h>
 #import <WebFoundation/WebNSStringExtras.h>
 #import <WebFoundation/WebNSURLExtras.h>
 
@@ -63,11 +62,6 @@ typedef struct {
 
 @end
 
- at interface NSData (PluginExtras)
-- (unsigned)locationAfterFirstBlankLine;
- at end
-
-
 @implementation WebBaseNetscapePluginView
 
 #pragma mark EVENTS
@@ -1119,14 +1113,15 @@ typedef struct {
     return [self loadRequest:request inTarget:cTarget withNotifyData:NULL];
 }
 
-- (NPError)_postURLNotify:(const char *)URLCString
-                   target:(const char *)target
-                      len:(UInt32)len
-                      buf:(const char *)buf
-                     file:(NPBool)file
-               notifyData:(void *)notifyData
-             allowHeaders:(BOOL)allowHeaders
+-(NPError)postURLNotify:(const char *)URLCString
+                 target:(const char *)cTarget
+                    len:(UInt32)len
+                    buf:(const char *)buf
+                   file:(NPBool)file
+             notifyData:(void *)notifyData
 {
+    LOG(Plugins, "NPN_PostURLNotify: %s", URLCString);
+
     if (!len || !buf) {
         return NPERR_INVALID_PARAM;
     }
@@ -1158,34 +1153,9 @@ typedef struct {
 
     WebRequest *request = [self requestWithURLCString:URLCString];
     [request setRequestMethod:@"POST"];
-
-    if (allowHeaders) {
-        unsigned location = [postData locationAfterFirstBlankLine];
-        if (location != NSNotFound) {
-            // If the blank line is somewhere in the middle of postData, everything before is the header.
-            NSData *headerData = [postData subdataWithRange:NSMakeRange(0, location)];
-            NSDictionary *header = [headerData _web_parseRFC822HeaderFields];
-            if (header) {
-                [request setHeader:header];
-            }
-            // Everything after the blank line is the actual content of the POST.
-            postData = [postData subdataWithRange:NSMakeRange(location, [postData length] - location)];
-        }
-    }
-
     [request setRequestData:postData];
-    return [self loadRequest:request inTarget:target withNotifyData:notifyData];
-}
-
-- (NPError)postURLNotify:(const char *)URLCString
-                  target:(const char *)target
-                     len:(UInt32)len
-                     buf:(const char *)buf
-                    file:(NPBool)file
-              notifyData:(void *)notifyData
-{
-    LOG(Plugins, "NPN_PostURLNotify: %s", URLCString);
-    return [self _postURLNotify:URLCString target:target len:len buf:buf file:file notifyData:notifyData allowHeaders:YES];
+    
+    return [self loadRequest:request inTarget:cTarget withNotifyData:notifyData];
 }
 
 -(NPError)postURL:(const char *)URLCString
@@ -1195,7 +1165,7 @@ typedef struct {
              file:(NPBool)file
 {
     LOG(Plugins, "NPN_PostURL: %s", URLCString);        
-    return [self _postURLNotify:URLCString target:target len:len buf:buf file:file notifyData:NULL allowHeaders:NO];
+    return [self postURLNotify:URLCString target:target len:len buf:buf file:file notifyData:NULL];
 }
 
 -(NPError)newStream:(NPMIMEType)type target:(const char *)target stream:(NPStream**)stream
@@ -1297,27 +1267,3 @@ typedef struct {
 }
 
 @end
-
- at implementation NSData (PluginExtras)
-
-- (unsigned)locationAfterFirstBlankLine
-{
-    const char *bytes = (const char *)[self bytes];
-    unsigned length = [self length];
-
-    unsigned i;
-    for (i = 0; i < length - 2; i++) {
-        if (bytes[i] == '\n' && (i == 0 || bytes[i+1] == '\n')){
-            i++;
-            while (i < length - 2 && bytes[i] == '\n') {
-                i++;
-            }
-            return i;
-        }
-    }
-    
-    return NSNotFound;
-}
-
- at end
-

-- 
WebKit Debian packaging