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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 0980e20b643f6b88a79d1673881e5d66e86cb91a
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 20 21:53:01 2002 +0000

    	* WebView.subproj/IFWebController.h: Fix my WebController screw-up.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@647 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 627176c..4141aef 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,6 +1,6 @@
 2002-02-20  Maciej Stachowiak  <mjs at apple.com>
 
-	* WebView.subproj/IFWebController.h:
+	* WebView.subproj/IFWebController.h: Fix my WebController screw-up.
 
 2002-02-19  John Sullivan  <sullivan at apple.com>
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 627176c..4141aef 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,6 +1,6 @@
 2002-02-20  Maciej Stachowiak  <mjs at apple.com>
 
-	* WebView.subproj/IFWebController.h:
+	* WebView.subproj/IFWebController.h: Fix my WebController screw-up.
 
 2002-02-19  John Sullivan  <sullivan at apple.com>
 
diff --git a/WebKit/WebView.subproj/IFWebController.h b/WebKit/WebView.subproj/IFWebController.h
index 7b31704..7ab880a 100644
--- a/WebKit/WebView.subproj/IFWebController.h
+++ b/WebKit/WebView.subproj/IFWebController.h
@@ -6,7 +6,6 @@
 */
 #import <Cocoa/Cocoa.h>
 
-#import <WebFoundation/IFAuthenticationHandler.h>
 
 /*
    ============================================================================= 
@@ -164,6 +163,41 @@
 
 */
 
+ at interface IFSimpleAuthenticationResult 
+{
+    NSString *username;
+    NSString *password;
+    // May need an extra rememberThisPassword flag if the loader mechanism is
+    // going to provide a persistent credentials cache (for starters we can have
+    // just a session cache)
+}
+ at end
+
+ at interface IFSimpleAuthenticationRequest 
+{
+    NSURL *url;         // nil if for something non-URI based
+    NSString *domain;   // http authentication domain or some representation of 
+                        // auth domain for non-URI-based locations; otherwise nil.
+    NSString *username; // username, if already provided, otherwise nil
+    BOOL plaintextPassword; // password will be sent in the clear
+                            // TRUE for http basic auth or ftp
+                            // FALSE for http digest auth
+    unsigned previousFailures; // number of times in a row authenticating to this 
+                               // location has failed; useful to be able to show a 
+                               // different dialog based on count
+}
+ at end
+
+
+ at protocol IFAuthenticationHandler
+// Can we make this work without blocking the UI, or do we need to make it explicitly async
+// somehow?
+- (IFSimpleAuthenticationResult *) authenticate: (IFSimpleAuthenticationRequest *)request;
+
+// do we need anything for fancier authentication schemes like kerberos or GSSAPI?
+
+// Do we provide a default dialog?
+ at end
 
 
 /*
diff --git a/WebKit/WebView.subproj/WebController.h b/WebKit/WebView.subproj/WebController.h
index 7b31704..7ab880a 100644
--- a/WebKit/WebView.subproj/WebController.h
+++ b/WebKit/WebView.subproj/WebController.h
@@ -6,7 +6,6 @@
 */
 #import <Cocoa/Cocoa.h>
 
-#import <WebFoundation/IFAuthenticationHandler.h>
 
 /*
    ============================================================================= 
@@ -164,6 +163,41 @@
 
 */
 
+ at interface IFSimpleAuthenticationResult 
+{
+    NSString *username;
+    NSString *password;
+    // May need an extra rememberThisPassword flag if the loader mechanism is
+    // going to provide a persistent credentials cache (for starters we can have
+    // just a session cache)
+}
+ at end
+
+ at interface IFSimpleAuthenticationRequest 
+{
+    NSURL *url;         // nil if for something non-URI based
+    NSString *domain;   // http authentication domain or some representation of 
+                        // auth domain for non-URI-based locations; otherwise nil.
+    NSString *username; // username, if already provided, otherwise nil
+    BOOL plaintextPassword; // password will be sent in the clear
+                            // TRUE for http basic auth or ftp
+                            // FALSE for http digest auth
+    unsigned previousFailures; // number of times in a row authenticating to this 
+                               // location has failed; useful to be able to show a 
+                               // different dialog based on count
+}
+ at end
+
+
+ at protocol IFAuthenticationHandler
+// Can we make this work without blocking the UI, or do we need to make it explicitly async
+// somehow?
+- (IFSimpleAuthenticationResult *) authenticate: (IFSimpleAuthenticationRequest *)request;
+
+// do we need anything for fancier authentication schemes like kerberos or GSSAPI?
+
+// Do we provide a default dialog?
+ at end
 
 
 /*
diff --git a/WebKit/WebView.subproj/WebView.h b/WebKit/WebView.subproj/WebView.h
index 7b31704..7ab880a 100644
--- a/WebKit/WebView.subproj/WebView.h
+++ b/WebKit/WebView.subproj/WebView.h
@@ -6,7 +6,6 @@
 */
 #import <Cocoa/Cocoa.h>
 
-#import <WebFoundation/IFAuthenticationHandler.h>
 
 /*
    ============================================================================= 
@@ -164,6 +163,41 @@
 
 */
 
+ at interface IFSimpleAuthenticationResult 
+{
+    NSString *username;
+    NSString *password;
+    // May need an extra rememberThisPassword flag if the loader mechanism is
+    // going to provide a persistent credentials cache (for starters we can have
+    // just a session cache)
+}
+ at end
+
+ at interface IFSimpleAuthenticationRequest 
+{
+    NSURL *url;         // nil if for something non-URI based
+    NSString *domain;   // http authentication domain or some representation of 
+                        // auth domain for non-URI-based locations; otherwise nil.
+    NSString *username; // username, if already provided, otherwise nil
+    BOOL plaintextPassword; // password will be sent in the clear
+                            // TRUE for http basic auth or ftp
+                            // FALSE for http digest auth
+    unsigned previousFailures; // number of times in a row authenticating to this 
+                               // location has failed; useful to be able to show a 
+                               // different dialog based on count
+}
+ at end
+
+
+ at protocol IFAuthenticationHandler
+// Can we make this work without blocking the UI, or do we need to make it explicitly async
+// somehow?
+- (IFSimpleAuthenticationResult *) authenticate: (IFSimpleAuthenticationRequest *)request;
+
+// do we need anything for fancier authentication schemes like kerberos or GSSAPI?
+
+// Do we provide a default dialog?
+ at end
 
 
 /*

-- 
WebKit Debian packaging