[svn] GnuPG - r4383 - branches/STABLE-BRANCH-1-4/util

[svn author wk]

Author: wk
Date: 2006-12-14 10:55:32 +0100 (Thu, 14 Dec 2006)
New Revision: 4383

Modified:
   branches/STABLE-BRANCH-1-4/util/ChangeLog
   branches/STABLE-BRANCH-1-4/util/http.c
Log:
Fix bug#739 (proxy/shutdown)


Modified: branches/STABLE-BRANCH-1-4/util/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/util/ChangeLog	2006-12-13 21:41:37 UTC (rev 4382)
+++ branches/STABLE-BRANCH-1-4/util/ChangeLog	2006-12-14 09:55:32 UTC (rev 4383)
@@ -1,3 +1,7 @@
+2006-12-14  Werner Koch  <wk at g10code.com>
+
+	* http.c (http_wait_response): No more shutdown.  Fixes bug#739.
+
 2006-10-02  David Shaw  <dshaw at jabberwocky.com>
 
 	* strsep.c (strsep): It's strsep, not strsep2 from testing.  (If I

Modified: branches/STABLE-BRANCH-1-4/util/http.c
===================================================================
--- branches/STABLE-BRANCH-1-4/util/http.c	2006-12-13 21:41:37 UTC (rev 4382)
+++ branches/STABLE-BRANCH-1-4/util/http.c	2006-12-14 09:55:32 UTC (rev 4383)
@@ -212,8 +212,12 @@
     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" );