Commit a900d454 authored by Jeff King's avatar Jeff King Committed by Daniel Stenberg
Browse files

curl_multi_cleanup: ignore SIGPIPE 



This is an extension to the fix in 7d80ed64. 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: default avatarJeff King <peff@peff.net>
parent e64f91fe

lib/multi.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "bundles.h"

#include "bundles.h"

#include "multihandle.h"

#include "multihandle.h"

#include "pipeline.h"

#include "pipeline.h"

#include "sigpipe.h"





#define _MPRINTF_REPLACE /* use our functions only */

#define _MPRINTF_REPLACE /* use our functions only */

#include <curl/mprintf.h>

#include <curl/mprintf.h>
@@ -1786,12 +1787,18 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle) 
  struct SessionHandle *nextdata;

  struct SessionHandle *nextdata;





  if(GOOD_MULTI_HANDLE(multi)) {

  if(GOOD_MULTI_HANDLE(multi)) {

    SIGPIPE_VARIABLE(pipe);

    bool restore_pipe = FALSE;



    multi->type = 0; /* not good anymore */

    multi->type = 0; /* not good anymore */





    /* Close all the connections in the connection cache */

    /* Close all the connections in the connection cache */

    close_all_connections(multi);

    close_all_connections(multi);





    if(multi->closure_handle) {

    if(multi->closure_handle) {

      sigpipe_ignore(multi->closure_handle, &pipe);

      restore_pipe = TRUE;



      multi->closure_handle->dns.hostcache = multi->hostcache;

      multi->closure_handle->dns.hostcache = multi->hostcache;

      Curl_hostcache_clean(multi->closure_handle,

      Curl_hostcache_clean(multi->closure_handle,

                           multi->closure_handle->dns.hostcache);

                           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);

    Curl_pipeline_set_server_blacklist(NULL, &multi->pipelining_server_bl);





    free(multi);

    free(multi);

    if(restore_pipe)

      sigpipe_restore(&pipe);





    return CURLM_OK;

    return CURLM_OK;

  }

  }