[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 720118721171a17554addf44ac04cec6bf26e99d
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 17 19:33:04 2003 +0000

    	Made data categories use the "_web_" prefix.
    
            Reviewed by darin.
    
            * Plugins.subproj/WebBaseNetscapePluginView.m:
            (-[WebBaseNetscapePluginView _postURLNotify:target:len:buf:file:notifyData:allowHeaders:]):
            (-[NSData _web_startsWithBlankLine]):
            (-[NSData _web_locationAfterFirstBlankLine]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3850 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5f2e29a..87a8de3 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2003-03-17  Chris Blumenberg  <cblu at apple.com>
 
+	Made data categories use the "_web_" prefix.
+
+        Reviewed by darin.
+
+        * Plugins.subproj/WebBaseNetscapePluginView.m:
+        (-[WebBaseNetscapePluginView _postURLNotify:target:len:buf:file:notifyData:allowHeaders:]):
+        (-[NSData _web_startsWithBlankLine]):
+        (-[NSData _web_locationAfterFirstBlankLine]):
+
+2003-03-17  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: 3199105 - Accept carbon-style file URLs from plug-in POST requests
 	Fixed: 3148767 - POST (aka Flash Remoting) doesn't work from Flash
 
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 4269b82..db08abb 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -63,9 +63,9 @@ typedef struct {
 
 @end
 
- at interface NSData (PluginExtras)
-- (BOOL)startsWithBlankLine;
-- (unsigned)locationAfterFirstBlankLine;
+ at interface NSData (WebPluginDataExtras)
+- (BOOL)_web_startsWithBlankLine;
+- (unsigned)_web_locationAfterFirstBlankLine;
 @end
 
 
@@ -1168,10 +1168,10 @@ typedef struct {
     [request setRequestMethod:@"POST"];
     
     if (allowHeaders) {
-        if ([postData startsWithBlankLine]) {
+        if ([postData _web_startsWithBlankLine]) {
             postData = [postData subdataWithRange:NSMakeRange(1, [postData length] - 1)];
         } else {
-            unsigned location = [postData locationAfterFirstBlankLine];
+            unsigned location = [postData _web_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)];
@@ -1315,12 +1315,12 @@ typedef struct {
 
 @implementation NSData (PluginExtras)
 
-- (BOOL)startsWithBlankLine
+- (BOOL)_web_startsWithBlankLine
 {
     return [self length] > 0 && ((const char *)[self bytes])[0] == '\n';
 }
 
-- (unsigned)locationAfterFirstBlankLine
+- (unsigned)_web_locationAfterFirstBlankLine
 {
     const char *bytes = (const char *)[self bytes];
     unsigned length = [self length];

-- 
WebKit Debian packaging