Commit 12ccaed2 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

http-proxy: deal with EAGAIN 

... the previous code would reset the header length wrongly (since
5113ad04). This makes test 1060 reliable again.

Also: make sws send even smaller chunks of data to increase the
likeliness of this happening.
parent e9422bc1

lib/http_proxy.c

+1 −2
Original line number Diff line number Diff line
@@ -311,6 +311,7 @@ static CURLcode CONNECT(struct connectdata *conn, 
        return result;



      s->tunnel_state = TUNNEL_CONNECT;

      s->perline = 0;

    } /* END CONNECT PHASE */



    check = Curl_timeleft(data, NULL, TRUE);
@@ -328,8 +329,6 @@ static CURLcode CONNECT(struct connectdata *conn, 
    { /* READING RESPONSE PHASE */

      int error = SELECT_OK;



      s->perline = 0;



      while(s->keepon && !error) {

        ssize_t gotbytes;

tests/server/sws.c

+3 −6
Original line number Diff line number Diff line
@@ -1194,12 +1194,12 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) 


  responsesize = count;

  do {

    /* Ok, we send no more than 200 bytes at a time, just to make sure that

    /* Ok, we send no more than N bytes at a time, just to make sure that

       larger chunks are split up so that the client will need to do multiple

       recv() calls to get it and thus we exercise that code better */

    size_t num = count;

    if(num > 200)

      num = 200;

    if(num > 20)

      num = 20;



    retry:

    written = swrite(sock, buffer, num);
@@ -1211,9 +1211,6 @@ static int send_doc(curl_socket_t sock, struct httprequest *req) 
      sendfailure = TRUE;

      break;

    }

    else {

      logmsg("Sent off %zd bytes", written);

    }



    /* write to file as well */

    fwrite(buffer, 1, (size_t)written, dump);