security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* curl-shim.h, curl-shim.c (curl_easy_init, curl_easy_setopt,

Browse Source 
curl_easy_perform): Add CURLOPT_VERBOSE and CURLOPT_STDERR for easier
debugging.
This commit is contained in:
David Shaw 2006-02-21 16:16:09 +00:00
parent 0eb4e93bd4
commit e4206de3f5
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keyserver/ChangeLog
View File

@ -1,3 +1,9 @@
2006-02-21 David Shaw <dshaw@jabberwocky.com>
* curl-shim.h, curl-shim.c (curl_easy_init, curl_easy_setopt,
curl_easy_perform): Add CURLOPT_VERBOSE and CURLOPT_STDERR for
easier debugging.
2006-01-16 David Shaw <dshaw@jabberwocky.com> 2006-01-16 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c (send_key): Do not escape the '=' in the HTTP POST * gpgkeys_hkp.c (send_key): Do not escape the '=' in the HTTP POST

19
keyserver/curl-shim.c
View File

@ -1,7 +1,7 @@
/* curl-shim.c - Implement a small subset of the curl API in terms of /* curl-shim.c - Implement a small subset of the curl API in terms of
* the iobuf HTTP API * the iobuf HTTP API
* *
* Copyright (C) 2005 Free Software Foundation, Inc. * Copyright (C) 2005, 2006 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -88,7 +88,13 @@ curl_global_cleanup(void) {}
CURL * CURL *
curl_easy_init(void) curl_easy_init(void)
{ {
return calloc(1,sizeof(CURL)); CURL *handle;
handle=calloc(1,sizeof(CURL));
if(handle)
handle->stderr=stderr;
return handle;
} }
void void
@ -133,6 +139,12 @@ curl_easy_setopt(CURL *curl,CURLoption option,...)
case CURLOPT_FAILONERROR: case CURLOPT_FAILONERROR:
curl->flags.failonerror=va_arg(ap,unsigned int); curl->flags.failonerror=va_arg(ap,unsigned int);
break; break;
case CURLOPT_VERBOSE:
curl->flags.verbose=va_arg(ap,unsigned int);
break;
case CURLOPT_STDERR:
curl->stderr=va_arg(ap,FILE *);
break;
default: default:
/* We ignore the huge majority of curl options */ /* We ignore the huge majority of curl options */
break; break;
@ -162,6 +174,9 @@ curl_easy_perform(CURL *curl)
else else
proxy=getenv(HTTP_PROXY_ENV); proxy=getenv(HTTP_PROXY_ENV);
if(curl->flags.verbose)
fprintf(curl->stderr,"* HTTP proxy is \"%s\"\n",proxy?proxy:"null");
if(curl->flags.post) if(curl->flags.post)
{ {
rc=http_open(&curl->hd,HTTP_REQ_POST,curl->url,curl->auth,0,proxy); rc=http_open(&curl->hd,HTTP_REQ_POST,curl->url,curl->auth,0,proxy);

4
keyserver/curl-shim.h
View File

@ -1,5 +1,5 @@
/* curl-shim.h /* curl-shim.h
* Copyright (C) 2005 Free Software Foundation, Inc. * Copyright (C) 2005, 2006 Free Software Foundation, Inc.
* *
* This file is part of GNUPG. * This file is part of GNUPG.
* *
@ -66,10 +66,12 @@ typedef struct
void *file; void *file;
char *postfields; char *postfields;
unsigned int status; unsigned int status;
FILE *stderr;
struct struct
{ {
unsigned int post:1; unsigned int post:1;
unsigned int failonerror:1; unsigned int failonerror:1;
unsigned int verbose:1;
} flags; } flags;
struct http_context hd; struct http_context hd;
} CURL; } CURL;