generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added support for HTTP code 100 continue, as 8.2.3 in RFC2616 defines

Browse Source
This commit is contained in:
Daniel Stenberg 2001-03-19 07:47:57 +00:00
parent 38c47803dd
commit 78b4851da1
1 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lib/transfer.c
View File

@ -127,7 +127,7 @@ Transfer(struct connectdata *c_conn)
bool content_range = FALSE; /* set TRUE if Content-Range: was found */ bool content_range = FALSE; /* set TRUE if Content-Range: was found */
int offset = 0; /* possible resume offset read from the int offset = 0; /* possible resume offset read from the
Content-Range: header */ Content-Range: header */
int code = 0; /* error code from the 'HTTP/1.? XXX' line */ int httpcode = 0; /* error code from the 'HTTP/1.? XXX' line */
int httpversion = -1; /* the last digit in the HTTP/1.1 string */ int httpversion = -1; /* the last digit in the HTTP/1.1 string */
/* for the low speed checks: */ /* for the low speed checks: */
@ -181,7 +181,7 @@ Transfer(struct connectdata *c_conn)
int keepon=0; int keepon=0;
/* timeout every X second /* timeout every X second
- makes a better progressmeter (i.e even when no data is read, the - makes a better progress meter (i.e even when no data is read, the
meter can be updated and reflect reality) meter can be updated and reflect reality)
- allows removal of the alarm() crap - allows removal of the alarm() crap
- variable timeout is easier - variable timeout is easier
@ -310,8 +310,11 @@ Transfer(struct connectdata *c_conn)
/* we now have a full line that p points to */ /* we now have a full line that p points to */
if (('\n' == *p) || ('\r' == *p)) { if (('\n' == *p) || ('\r' == *p)) {
/* Zero-length line means end of header! */ /* Zero-length line means end of header! */
#if 0
if (-1 != conn->size) /* if known */ if (-1 != conn->size) /* if known */
conn->size += bytecount; /* we append the already read size */ conn->size += bytecount; /* we append the already read
size */
#endif
if ('\r' == *p) if ('\r' == *p)
@ -321,7 +324,20 @@ Transfer(struct connectdata *c_conn)
#if 0 /* headers are not included in the size */ #if 0 /* headers are not included in the size */
Curl_pgrsSetDownloadSize(data, conn->size); Curl_pgrsSetDownloadSize(data, conn->size);
#endif #endif
header = FALSE; /* no more header to parse! */
if(100 == httpcode) {
/*
* we have made a HTTP PUT or POST and this is 1.1-lingo
* that tells us that the server is OK with this and ready
* to receive our stuff.
* However, we'll get more headers now so we must get
* back into the header-parsing state!
*/
header = TRUE;
headerline = 0; /* we restart the header line counter */
}
else
header = FALSE; /* no more header to parse! */
/* now, only output this if the header AND body are requested: /* now, only output this if the header AND body are requested:
*/ */
@ -336,29 +352,38 @@ Transfer(struct connectdata *c_conn)
data->header_size += p - data->headerbuff; data->header_size += p - data->headerbuff;
if(!header) {
/*
* end-of-headers.
*
* If we requested a "no body" and this isn't a "close"
* connection, this is a good time to get out and return
* home.
*/
if(!conn->bits.close && data->bits.no_body)
return CURLE_OK;
break; /* exit header line loop */
}
/* /* We continue reading headers, so reset the line-based
* end-of-headers. header parsing variables hbufp && hbuflen */
* hbufp = data->headerbuff;
* If we requested a "no body" and this isn't a "close" hbuflen = 0;
* connection, this is a good time to get out and return continue;
* home.
*/
if(!conn->bits.close && data->bits.no_body)
return CURLE_OK;
break; /* exit header line loop */
} }
if (!headerline++) { if (!headerline++) {
/* This is the first header, it MUST be the error code line /* This is the first header, it MUST be the error code line
or else we consiser this to be the body right away! */ or else we consiser this to be the body right away! */
if (2 == sscanf (p, " HTTP/1.%d %3d", &httpversion, &code)) { if (2 == sscanf (p, " HTTP/1.%d %3d", &httpversion,
&httpcode)) {
/* 404 -> URL not found! */ /* 404 -> URL not found! */
if ( if (
( ((data->bits.http_follow_location) && (code >= 400)) ( ((data->bits.http_follow_location) &&
(httpcode >= 400))
|| ||
(!data->bits.http_follow_location && (code >= 300))) (!data->bits.http_follow_location &&
(httpcode >= 300)))
&& (data->bits.http_fail_on_error)) { && (data->bits.http_fail_on_error)) {
/* If we have been told to fail hard on HTTP-errors, /* If we have been told to fail hard on HTTP-errors,
here is the check for that: */ here is the check for that: */
@ -366,7 +391,7 @@ Transfer(struct connectdata *c_conn)
failf (data, "The requested file was not found"); failf (data, "The requested file was not found");
return CURLE_HTTP_NOT_FOUND; return CURLE_HTTP_NOT_FOUND;
} }
data->progress.httpcode = code; data->progress.httpcode = httpcode;
data->progress.httpversion = httpversion; data->progress.httpversion = httpversion;
if(httpversion == 0) if(httpversion == 0)
/* Default action for HTTP/1.0 must be to close, unless /* Default action for HTTP/1.0 must be to close, unless
@ -447,7 +472,7 @@ Transfer(struct connectdata *c_conn)
if(data->bits.get_filetime) if(data->bits.get_filetime)
data->progress.filetime = timeofdoc; data->progress.filetime = timeofdoc;
} }
else if ((code >= 300 && code < 400) && else if ((httpcode >= 300 && httpcode < 400) &&
(data->bits.http_follow_location) && (data->bits.http_follow_location) &&
strnequal("Location: ", p, 10)) { strnequal("Location: ", p, 10)) {
/* this is the URL that the server advices us to get instead */ /* this is the URL that the server advices us to get instead */