Commit 42acb00c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

moved the bools in the connectdata struct into the substruct named 

ConnectBits where the other bools already are
parent ca6e7708

lib/ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -2089,7 +2089,7 @@ CURLcode Curl_ftp(struct connectdata *conn) 
      retcode = Curl_ftp_nextconnect(conn);

    else

      /* since we didn't connect now, we want do_more to get called */

      conn->do_more = TRUE;

      conn->bits.do_more = TRUE;

  }



  return retcode;

lib/http.c

+1 −1
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ CURLcode Curl_http(struct connectdata *conn) 
    conn->allocptr.cookie = aprintf("Cookie: %s\015\012", data->set.cookie);

  }



  if(conn->upload_chunky) {

  if(conn->bits.upload_chunky) {

    if(!checkheaders(data, "Transfer-Encoding:")) {

      te = "Transfer-Encoding: chunked\r\n";

    }

lib/multi.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ CURLMcode curl_multi_perform(CURLM *multi_handle, int *running_handles) 
      if(CURLE_OK == easy->result) {



        /* after do, go PERFORM... or DO_MORE */

        if(easy->easy_conn->do_more) {

        if(easy->easy_conn->bits.do_more) {

          /* we're supposed to do more, but we need to sit down, relax

             and wait a little while first */

          easy->state = CURLM_STATE_DO_MORE;

lib/transfer.c

+6 −6
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ CURLcode Curl_readwrite(struct connectdata *conn, 


        if(!k->upload_done) {



          if(conn->upload_chunky) {

          if(conn->bits.upload_chunky) {

            /* if chunked Transfer-Encoding */

            buffersize -= (8 + 2 + 2);   /* 32bit hex + CRLF + CRLF */

            conn->upload_fromhere += 10; /* 32bit hex + CRLF */
@@ -914,7 +914,7 @@ CURLcode Curl_readwrite(struct connectdata *conn, 
          nread = data->set.fread(conn->upload_fromhere, 1,

                                  buffersize, data->set.in);

          

          if(conn->upload_chunky) {

          if(conn->bits.upload_chunky) {

            /* if chunked Transfer-Encoding */

            char hexbuffer[9];

            int hexlen = snprintf(hexbuffer, sizeof(hexbuffer),
@@ -1112,13 +1112,13 @@ CURLcode Curl_readwrite_init(struct connectdata *conn) 
  Curl_pgrsSetUploadCounter(data, 0);

  Curl_pgrsSetDownloadCounter(data, 0);



  if (!conn->getheader) {

  if (!conn->bits.getheader) {

    k->header = FALSE;

    if(conn->size > 0)

      Curl_pgrsSetDownloadSize(data, conn->size);

  }

  /* we want header and/or body, if neither then don't do this! */

  if(conn->getheader || !data->set.no_body) {

  if(conn->bits.getheader || !data->set.no_body) {



    FD_ZERO (&k->readfd);		/* clear it */

    if(conn->sockfd != -1) {
@@ -1200,7 +1200,7 @@ Transfer(struct connectdata *conn) 
    return CURLE_OK;



  /* we want header and/or body, if neither then don't do this! */

  if(!conn->getheader && data->set.no_body)

  if(!conn->bits.getheader && data->set.no_body)

    return CURLE_OK;



  k->writefdp = &k->writefd; /* store the address of the set */
@@ -1649,7 +1649,7 @@ Curl_Transfer(struct connectdata *c_conn, /* connection data */ 
  /* now copy all input parameters */

  conn->sockfd = sockfd;

  conn->size = size;

  conn->getheader = getheader;

  conn->bits.getheader = getheader;

  conn->bytecountp = bytecountp;

  conn->writesockfd = writesockfd;

  conn->writebytecountp = writebytecountp;

lib/url.c

+2 −2
Original line number Diff line number Diff line
@@ -1769,7 +1769,7 @@ static CURLcode CreateConnection(struct SessionHandle *data, 
     is later set "for real" using Curl_pgrsStartNow(). */

  conn->data->progress.start = conn->created; 



  conn->upload_chunky =

  conn->bits.upload_chunky =

    ((conn->protocol&PROT_HTTP) &&

     data->set.upload &&

     (data->set.infilesize == -1) &&
@@ -2889,7 +2889,7 @@ CURLcode Curl_do(struct connectdata **connp) 
  struct connectdata *conn = *connp;

  struct SessionHandle *data=conn->data;



  conn->do_more = FALSE; /* by default there's no curl_do_more() to use */

  conn->bits.do_more = FALSE; /* by default there's no curl_do_more() to use */



  if(conn->curl_do) {

    /* generic protocol-specific function pointer set in curl_connect() */