security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-09 12:54:23 +01:00
Code Activity

Bring the fix for bug 739 on 1.4 over to 2.0 (bug 1479)

Browse Source 
* http.h, http.c (http_wait_response, main): Remove
  HTTP_FLAG_NO_SHUTDOWN.
This commit is contained in:
David Shaw 2013-02-28 13:48:58 -05:00
parent 815d01fceb
commit fe85638284
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/http.c
View File

@ -1,6 +1,6 @@
/* http.c - HTTP protocol handler /* http.c - HTTP protocol handler
* Copyright (C) 1999, 2001, 2002, 2003, 2004, 2006, * Copyright (C) 1999, 2001, 2002, 2003, 2004, 2006,
* 2009, 2012 Free Software Foundation, Inc. * 2009, 2012, 2013 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -417,8 +417,6 @@ http_wait_response (http_t hd)
hd->write_cookie = NULL; hd->write_cookie = NULL;
#endif #endif
if (!(hd->flags & HTTP_FLAG_NO_SHUTDOWN))
shutdown (hd->sock, 1);
hd->in_data = 0; hd->in_data = 0;
#ifdef HTTP_USE_ESTREAM #ifdef HTTP_USE_ESTREAM
@ -2039,8 +2037,7 @@ main (int argc, char **argv)
http_release_parsed_uri (uri); http_release_parsed_uri (uri);
uri = NULL; uri = NULL;
rc = http_open_document (&hd, *argv, NULL, rc = http_open_document (&hd, *argv, NULL, HTTP_FLAG_NEED_HEADER,
HTTP_FLAG_NO_SHUTDOWN | HTTP_FLAG_NEED_HEADER,
NULL, tls_session); NULL, tls_session);
if (rc) if (rc)
{ {

7
common/http.h
View File

@ -1,6 +1,6 @@
/* http.h - HTTP protocol handler /* http.h - HTTP protocol handler
* Copyright (C) 1999, 2000, 2001, 2003, * Copyright (C) 1999, 2000, 2001, 2003,
* 2006, 2012 Free Software Foundation, Inc. * 2006, 2012, 2013 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -62,9 +62,8 @@ http_req_t;
enum enum
{ {
HTTP_FLAG_TRY_PROXY = 1, HTTP_FLAG_TRY_PROXY = 1,
HTTP_FLAG_NO_SHUTDOWN = 2, HTTP_FLAG_LOG_RESP = 2,
HTTP_FLAG_LOG_RESP = 4, HTTP_FLAG_NEED_HEADER = 4
HTTP_FLAG_NEED_HEADER = 8
}; };
struct http_context_s; struct http_context_s;