From: Jeff King <peff@peff.net>
To: Daniel Stenberg <daniel@haxx.se>
Cc: Stefan Beller <stefanbeller@googlemail.com>,
GIT Mailing-list <git@vger.kernel.org>
Subject: [curl PATCH 2/2] ignore SIGPIPE during curl_multi_cleanup
Date: Mon, 25 Nov 2013 09:43:21 -0500 [thread overview]
Message-ID: <20131125144321.GA23779@sigill.intra.peff.net> (raw)
In-Reply-To: <20131125143213.GA22642@sigill.intra.peff.net>
This is an extension to the fix in 7d80ed64e43515. We may
call Curl_disconnect() while cleaning up the multi handle,
which could lead to openssl sending packets, which could get
a SIGPIPE.
Signed-off-by: Jeff King <peff@peff.net>
---
I really am just cargo-culting here. I have no idea what
multi->closure_handle does, except that it gets used as conn->data for
the connection we pass to Curl_disconnect, so it seems like a reasonable
place to check for the magic no_signal variable.
lib/multi.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/lib/multi.c b/lib/multi.c
index 923e2ce..2ecb1a4 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -41,6 +41,7 @@
#include "bundles.h"
#include "multihandle.h"
#include "pipeline.h"
+#include "sigpipe.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
@@ -1786,12 +1787,18 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
struct SessionHandle *nextdata;
if(GOOD_MULTI_HANDLE(multi)) {
+ SIGPIPE_VARIABLE(pipe);
+ bool restore_pipe = FALSE;
+
multi->type = 0; /* not good anymore */
/* Close all the connections in the connection cache */
close_all_connections(multi);
if(multi->closure_handle) {
+ sigpipe_ignore(multi->closure_handle, &pipe);
+ restore_pipe = TRUE;
+
multi->closure_handle->dns.hostcache = multi->hostcache;
Curl_hostcache_clean(multi->closure_handle,
multi->closure_handle->dns.hostcache);
@@ -1836,6 +1843,8 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
Curl_pipeline_set_server_blacklist(NULL, &multi->pipelining_server_bl);
free(multi);
+ if (restore_pipe)
+ sigpipe_restore(&pipe);
return CURLM_OK;
}
--
1.8.5.rc3.491.ge1614cf
next prev parent reply other threads:[~2013-11-25 14:43 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-23 16:36 error: git-remote-https died of signal 13 Stefan Beller
2013-11-24 6:54 ` Jeff King
2013-11-24 12:54 ` Stefan Beller
2013-11-24 13:33 ` Jeff King
2013-11-24 15:01 ` Stefan Beller
2013-11-24 15:54 ` Jeff King
2013-11-24 16:13 ` Stefan Beller
2013-11-24 16:32 ` Stefan Beller
2013-11-25 6:39 ` Jeff King
2013-11-25 7:20 ` Daniel Stenberg
2013-11-25 14:32 ` Jeff King
2013-11-25 14:35 ` [curl PATCH 1/2] factor out sigpipe_reset from easy.c Jeff King
2013-11-25 14:43 ` Jeff King [this message]
2013-11-27 21:39 ` [curl PATCH 2/2] ignore SIGPIPE during curl_multi_cleanup Daniel Stenberg
2018-05-22 10:26 ` curlUser
2018-05-22 10:50 ` Daniel Stenberg
[not found] ` <CAG4qzjti3MRXZ_Kofbb8b6whwDw7Se8g1VAe0mcU4ZdiWRfxpQ@mail.gmail.com>
2018-05-22 15:06 ` Daniel Stenberg
2018-05-22 15:01 ` curlUser
2018-08-03 12:29 ` dxt29
2013-11-25 14:46 ` error: git-remote-https died of signal 13 Jeff King
2013-11-24 22:13 ` Daniel Stenberg
2013-11-24 23:51 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131125144321.GA23779@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=daniel@haxx.se \
--cc=git@vger.kernel.org \
--cc=stefanbeller@googlemail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).