diff options
| author | Werner Koch <[email protected]> | 2006-12-14 09:55:32 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2006-12-14 09:55:32 +0000 |
| commit | 60044dd11b4d503a4e498b90fbdbcce87ff13114 (patch) | |
| tree | 8b7231b9eed320955c55b3a5f3487535b0130bd9 | |
| parent | * Makefile.am: Install options.skel via dist_pkgdata_DATA so that (diff) | |
| download | gnupg-60044dd11b4d503a4e498b90fbdbcce87ff13114.tar.gz gnupg-60044dd11b4d503a4e498b90fbdbcce87ff13114.zip | |
Fix bug#739 (proxy/shutdown)
| -rw-r--r-- | util/ChangeLog | 4 | ||||
| -rw-r--r-- | util/http.c | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 29ba4766f..a87b5d799 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,7 @@ +2006-12-14 Werner Koch <[email protected]> + + * http.c (http_wait_response): No more shutdown. Fixes bug#739. + 2006-10-02 David Shaw <[email protected]> * strsep.c (strsep): It's strsep, not strsep2 from testing. (If I diff --git a/util/http.c b/util/http.c index 41000024f..6f6bf76c2 100644 --- a/util/http.c +++ b/util/http.c @@ -212,8 +212,12 @@ http_wait_response( HTTP_HD hd, unsigned int *ret_status ) iobuf_ioctl (hd->fp_write, 1, 1, NULL); /* keep the socket open */ iobuf_close (hd->fp_write); hd->fp_write = NULL; - if ( !(hd->flags & HTTP_FLAG_NO_SHUTDOWN) ) - shutdown( hd->sock, 1 ); + /* We do not want the shutdown code anymore. It used to be there + to support old versions of pksd. These versions are anyway + unusable and the latest releases haven been fixed to properly + handle HTTP 1.0. */ + /* if ( !(hd->flags & HTTP_FLAG_NO_SHUTDOWN) ) */ + /* shutdown( hd->sock, 1 ); */ hd->in_data = 0; hd->fp_read = iobuf_sockopen( hd->sock , "r" ); |