diff options
| author | David Shaw <[email protected]> | 2013-02-28 18:48:58 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2013-02-28 18:48:58 +0000 |
| commit | fe85638284880805b80778fe87ae551d3de0ca32 (patch) | |
| tree | 37ae4e28f6e08db9c2ec00f0a4f36dfce6d47a9d | |
| parent | Japanese: minor doc update. (diff) | |
| download | gnupg-fe85638284880805b80778fe87ae551d3de0ca32.tar.gz gnupg-fe85638284880805b80778fe87ae551d3de0ca32.zip | |
Bring the fix for bug 739 on 1.4 over to 2.0 (bug 1479)
* http.h, http.c (http_wait_response, main): Remove
HTTP_FLAG_NO_SHUTDOWN.
| -rw-r--r-- | common/http.c | 7 | ||||
| -rw-r--r-- | common/http.h | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/common/http.c b/common/http.c index 755ab1b92..49859fa02 100644 --- a/common/http.c +++ b/common/http.c @@ -1,6 +1,6 @@ /* http.c - HTTP protocol handler * 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. * @@ -417,8 +417,6 @@ http_wait_response (http_t hd) hd->write_cookie = NULL; #endif - if (!(hd->flags & HTTP_FLAG_NO_SHUTDOWN)) - shutdown (hd->sock, 1); hd->in_data = 0; #ifdef HTTP_USE_ESTREAM @@ -2039,8 +2037,7 @@ main (int argc, char **argv) http_release_parsed_uri (uri); uri = NULL; - rc = http_open_document (&hd, *argv, NULL, - HTTP_FLAG_NO_SHUTDOWN | HTTP_FLAG_NEED_HEADER, + rc = http_open_document (&hd, *argv, NULL, HTTP_FLAG_NEED_HEADER, NULL, tls_session); if (rc) { diff --git a/common/http.h b/common/http.h index 2b17ab7e8..0b1dc4df0 100644 --- a/common/http.h +++ b/common/http.h @@ -1,6 +1,6 @@ /* http.h - HTTP protocol handler * 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. * @@ -62,9 +62,8 @@ http_req_t; enum { HTTP_FLAG_TRY_PROXY = 1, - HTTP_FLAG_NO_SHUTDOWN = 2, - HTTP_FLAG_LOG_RESP = 4, - HTTP_FLAG_NEED_HEADER = 8 + HTTP_FLAG_LOG_RESP = 2, + HTTP_FLAG_NEED_HEADER = 4 }; struct http_context_s; |