Commit c19844a0 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

better deal with HTTP(S) servers that respond with no headers at all, test 

case 306 added to verify that we do right
parent 22cf0551

lib/http.c

+4 −2
Original line number Diff line number Diff line
@@ -965,7 +965,8 @@ CURLcode Curl_http(struct connectdata *conn) 
        failf(data, "Failed sending HTTP POST request");

      else

        result =

          Curl_Transfer(conn, conn->firstsocket, -1, TRUE, bytecount,

          Curl_Transfer(conn, conn->firstsocket, -1, TRUE,

                        &http->readbytecount,

                        data->set.postfields?-1:conn->firstsocket,

                        data->set.postfields?NULL:&http->writebytecount);

      break;
@@ -981,7 +982,8 @@ CURLcode Curl_http(struct connectdata *conn) 
        failf(data, "Failed sending HTTP request");

      else

        /* HTTP GET/HEAD download: */

        result = Curl_Transfer(conn, conn->firstsocket, -1, TRUE, bytecount,

        result = Curl_Transfer(conn, conn->firstsocket, -1, TRUE,

                               &http->readbytecount,

                               -1, NULL); /* nothing to upload */

    }

    if(result)

lib/transfer.c

+32 −12
Original line number Diff line number Diff line
@@ -292,8 +292,18 @@ CURLcode Curl_readwrite(struct connectdata *conn, 
              k->hbufp = data->state.headerbuff + hbufp_index;

            }

            strcpy (k->hbufp, k->str);

            k->hbufp += strlen (k->str);

            k->hbuflen += strlen (k->str);

            k->hbufp += str_length;

            k->hbuflen += str_length;

            if (!k->headerline && (k->hbuflen>5)) {

              /* make a first check that this looks like a HTTP header */

              if(!strnequal(data->state.headerbuff, "HTTP/", 5)) {

                /* this is not the beginning of a HTTP first header line */

                k->header = FALSE;

                k->badheader = TRUE;

                break;

              }

            }



            break;		/* read more and try again */

          }
@@ -497,9 +507,11 @@ CURLcode Curl_readwrite(struct connectdata *conn, 
            }

            else {

              k->header = FALSE;   /* this is not a header line */

              k->badheader = TRUE; /* this was a bad header */

              break;

            }

          }



          /* check for Content-Length: header lines to get size */

          if (strnequal("Content-Length:", k->p, 15) &&

              sscanf (k->p+15, " %ld", &k->contentlength)) {
@@ -690,8 +702,7 @@ CURLcode Curl_readwrite(struct connectdata *conn, 
           buffer. */



        if (!k->header) {

          /* the next token and forward is not part of

             the header! */

          /* starting here, this is not part of the header! */



          /* we subtract the remaining header size from the buffer */

          nread -= (k->str - k->buf);
@@ -804,9 +815,18 @@ CURLcode Curl_readwrite(struct connectdata *conn, 


        Curl_pgrsSetDownloadCounter(data, (double)k->bytecount);

            

        if(!conn->bits.chunk && nread) {

        if(!conn->bits.chunk && (nread || k->badheader)) {

          /* If this is chunky transfer, it was already written */



          if(k->badheader) {

            /* we parsed a piece of data wrongly assuming it was a header

               and now we output it as body instead */

            result = Curl_client_write(data, CLIENTWRITE_BODY,

                                       data->state.headerbuff,

                                       k->hbuflen);

            k->badheader = FALSE; /* taken care of now */

          }



          /* This switch handles various content encodings. If there's an

             error here, be sure to check over the almost identical code in

             http_chunk.c. 08/29/02 jhrg */

lib/urldata.h

+2 −2
Original line number Diff line number Diff line
@@ -229,6 +229,8 @@ struct Curl_transfer_keeper { 
  struct timeval start;         /* transfer started at this time */

  struct timeval now;           /* current time */

  bool header;	                /* incoming data has HTTP header */

  bool badheader;		/* the header was deemed bad and will be

                                   written as body */

  int headerline;		/* counts header lines to better track the

                                   first one */

  char *hbufp;			/* points at *end* of header line */
@@ -245,8 +247,6 @@ struct Curl_transfer_keeper { 
  bool write_after_100_header;  /* should we enable the write after

                                   we received a 100-continue/timeout

                                   or directly */



  /* for content-encoding 08/28/02 jhrg */

  int content_encoding;  	/* What content encoding. sec 3.5, RFC2616. */



#define IDENTITY 0		/* No encoding */