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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 3606c096eb631c06b05d501b37c977d93e301380
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri May 14 01:23:24 2004 +0000

    WebKit:
    	Backed out mistaken change that I didn't mean to checkin.
    
            * WebCoreSupport.subproj/WebBridge.m:
            (-[WebBridge syncLoadResourceWithURL:customHeaders:postData:finalURL:responseHeaders:statusCode:]):
    
    JavaScriptCore:
    	Fixed indentation.
    
            Reviewed by Chris.
    
            * ChangeLog:
            * bindings/objc/WebScriptObject.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6595 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d27700e..ef5cdc9 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,14 @@
 2004-05-13  Richard Williamson   <rjw at apple.com>
 
+	Fixed indentation.
+
+        Reviewed by Chris.
+
+        * ChangeLog:
+        * bindings/objc/WebScriptObject.h:
+
+2004-05-13  Richard Williamson   <rjw at apple.com>
+
 	Approved API changes.  Currently unimplemented.
 
         Reviewed by Chris.
diff --git a/JavaScriptCore/bindings/objc/WebScriptObject.h b/JavaScriptCore/bindings/objc/WebScriptObject.h
index 1a1e61c..0ce41ee 100644
--- a/JavaScriptCore/bindings/objc/WebScriptObject.h
+++ b/JavaScriptCore/bindings/objc/WebScriptObject.h
@@ -60,8 +60,8 @@
 @interface NSObject (WebScriptMethods)
 
 /*!
-	@method webScriptNameForSelector:
-	@param aSelector The selector that will be exposed to the script environment.
+    @method webScriptNameForSelector:
+    @param aSelector The selector that will be exposed to the script environment.
     @discussion Use the returned string as the exported name for the selector
     in the script environment.  It is the responsibility of the class to ensure
     uniqueness of the returned name.  If nil is returned or this
@@ -92,7 +92,7 @@
 
 /*!
     @method webScriptNameForKey:
-	@param name The name of the instance variable that will be exposed to the
+    @param name The name of the instance variable that will be exposed to the
     script enviroment.  Only that properties that meet the export criteria will
     be exposed.
     @discussion Provide an alternate name for a property.
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 82dea89..f5d405b 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,12 @@
 2004-05-13  Richard Williamson   <rjw at apple.com>
 
+	Backed out mistaken change that I didn't mean to checkin.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge syncLoadResourceWithURL:customHeaders:postData:finalURL:responseHeaders:statusCode:]):
+
+2004-05-13  Richard Williamson   <rjw at apple.com>
+
 	Updated to reflect new API.
 
         Reviewed by Chris.
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 73531a3..8db1b76 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -460,7 +460,7 @@
     }
     
     // Never use cached data for these requests (xmlhttprequests).
-    [newRequest setCachePolicy:NSURLRequestReloadIgnoringCacheData];
+    [newRequest setCachePolicy:[[[self dataSource] request] cachePolicy]];
     [newRequest setHTTPReferrer:[self referrer]];
     
     WebView *webView = [_frame webView];

-- 
WebKit Debian packaging