diff options
| author | David Shaw <[email protected]> | 2006-02-22 02:11:35 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-02-22 02:11:35 +0000 |
| commit | 79ec50f77d03175652cdcfe04ab69ec75364f250 (patch) | |
| tree | 2c3db0b4c41b97c09d59edee84a1295d1dc4f380 | |
| parent | * getkey.c (get_pubkey_byname): Fix minor security problem with PKA when (diff) | |
| download | gnupg-79ec50f77d03175652cdcfe04ab69ec75364f250.tar.gz gnupg-79ec50f77d03175652cdcfe04ab69ec75364f250.zip | |
* curl-shim.h, curl-shim.c (curl_easy_init, curl_easy_setopt,
curl_easy_perform): Mingw has 'stderr' as a macro?
| -rw-r--r-- | keyserver/ChangeLog | 3 | ||||
| -rw-r--r-- | keyserver/curl-shim.c | 6 | ||||
| -rw-r--r-- | keyserver/curl-shim.h | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 65b7f3fad..18a7a0de3 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,6 +1,9 @@ 2006-02-21 David Shaw <[email protected]> * curl-shim.h, curl-shim.c (curl_easy_init, curl_easy_setopt, + curl_easy_perform): Mingw has 'stderr' as a macro? + + * curl-shim.h, curl-shim.c (curl_easy_init, curl_easy_setopt, curl_easy_perform): Add CURLOPT_VERBOSE and CURLOPT_STDERR for easier debugging. diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c index fa38abab3..4a4d18f56 100644 --- a/keyserver/curl-shim.c +++ b/keyserver/curl-shim.c @@ -92,7 +92,7 @@ curl_easy_init(void) handle=calloc(1,sizeof(CURL)); if(handle) - handle->stderr=stderr; + handle->errors=stderr; return handle; } @@ -143,7 +143,7 @@ curl_easy_setopt(CURL *curl,CURLoption option,...) curl->flags.verbose=va_arg(ap,unsigned int); break; case CURLOPT_STDERR: - curl->stderr=va_arg(ap,FILE *); + curl->errors=va_arg(ap,FILE *); break; default: /* We ignore the huge majority of curl options */ @@ -175,7 +175,7 @@ curl_easy_perform(CURL *curl) proxy=getenv(HTTP_PROXY_ENV); if(curl->flags.verbose) - fprintf(curl->stderr,"* HTTP proxy is \"%s\"\n",proxy?proxy:"null"); + fprintf(curl->errors,"* HTTP proxy is \"%s\"\n",proxy?proxy:"null"); if(curl->flags.post) { diff --git a/keyserver/curl-shim.h b/keyserver/curl-shim.h index 7fee3b70f..91eac9d1e 100644 --- a/keyserver/curl-shim.h +++ b/keyserver/curl-shim.h @@ -66,7 +66,7 @@ typedef struct void *file; char *postfields; unsigned int status; - FILE *stderr; + FILE *errors; struct { unsigned int post:1; |