aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-04-18 17:14:58 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-04-18 17:14:58 +0000
commitc904b6b5bf6c6e980480e63cd066dc2ae2aace23 (patch)
tree7e39a3652e6cfb4e12c4b87cba3dd868b6a4b65a /lib
parent6a2744992285c39d0cb69295228722ed1e3037c5 (diff)
Toshiyuki Maezawa reported that when doing a POST with a read callback,
libcurl didn't properly send an Expect: 100-continue header. It does now.
Diffstat (limited to 'lib')
-rw-r--r--lib/http.c68
1 files changed, 34 insertions, 34 deletions
diff --git a/lib/http.c b/lib/http.c
index 392e70657..c3c805956 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -1347,6 +1347,27 @@ CURLcode Curl_http_done(struct connectdata *conn,
return CURLE_OK;
}
+/* check and possibly add an Expect: header */
+static CURLcode expect100(struct SessionHandle *data,
+ send_buffer *req_buffer)
+{
+ CURLcode result = CURLE_OK;
+ if((data->set.httpversion != CURL_HTTP_VERSION_1_0) &&
+ !checkheaders(data, "Expect:")) {
+ /* if not doing HTTP 1.0 or disabled explicitly, we add a Expect:
+ 100-continue to the headers which actually speeds up post
+ operations (as there is one packet coming back from the web
+ server) */
+ result = add_bufferf(req_buffer,
+ "Expect: 100-continue\r\n");
+ if(result == CURLE_OK)
+ data->set.expect100header = TRUE;
+ }
+ return result;
+}
+
+
+
/*
* Curl_http() gets called from the generic Curl_do() function when a HTTP
* request is to be performed. This creates and sends a properly constructed
@@ -1928,18 +1949,9 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
return result;
}
- if((data->set.httpversion != CURL_HTTP_VERSION_1_0) &&
- !checkheaders(data, "Expect:")) {
- /* if not doing HTTP 1.0 or disabled explicitly, we add a Expect:
- 100-continue to the headers which actually speeds up post
- operations (as there is one packet coming back from the web
- server) */
- result = add_bufferf(req_buffer,
- "Expect: 100-continue\r\n");
- if(result)
- return result;
- data->set.expect100header = TRUE;
- }
+ result = expect100(data, req_buffer);
+ if(result)
+ return result;
if(!checkheaders(data, "Content-Type:")) {
/* Get Content-Type: line from Curl_formpostheader.
@@ -2002,18 +2014,9 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
return result;
}
- if((data->set.httpversion != CURL_HTTP_VERSION_1_0) &&
- !checkheaders(data, "Expect:")) {
- /* if not HTTP 1.0 or disabled explicitly, we add a Expect:
- 100-continue to the headers which actually speeds up post
- operations (as there is one packet coming back from the web
- server) */
- result = add_bufferf(req_buffer,
- "Expect: 100-continue\r\n");
- if(result)
- return result;
- data->set.expect100header = TRUE;
- }
+ result = expect100(data, req_buffer);
+ if(result)
+ return result;
result = add_buffer(req_buffer, "\r\n", 2); /* end of headers */
if(result)
@@ -2121,21 +2124,18 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
/* set the upload size to the progress meter */
Curl_pgrsSetUploadSize(data, http->postsize);
- if((data->set.httpversion != CURL_HTTP_VERSION_1_0) &&
- !checkheaders(data, "Expect:")) {
- /* if not HTTP 1.0 or disabled explicitly, we add a Expect:
- 100-continue to the headers which actually speeds up post
- operations (as there is one packet coming back from the web
- server) */
- add_bufferf(req_buffer,
- "Expect: 100-continue\r\n");
- data->set.expect100header = TRUE;
- }
+ result = expect100(data, req_buffer);
+ if(result)
+ return result;
add_buffer(req_buffer, "\r\n", 2); /* end of headers! */
}
}
else {
+ result = expect100(data, req_buffer);
+ if(result)
+ return result;
+
add_buffer(req_buffer, "\r\n", 2); /* end of headers! */
if(data->set.postfieldsize) {