moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

HTTP: empty chunked POST ended up in two zero size chunks

Browse Source 
When doing a chunked-encoded POST with -d (CURLOPT_POSTFIELDS) and the
size of the POST was zero length, it made libcurl first send a zero
chunk and then the terminating one. This could confuse a receiver and it
should rather just send the terminating chunk as it does with this fix.

Test case 1333 is added to verify.

Bug: http://curl.haxx.se/mail/archive-2012-04/0060.html
Reported by: Arnaud Compan
This commit is contained in:
Daniel Stenberg 2012-04-20 20:40:55 +02:00
parent 0f54880277
commit 560cd62272
3 changed files with 64 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/http.c
View File

@ -1088,7 +1088,7 @@ CURLcode Curl_add_buffer_send(Curl_send_buffer *in,
if(conn->data->set.verbose) { if(conn->data->set.verbose) {
/* this data _may_ contain binary stuff */ /* this data _may_ contain binary stuff */
Curl_debug(conn->data, CURLINFO_HEADER_OUT, ptr, headlen, conn); Curl_debug(conn->data, CURLINFO_HEADER_OUT, ptr, headlen, conn);
if((size_t)amount > headlen) { if(bodylen) {
/* there was body data sent beyond the initial header part, pass that /* there was body data sent beyond the initial header part, pass that
on to the debug callback too */ on to the debug callback too */
Curl_debug(conn->data, CURLINFO_DATA_OUT, Curl_debug(conn->data, CURLINFO_DATA_OUT,
@ -2480,11 +2480,13 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
included_body = postsize; included_body = postsize;
} }
else { else {
/* Append the POST data chunky-style */ if(postsize) {
result = Curl_add_bufferf(req_buffer, "%x\r\n", (int)postsize); /* Append the POST data chunky-style */
if(CURLE_OK == result) result = Curl_add_bufferf(req_buffer, "%x\r\n", (int)postsize);
result = Curl_add_buffer(req_buffer, data->set.postfields, if(CURLE_OK == result)
(size_t)postsize); result = Curl_add_buffer(req_buffer, data->set.postfields,
(size_t)postsize);
}
if(CURLE_OK == result) if(CURLE_OK == result)
result = Curl_add_buffer(req_buffer, result = Curl_add_buffer(req_buffer,
"\x0d\x0a\x30\x0d\x0a\x0d\x0a", 7); "\x0d\x0a\x30\x0d\x0a\x0d\x0a", 7);

2
tests/data/Makefile.am
View File

@ -83,7 +83,7 @@ test1300 test1301 test1302 test1303 test1304 test1305 \
test1306 test1307 test1308 test1309 test1310 test1311 test1312 test1313 \ test1306 test1307 test1308 test1309 test1310 test1311 test1312 test1313 \
test1314 test1315 test1316 test1317 test1318 test1319 test1320 test1321 \ test1314 test1315 test1316 test1317 test1318 test1319 test1320 test1321 \
test1322 test1323 test1324 test1325 test1326 test1327 test1328 test1329 \ test1322 test1323 test1324 test1325 test1326 test1327 test1328 test1329 \
test1331 test1332 \ test1331 test1332 test1333 \
test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \ test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \
test2000 test2001 test2002 test2003 test2004 test2000 test2001 test2002 test2003 test2004

55
tests/data/test1333 Normal file
View File

@ -0,0 +1,55 @@
<testcase>
<info>
<keywords>
HTTP
HTTP GET
</keywords>
</info>
#
# Server-side
<reply>
<data>
HTTP/1.1 200 OK
Date: Thu, 09 Nov 2010 14:49:00 GMT
Accept-Ranges: bytes
Content-Length: 6
Connection: close
-foo-
</data>
</reply>
#
# Client-side
<client>
<server>
http
</server>
<name>
HTTP POST zero length, chunked-encoded
</name>
<command>
-d "" --header "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/1333
</command>
</client>
#
# Verify data after the test has been "shot"
<verify>
<strip>
^User-Agent:.*
</strip>
<protocol>
POST /1333 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
Transfer-Encoding: chunked
Content-Type: application/x-www-form-urlencoded
0
</protocol>
</verify>
</testcase>