Commit 276741af authored by Kamil Dudka's avatar Kamil Dudka
Browse files

transfer: drop the code handling the ssl_connect_retry flag 

Its last use has been removed by the previous commit.
parent 3f430c9c

lib/transfer.c

+4 −8
Original line number Diff line number Diff line
@@ -1297,8 +1297,6 @@ CURLcode Curl_pretransfer(struct SessionHandle *data) 
  data->state.errorbuf = FALSE; /* no error has occurred */

  data->state.httpversion = 0; /* don't assume any particular server version */



  data->state.ssl_connect_retry = FALSE;



  data->state.authproblem = FALSE;

  data->state.authhost.want = data->set.httpauth;

  data->state.authproxy.want = data->set.proxyauth;
@@ -1872,12 +1870,10 @@ CURLcode Curl_retry_request(struct connectdata *conn, 
     !(conn->handler->protocol&(PROTO_FAMILY_HTTP|CURLPROTO_RTSP)))

    return CURLE_OK;



  if(/* workaround for broken TLS servers */ data->state.ssl_connect_retry ||

      ((data->req.bytecount +

        data->req.headerbytecount == 0) &&

  if((data->req.bytecount + data->req.headerbytecount == 0) &&

      conn->bits.reuse &&

      !data->set.opt_no_body &&

       data->set.rtspreq != RTSPREQ_RECEIVE)) {

      (data->set.rtspreq != RTSPREQ_RECEIVE)) {

    /* We got no data, we attempted to re-use a connection and yet we want a

       "body". This might happen if the connection was left alive when we were

       done using it before, but that was closed when we wanted to read from

lib/urldata.h

+0 −2
Original line number Diff line number Diff line
@@ -1321,8 +1321,6 @@ struct UrlState { 
  long rtsp_next_server_CSeq; /* the session's next server CSeq */

  long rtsp_CSeq_recv; /* most recent CSeq received */



  /* if true, force SSL connection retry (workaround for certain servers) */

  bool ssl_connect_retry;

  curl_off_t infilesize; /* size of file to upload, -1 means unknown.

                            Copied from set.filesize at start of operation */

};