gnupg/include (ChangeLog http.h)

[cvs user dshaw]

    Date: Thursday, June 23, 2005 @ 06:24:28
  Author: dshaw
    Path: /cvs/gnupg/gnupg/include

Modified: ChangeLog http.h

* http.h: Fix prototypes for http_open_document and http_open again,
to handle the new different auth for regular files and proxies.


-----------+
 ChangeLog |    6 ++++++
 http.h    |   13 ++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)


Index: gnupg/include/ChangeLog
diff -u gnupg/include/ChangeLog:1.88 gnupg/include/ChangeLog:1.89
--- gnupg/include/ChangeLog:1.88	Wed Jun 22 06:13:41 2005
+++ gnupg/include/ChangeLog	Thu Jun 23 06:24:28 2005
@@ -1,3 +1,9 @@
+2005-06-23  David Shaw  <dshaw at jabberwocky.com>
+
+	* http.h: Fix prototypes for http_open_document and http_open
+	again, to handle the new different auth for regular files and
+	proxies.
+
 2005-06-21  David Shaw  <dshaw at jabberwocky.com>
 
 	* http.h: Fix prototypes for http_open_document and http_open to
Index: gnupg/include/http.h
diff -u gnupg/include/http.h:1.11 gnupg/include/http.h:1.12
--- gnupg/include/http.h:1.11	Wed Jun 22 06:13:41 2005
+++ gnupg/include/http.h	Thu Jun 23 06:24:28 2005
@@ -1,5 +1,6 @@
 /* http.h  -  HTTP protocol handler
- * Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2000, 2001, 2003, 2004,
+ *               2005 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -36,7 +37,7 @@
 struct parsed_uri {
     /* all these pointers point into buffer; most stuff is not escaped */
     char *scheme;	/* pointer to the scheme string (lowercase) */
-    const char *auth;   /* username/password for basic auth */
+    char *auth;         /* username/password for basic auth */
     char *host; 	/* host (converted to lowercase) */
     ushort port;	/* port (always set if the host is set) */
     char *path; 	/* the path */
@@ -76,13 +77,11 @@
 typedef struct http_context *HTTP_HD;
 
 int http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url,
-	       const char *auth, unsigned int flags, const char *proxy,
-	       const char *proxyauth );
+	       char *auth, unsigned int flags, const char *proxy );
 void http_start_data( HTTP_HD hd );
 int  http_wait_response( HTTP_HD hd, unsigned int *ret_status );
 void http_close( HTTP_HD hd );
-int http_open_document( HTTP_HD hd, const char *document, const char *auth,
-			unsigned int flags, const char *proxy,
-			const char *proxyauth );
+int http_open_document( HTTP_HD hd, const char *document, char *auth,
+			unsigned int flags, const char *proxy );
 
 #endif /*G10_HTTP_H*/