From b7a7551085f660354d9fc5ca25f72f1055f55de6 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 23 Jun 2005 04:24:28 +0000 Subject: [PATCH] * http.h: Fix prototypes for http_open_document and http_open again, to handle the new different auth for regular files and proxies. --- include/ChangeLog | 6 ++++++ include/http.h | 13 ++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index f2fdbd0e2..610829636 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,9 @@ +2005-06-23 David Shaw + + * 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 * http.h: Fix prototypes for http_open_document and http_open to diff --git a/include/http.h b/include/http.h index 265552532..060b5b8fc 100644 --- a/include/http.h +++ b/include/http.h @@ -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 @@ typedef struct uri_tuple *URI_TUPLE; 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 @@ struct http_context { 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*/