mirror of
https://github.com/moparisthebest/curl
synced 2025-01-11 05:58:01 -05:00
Revert "mime: do not perform more than one read in a row"
This reverts commit ed0f357f7d.
This commit is contained in:
Daniel Stenberg
parent
e002f6c0cb
commit
d7242f4757
196
lib/mime.c
196
lib/mime.c
@ -26,7 +26,6 @@
|
||||
|
||||
#include "mime.h"
|
||||
#include "non-ascii.h"
|
||||
#include "warnless.h"
|
||||
#include "urldata.h"
|
||||
#include "sendf.h"
|
||||
|
||||
@ -53,10 +52,6 @@
|
||||
|
||||
|
||||
#define READ_ERROR ((size_t) -1)
|
||||
#define STOP_FILLING ((size_t) -2)
|
||||
|
||||
static size_t mime_subparts_read(char *buffer, size_t size, size_t nitems,
|
||||
void *instream, bool *hasread);
|
||||
|
||||
/* Encoders. */
|
||||
static size_t encoder_nop_read(char *buffer, size_t size, bool ateof,
|
||||
@ -359,15 +354,10 @@ static size_t encoder_nop_read(char *buffer, size_t size, bool ateof,
|
||||
|
||||
(void) ateof;
|
||||
|
||||
if(!size)
|
||||
return STOP_FILLING;
|
||||
|
||||
if(size > insize)
|
||||
size = insize;
|
||||
|
||||
if(size)
|
||||
memcpy(buffer, st->buf, size);
|
||||
|
||||
st->bufbeg += size;
|
||||
return size;
|
||||
}
|
||||
@ -387,9 +377,6 @@ static size_t encoder_7bit_read(char *buffer, size_t size, bool ateof,
|
||||
|
||||
(void) ateof;
|
||||
|
||||
if(!size)
|
||||
return STOP_FILLING;
|
||||
|
||||
if(size > cursize)
|
||||
size = cursize;
|
||||
|
||||
@ -417,11 +404,8 @@ static size_t encoder_base64_read(char *buffer, size_t size, bool ateof,
|
||||
/* Line full ? */
|
||||
if(st->pos > MAX_ENCODED_LINE_LENGTH - 4) {
|
||||
/* Yes, we need 2 characters for CRLF. */
|
||||
if(size < 2) {
|
||||
if(!cursize)
|
||||
return STOP_FILLING;
|
||||
if(size < 2)
|
||||
break;
|
||||
}
|
||||
*ptr++ = '\r';
|
||||
*ptr++ = '\n';
|
||||
st->pos = 0;
|
||||
@ -430,12 +414,7 @@ static size_t encoder_base64_read(char *buffer, size_t size, bool ateof,
|
||||
}
|
||||
|
||||
/* Be sure there is enough space and input data for a base64 group. */
|
||||
if(size < 4) {
|
||||
if(!cursize)
|
||||
return STOP_FILLING;
|
||||
break;
|
||||
}
|
||||
if(st->bufend - st->bufbeg < 3)
|
||||
if(size < 4 || st->bufend - st->bufbeg < 3)
|
||||
break;
|
||||
|
||||
/* Encode three bytes as four characters. */
|
||||
@ -452,31 +431,25 @@ static size_t encoder_base64_read(char *buffer, size_t size, bool ateof,
|
||||
}
|
||||
|
||||
/* If at eof, we have to flush the buffered data. */
|
||||
if(ateof) {
|
||||
if(size < 4) {
|
||||
if(!cursize)
|
||||
return STOP_FILLING;
|
||||
}
|
||||
else {
|
||||
/* Buffered data size can only be 0, 1 or 2. */
|
||||
ptr[2] = ptr[3] = '=';
|
||||
i = 0;
|
||||
switch(st->bufend - st->bufbeg) {
|
||||
case 2:
|
||||
i = (st->buf[st->bufbeg + 1] & 0xFF) << 8;
|
||||
/* FALLTHROUGH */
|
||||
case 1:
|
||||
i |= (st->buf[st->bufbeg] & 0xFF) << 16;
|
||||
ptr[0] = base64[(i >> 18) & 0x3F];
|
||||
ptr[1] = base64[(i >> 12) & 0x3F];
|
||||
if(++st->bufbeg != st->bufend) {
|
||||
ptr[2] = base64[(i >> 6) & 0x3F];
|
||||
st->bufbeg++;
|
||||
}
|
||||
cursize += 4;
|
||||
st->pos += 4;
|
||||
break;
|
||||
if(ateof && size >= 4) {
|
||||
/* Buffered data size can only be 0, 1 or 2. */
|
||||
ptr[2] = ptr[3] = '=';
|
||||
i = 0;
|
||||
switch(st->bufend - st->bufbeg) {
|
||||
case 2:
|
||||
i = (st->buf[st->bufbeg + 1] & 0xFF) << 8;
|
||||
/* FALLTHROUGH */
|
||||
case 1:
|
||||
i |= (st->buf[st->bufbeg] & 0xFF) << 16;
|
||||
ptr[0] = base64[(i >> 18) & 0x3F];
|
||||
ptr[1] = base64[(i >> 12) & 0x3F];
|
||||
if(++st->bufbeg != st->bufend) {
|
||||
ptr[2] = base64[(i >> 6) & 0x3F];
|
||||
st->bufbeg++;
|
||||
}
|
||||
cursize += 4;
|
||||
st->pos += 4;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -608,11 +581,8 @@ static size_t encoder_qp_read(char *buffer, size_t size, bool ateof,
|
||||
}
|
||||
|
||||
/* If the output buffer would overflow, do not store. */
|
||||
if(len > size) {
|
||||
if(!cursize)
|
||||
return STOP_FILLING;
|
||||
if(len > size)
|
||||
break;
|
||||
}
|
||||
|
||||
/* Append to output buffer. */
|
||||
memcpy(ptr, buf, len);
|
||||
@ -642,18 +612,16 @@ static size_t mime_mem_read(char *buffer, size_t size, size_t nitems,
|
||||
void *instream)
|
||||
{
|
||||
curl_mimepart *part = (curl_mimepart *) instream;
|
||||
size_t sz = curlx_sotouz(part->datasize - part->state.offset);
|
||||
size_t sz = (size_t) part->datasize - part->state.offset;
|
||||
(void) size; /* Always 1.*/
|
||||
|
||||
if(!nitems)
|
||||
return STOP_FILLING;
|
||||
|
||||
if(sz > nitems)
|
||||
sz = nitems;
|
||||
|
||||
if(sz)
|
||||
memcpy(buffer, part->data + curlx_sotouz(part->state.offset), sz);
|
||||
memcpy(buffer, (char *) &part->data[part->state.offset], sz);
|
||||
|
||||
part->state.offset += sz;
|
||||
return sz;
|
||||
}
|
||||
|
||||
@ -673,7 +641,7 @@ static int mime_mem_seek(void *instream, curl_off_t offset, int whence)
|
||||
if(offset < 0 || offset > part->datasize)
|
||||
return CURL_SEEKFUNC_FAIL;
|
||||
|
||||
part->state.offset = offset;
|
||||
part->state.offset = (size_t) offset;
|
||||
return CURL_SEEKFUNC_OK;
|
||||
}
|
||||
|
||||
@ -700,9 +668,6 @@ static size_t mime_file_read(char *buffer, size_t size, size_t nitems,
|
||||
{
|
||||
curl_mimepart *part = (curl_mimepart *) instream;
|
||||
|
||||
if(!nitems)
|
||||
return STOP_FILLING;
|
||||
|
||||
if(mime_open_file(part))
|
||||
return READ_ERROR;
|
||||
|
||||
@ -746,16 +711,15 @@ static size_t readback_bytes(mime_state *state,
|
||||
const char *trail)
|
||||
{
|
||||
size_t sz;
|
||||
size_t offset = curlx_sotouz(state->offset);
|
||||
|
||||
if(numbytes > offset) {
|
||||
sz = numbytes - offset;
|
||||
bytes += offset;
|
||||
if(numbytes > state->offset) {
|
||||
sz = numbytes - state->offset;
|
||||
bytes += state->offset;
|
||||
}
|
||||
else {
|
||||
size_t tsz = strlen(trail);
|
||||
|
||||
sz = offset - numbytes;
|
||||
sz = state->offset - numbytes;
|
||||
if(sz >= tsz)
|
||||
return 0;
|
||||
bytes = trail + sz;
|
||||
@ -772,7 +736,7 @@ static size_t readback_bytes(mime_state *state,
|
||||
|
||||
/* Read a non-encoded part content. */
|
||||
static size_t read_part_content(curl_mimepart *part,
|
||||
char *buffer, size_t bufsize, bool *hasread)
|
||||
char *buffer, size_t bufsize)
|
||||
{
|
||||
size_t sz = 0;
|
||||
|
||||
@ -781,70 +745,26 @@ static size_t read_part_content(curl_mimepart *part,
|
||||
case CURL_READFUNC_ABORT:
|
||||
case CURL_READFUNC_PAUSE:
|
||||
case READ_ERROR:
|
||||
return part->lastreadstatus;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
/* If we can determine we are at end of part data, spare a read. */
|
||||
if(part->datasize != (curl_off_t) -1 &&
|
||||
part->state.offset >= part->datasize) {
|
||||
/* sz is already zero. */
|
||||
}
|
||||
else {
|
||||
switch(part->kind) {
|
||||
case MIMEKIND_MULTIPART:
|
||||
/*
|
||||
* Cannot be processed as other kinds since read function requires
|
||||
* an additional parameter and is highly recursive.
|
||||
*/
|
||||
sz = mime_subparts_read(buffer, 1, bufsize, part->arg, hasread);
|
||||
break;
|
||||
case MIMEKIND_FILE:
|
||||
if(part->fp && feof(part->fp))
|
||||
break; /* At EOF. */
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
if(part->readfunc) {
|
||||
if(!(part->flags & MIME_FAST_READ)) {
|
||||
if(*hasread)
|
||||
return STOP_FILLING;
|
||||
*hasread = TRUE;
|
||||
}
|
||||
sz = part->readfunc(buffer, 1, bufsize, part->arg);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
switch(sz) {
|
||||
case STOP_FILLING:
|
||||
break;
|
||||
case 0:
|
||||
case CURL_READFUNC_ABORT:
|
||||
case CURL_READFUNC_PAUSE:
|
||||
case READ_ERROR:
|
||||
part->lastreadstatus = sz;
|
||||
break;
|
||||
default:
|
||||
part->state.offset += sz;
|
||||
if(part->readfunc)
|
||||
sz = part->readfunc(buffer, 1, bufsize, part->arg);
|
||||
part->lastreadstatus = sz;
|
||||
break;
|
||||
}
|
||||
|
||||
return sz;
|
||||
return part->lastreadstatus;
|
||||
}
|
||||
|
||||
/* Read and encode part content. */
|
||||
static size_t read_encoded_part_content(curl_mimepart *part, char *buffer,
|
||||
size_t bufsize, bool *hasread)
|
||||
static size_t read_encoded_part_content(curl_mimepart *part,
|
||||
char *buffer, size_t bufsize)
|
||||
{
|
||||
mime_encoder_state *st = &part->encstate;
|
||||
size_t cursize = 0;
|
||||
size_t sz;
|
||||
bool ateof = FALSE;
|
||||
|
||||
for(;;) {
|
||||
while(bufsize) {
|
||||
if(st->bufbeg < st->bufend || ateof) {
|
||||
/* Encode buffered data. */
|
||||
sz = part->encoder->encodefunc(buffer, bufsize, ateof, part);
|
||||
@ -853,8 +773,9 @@ static size_t read_encoded_part_content(curl_mimepart *part, char *buffer,
|
||||
if(ateof)
|
||||
return cursize;
|
||||
break;
|
||||
case CURL_READFUNC_ABORT:
|
||||
case CURL_READFUNC_PAUSE:
|
||||
case READ_ERROR:
|
||||
case STOP_FILLING:
|
||||
return cursize? cursize: sz;
|
||||
default:
|
||||
cursize += sz;
|
||||
@ -876,7 +797,7 @@ static size_t read_encoded_part_content(curl_mimepart *part, char *buffer,
|
||||
if(st->bufend >= sizeof(st->buf))
|
||||
return cursize? cursize: READ_ERROR; /* Buffer full. */
|
||||
sz = read_part_content(part, st->buf + st->bufend,
|
||||
sizeof(st->buf) - st->bufend, hasread);
|
||||
sizeof(st->buf) - st->bufend);
|
||||
switch(sz) {
|
||||
case 0:
|
||||
ateof = TRUE;
|
||||
@ -884,7 +805,6 @@ static size_t read_encoded_part_content(curl_mimepart *part, char *buffer,
|
||||
case CURL_READFUNC_ABORT:
|
||||
case CURL_READFUNC_PAUSE:
|
||||
case READ_ERROR:
|
||||
case STOP_FILLING:
|
||||
return cursize? cursize: sz;
|
||||
default:
|
||||
st->bufend += sz;
|
||||
@ -892,12 +812,12 @@ static size_t read_encoded_part_content(curl_mimepart *part, char *buffer,
|
||||
}
|
||||
}
|
||||
|
||||
/* NOTREACHED */
|
||||
return cursize;
|
||||
}
|
||||
|
||||
/* Readback a mime part. */
|
||||
static size_t readback_part(curl_mimepart *part,
|
||||
char *buffer, size_t bufsize, bool *hasread)
|
||||
char *buffer, size_t bufsize)
|
||||
{
|
||||
size_t cursize = 0;
|
||||
#ifdef CURL_DOES_CONVERSIONS
|
||||
@ -956,9 +876,9 @@ static size_t readback_part(curl_mimepart *part,
|
||||
break;
|
||||
case MIMESTATE_CONTENT:
|
||||
if(part->encoder)
|
||||
sz = read_encoded_part_content(part, buffer, bufsize, hasread);
|
||||
sz = read_encoded_part_content(part, buffer, bufsize);
|
||||
else
|
||||
sz = read_part_content(part, buffer, bufsize, hasread);
|
||||
sz = read_part_content(part, buffer, bufsize);
|
||||
switch(sz) {
|
||||
case 0:
|
||||
mimesetstate(&part->state, MIMESTATE_END, NULL);
|
||||
@ -971,7 +891,6 @@ static size_t readback_part(curl_mimepart *part,
|
||||
case CURL_READFUNC_ABORT:
|
||||
case CURL_READFUNC_PAUSE:
|
||||
case READ_ERROR:
|
||||
case STOP_FILLING:
|
||||
return cursize? cursize: sz;
|
||||
}
|
||||
break;
|
||||
@ -1000,9 +919,9 @@ static size_t readback_part(curl_mimepart *part,
|
||||
return cursize;
|
||||
}
|
||||
|
||||
/* Readback from mime. Warning: not a read callback function. */
|
||||
/* Readback from mime. */
|
||||
static size_t mime_subparts_read(char *buffer, size_t size, size_t nitems,
|
||||
void *instream, bool *hasread)
|
||||
void *instream)
|
||||
{
|
||||
curl_mime *mime = (curl_mime *) instream;
|
||||
size_t cursize = 0;
|
||||
@ -1023,7 +942,7 @@ static size_t mime_subparts_read(char *buffer, size_t size, size_t nitems,
|
||||
#endif
|
||||
mimesetstate(&mime->state, MIMESTATE_BOUNDARY1, mime->firstpart);
|
||||
/* The first boundary always follows the header termination empty line,
|
||||
so is always preceded by a CRLF. We can then spare 2 characters
|
||||
so is always preceded by a CRLK. We can then spare 2 characters
|
||||
by skipping the leading CRLF in boundary. */
|
||||
mime->state.offset += 2;
|
||||
break;
|
||||
@ -1053,12 +972,11 @@ static size_t mime_subparts_read(char *buffer, size_t size, size_t nitems,
|
||||
mimesetstate(&mime->state, MIMESTATE_END, NULL);
|
||||
break;
|
||||
}
|
||||
sz = readback_part(part, buffer, nitems, hasread);
|
||||
sz = readback_part(part, buffer, nitems);
|
||||
switch(sz) {
|
||||
case CURL_READFUNC_ABORT:
|
||||
case CURL_READFUNC_PAUSE:
|
||||
case READ_ERROR:
|
||||
case STOP_FILLING:
|
||||
return cursize? cursize: sz;
|
||||
case 0:
|
||||
#ifdef CURL_DOES_CONVERSIONS
|
||||
@ -1166,7 +1084,6 @@ static void cleanup_part_content(curl_mimepart *part)
|
||||
part->datasize = (curl_off_t) 0; /* No size yet. */
|
||||
cleanup_encoder_state(&part->encstate);
|
||||
part->kind = MIMEKIND_NONE;
|
||||
part->flags &= ~MIME_FAST_READ;
|
||||
part->lastreadstatus = 1; /* Successful read status. */
|
||||
}
|
||||
|
||||
@ -1424,7 +1341,6 @@ CURLcode curl_mime_data(curl_mimepart *part,
|
||||
part->readfunc = mime_mem_read;
|
||||
part->seekfunc = mime_mem_seek;
|
||||
part->freefunc = mime_mem_free;
|
||||
part->flags |= MIME_FAST_READ;
|
||||
part->kind = MIMEKIND_DATA;
|
||||
}
|
||||
|
||||
@ -1599,7 +1515,7 @@ CURLcode Curl_mime_set_subparts(curl_mimepart *part,
|
||||
}
|
||||
|
||||
subparts->parent = part;
|
||||
/* Subparts are processed internally: no read callback. */
|
||||
part->readfunc = mime_subparts_read;
|
||||
part->seekfunc = mime_subparts_seek;
|
||||
part->freefunc = take_ownership? mime_subparts_free: mime_subparts_unbind;
|
||||
part->arg = subparts;
|
||||
@ -1621,23 +1537,9 @@ CURLcode curl_mime_subparts(curl_mimepart *part, curl_mime *subparts)
|
||||
size_t Curl_mime_read(char *buffer, size_t size, size_t nitems, void *instream)
|
||||
{
|
||||
curl_mimepart *part = (curl_mimepart *) instream;
|
||||
size_t ret;
|
||||
bool hasread;
|
||||
|
||||
(void) size; /* Always 1. */
|
||||
|
||||
do {
|
||||
hasread = FALSE;
|
||||
ret = readback_part(part, buffer, nitems, &hasread);
|
||||
/*
|
||||
* If this is not possible to get some data without calling more than
|
||||
* one read callback (probably because a content encoder is not able to
|
||||
* deliver a new bunch for the few data accumulated so far), force another
|
||||
* read until we get enough data or a special exit code.
|
||||
*/
|
||||
} while(ret == STOP_FILLING);
|
||||
|
||||
return ret;
|
||||
return readback_part(part, buffer, nitems);
|
||||
}
|
||||
|
||||
/* Rewind mime stream. */
|
||||
|
||||
@ -31,7 +31,6 @@
|
||||
/* Part flags. */
|
||||
#define MIME_USERHEADERS_OWNER (1 << 0)
|
||||
#define MIME_BODY_ONLY (1 << 1)
|
||||
#define MIME_FAST_READ (1 << 2)
|
||||
|
||||
#define FILE_CONTENTTYPE_DEFAULT "application/octet-stream"
|
||||
#define MULTIPART_CONTENTTYPE_DEFAULT "multipart/mixed"
|
||||
@ -88,7 +87,7 @@ typedef struct {
|
||||
typedef struct {
|
||||
enum mimestate state; /* Current state token. */
|
||||
void *ptr; /* State-dependent pointer. */
|
||||
curl_off_t offset; /* State-dependent offset. */
|
||||
size_t offset; /* State-dependent offset. */
|
||||
} mime_state;
|
||||
|
||||
/* minimum buffer size for the boundary string */
|
||||
|
||||
@ -85,7 +85,7 @@ test626 test627 test628 test629 test630 test631 test632 test633 test634 \
|
||||
test635 test636 test637 test638 test639 test640 test641 test642 \
|
||||
test643 test644 test645 test646 test647 test648 test649 test650 test651 \
|
||||
test652 test653 test654 test655 test656 test658 test659 test660 test661 \
|
||||
test662 test663 test664 test665 \
|
||||
test662 test663 \
|
||||
test670 test671 test672 test673 \
|
||||
\
|
||||
test700 test701 test702 test703 test704 test705 test706 test707 test708 \
|
||||
|
||||
@ -69,18 +69,18 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
|
||||
POST /643 HTTP/1.1
|
||||
Host: %HOSTIP:%HTTPPORT
|
||||
Accept: */*
|
||||
Content-Length: 640
|
||||
Content-Length: 718
|
||||
Content-Type: multipart/form-data; boundary=----------------------------
|
||||
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="sendfile"; filename="postit2.c"
|
||||
|
||||
dummy
|
||||
this is what we post to the silly web server
|
||||
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="callbackdata"
|
||||
|
||||
dummy
|
||||
this is what we post to the silly web server
|
||||
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="filename"
|
||||
@ -99,18 +99,18 @@ blah blah
|
||||
POST /643 HTTP/1.1
|
||||
Host: %HOSTIP:%HTTPPORT
|
||||
Accept: */*
|
||||
Content-Length: 654
|
||||
Content-Length: 732
|
||||
Content-Type: multipart/form-data; boundary=----------------------------
|
||||
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="sendfile alternative"; filename="file name 2"
|
||||
|
||||
dummy
|
||||
this is what we post to the silly web server
|
||||
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="callbackdata"
|
||||
|
||||
dummy
|
||||
this is what we post to the silly web server
|
||||
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="filename"
|
||||
|
||||
@ -44,7 +44,7 @@ s/boundary=------------------------[a-z0-9]*/boundary=--------------------------
|
||||
POST /644 HTTP/1.1
|
||||
Host: %HOSTIP:%HTTPPORT
|
||||
Accept: */*
|
||||
Content-Length: 640
|
||||
Content-Length: 718
|
||||
Content-Type: multipart/form-data; boundary=----------------------------
|
||||
|
||||
------------------------------
|
||||
|
||||
@ -73,42 +73,16 @@ Transfer-Encoding: chunked
|
||||
Content-Type: multipart/form-data; boundary=----------------------------
|
||||
Expect: 100-continue
|
||||
|
||||
76
|
||||
2ce
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="sendfile"; filename="postit2.c"
|
||||
|
||||
d
|
||||
1
|
||||
u
|
||||
1
|
||||
m
|
||||
1
|
||||
m
|
||||
1
|
||||
y
|
||||
1
|
||||
|
||||
|
||||
65
|
||||
this is what we post to the silly web server
|
||||
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="callbackdata"
|
||||
|
||||
|
||||
1
|
||||
d
|
||||
1
|
||||
u
|
||||
1
|
||||
m
|
||||
1
|
||||
m
|
||||
1
|
||||
y
|
||||
1
|
||||
|
||||
|
||||
19a
|
||||
this is what we post to the silly web server
|
||||
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="filename"
|
||||
@ -134,42 +108,16 @@ Transfer-Encoding: chunked
|
||||
Content-Type: multipart/form-data; boundary=----------------------------
|
||||
Expect: 100-continue
|
||||
|
||||
84
|
||||
2dc
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="sendfile alternative"; filename="file name 2"
|
||||
|
||||
d
|
||||
1
|
||||
u
|
||||
1
|
||||
m
|
||||
1
|
||||
m
|
||||
1
|
||||
y
|
||||
1
|
||||
|
||||
|
||||
65
|
||||
this is what we post to the silly web server
|
||||
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="callbackdata"
|
||||
|
||||
|
||||
1
|
||||
d
|
||||
1
|
||||
u
|
||||
1
|
||||
m
|
||||
1
|
||||
m
|
||||
1
|
||||
y
|
||||
1
|
||||
|
||||
|
||||
19a
|
||||
this is what we post to the silly web server
|
||||
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="filename"
|
||||
|
||||
@ -63,7 +63,7 @@ Transfer-Encoding: chunked
|
||||
Content-Type: multipart/form-data; boundary=----------------------------
|
||||
Expect: 100-continue
|
||||
|
||||
361
|
||||
60a
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="fieldname"
|
||||
Content-Type: text/plain
|
||||
@ -89,16 +89,12 @@ This is data from a file.
|
||||
Content-Disposition: attachment; filename="test650.filedata"
|
||||
Content-Type: text/whatever
|
||||
|
||||
|
||||
a5
|
||||
This is data from a file.
|
||||
|
||||
------------------------------
|
||||
Content-Disposition: attachment; filename="test650.filedata"
|
||||
Content-Type: text/whatever
|
||||
|
||||
|
||||
af
|
||||
This is data from a file.
|
||||
|
||||
--------------------------------
|
||||
@ -106,8 +102,6 @@ This is data from a file.
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="filecontents"
|
||||
|
||||
|
||||
10f
|
||||
This is data from a file.
|
||||
|
||||
------------------------------
|
||||
@ -118,12 +112,8 @@ Content-Disposition: form-data; name="formlength"
|
||||
Content-Disposition: form-data; name="standardinput"
|
||||
Content-Type: application/octet-stream
|
||||
|
||||
|
||||
16
|
||||
Some data from stdin
|
||||
|
||||
30
|
||||
|
||||
--------------------------------
|
||||
|
||||
0
|
||||
|
||||
@ -81,7 +81,7 @@ Transfer-Encoding: chunked
|
||||
Content-Type: multipart/form-data; boundary=----------------------------
|
||||
Expect: 100-continue
|
||||
|
||||
1af
|
||||
20c
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="greeting"
|
||||
Content-Type: application/X-Greeting
|
||||
@ -98,21 +98,7 @@ This is data from a file
|
||||
------------------------------
|
||||
Content-Disposition: form-data
|
||||
|
||||
|
||||
1
|
||||
d
|
||||
1
|
||||
u
|
||||
1
|
||||
m
|
||||
1
|
||||
m
|
||||
1
|
||||
y
|
||||
1
|
||||
|
||||
|
||||
30
|
||||
this is what we post to the silly web server
|
||||
|
||||
--------------------------------
|
||||
|
||||
|
||||
@ -1,85 +0,0 @@
|
||||
<testcase>
|
||||
<info>
|
||||
<keywords>
|
||||
HTTP
|
||||
HTTP POST
|
||||
HTTP MIME POST
|
||||
</keywords>
|
||||
</info>
|
||||
|
||||
#
|
||||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
HTTP/1.1 200 OK
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake swsclose
|
||||
Connection: close
|
||||
Content-Type: text/html
|
||||
|
||||
hello
|
||||
</data>
|
||||
<datacheck>
|
||||
HTTP/1.1 200 OK
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake swsclose
|
||||
Connection: close
|
||||
Content-Type: text/html
|
||||
|
||||
hello
|
||||
</datacheck>
|
||||
</reply>
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
<server>
|
||||
http
|
||||
</server>
|
||||
# tool is what to use instead of 'curl'
|
||||
<tool>
|
||||
lib664
|
||||
</tool>
|
||||
|
||||
<name>
|
||||
HTTP chunked mimepost using single-byte read callback with encoder
|
||||
</name>
|
||||
<command>
|
||||
http://%HOSTIP:%HTTPPORT/664
|
||||
</command>
|
||||
</client>
|
||||
|
||||
#
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<strippart>
|
||||
s/^--------------------------[a-z0-9]*/------------------------------/
|
||||
s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
|
||||
</strippart>
|
||||
# Note that the stripping above removes 12 bytes from every occurrence of the
|
||||
# boundary string and since 5 of them are in the body contents, we see
|
||||
# (5*12) == 60 bytes less
|
||||
<protocol>
|
||||
POST /664 HTTP/1.1
|
||||
Host: %HOSTIP:%HTTPPORT
|
||||
Accept: */*
|
||||
Transfer-Encoding: chunked
|
||||
Content-Type: multipart/form-data; boundary=----------------------------
|
||||
Expect: 100-continue
|
||||
|
||||
7f
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="field"
|
||||
Content-Transfer-Encoding: base64
|
||||
|
||||
|
||||
4
|
||||
ZHVt
|
||||
34
|
||||
bXk=
|
||||
--------------------------------
|
||||
|
||||
0
|
||||
|
||||
</protocol>
|
||||
</verify>
|
||||
</testcase>
|
||||
@ -1,99 +0,0 @@
|
||||
<testcase>
|
||||
<info>
|
||||
<keywords>
|
||||
HTTP
|
||||
HTTP POST
|
||||
HTTP MIME POST
|
||||
</keywords>
|
||||
</info>
|
||||
|
||||
#
|
||||
# Server-side
|
||||
<reply>
|
||||
<data>
|
||||
HTTP/1.1 200 OK
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake swsclose
|
||||
Connection: close
|
||||
Content-Type: text/html
|
||||
|
||||
hello
|
||||
</data>
|
||||
<datacheck>
|
||||
HTTP/1.1 200 OK
|
||||
Date: Thu, 09 Nov 2010 14:49:00 GMT
|
||||
Server: test-server/fake swsclose
|
||||
Connection: close
|
||||
Content-Type: text/html
|
||||
|
||||
hello
|
||||
</datacheck>
|
||||
</reply>
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
<server>
|
||||
http
|
||||
</server>
|
||||
# tool is what to use instead of 'curl'
|
||||
<tool>
|
||||
lib665
|
||||
</tool>
|
||||
|
||||
<name>
|
||||
HTTP mimepost early end of data detection
|
||||
</name>
|
||||
<command>
|
||||
http://%HOSTIP:%HTTPPORT/665
|
||||
</command>
|
||||
<file name="log/file665.txt">
|
||||
This is data from a file
|
||||
</file>
|
||||
</client>
|
||||
|
||||
#
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<strippart>
|
||||
s/^--------------------------[a-z0-9]*/------------------------------/
|
||||
s/boundary=------------------------[a-z0-9]*/boundary=----------------------------/
|
||||
</strippart>
|
||||
# Note that the stripping above removes 12 bytes from every occurrence of the
|
||||
# boundary string and since 5 of them are in the body contents, we see
|
||||
# (5*12) == 60 bytes less
|
||||
<protocol>
|
||||
POST /665 HTTP/1.1
|
||||
Host: %HOSTIP:%HTTPPORT
|
||||
Accept: */*
|
||||
Transfer-Encoding: chunked
|
||||
Content-Type: multipart/form-data; boundary=----------------------------
|
||||
Expect: 100-continue
|
||||
|
||||
c1
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="field1"
|
||||
|
||||
dummy
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="field2"
|
||||
|
||||
|
||||
5
|
||||
dummy
|
||||
91
|
||||
|
||||
------------------------------
|
||||
Content-Disposition: form-data; name="field3"; filename="file665.txt"
|
||||
Content-Type: text/plain
|
||||
|
||||
|
||||
49
|
||||
This is data from a file
|
||||
|
||||
--------------------------------
|
||||
|
||||
0
|
||||
|
||||
</protocol>
|
||||
</verify>
|
||||
</testcase>
|
||||
@ -22,7 +22,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \
|
||||
lib571 lib572 lib573 lib574 lib575 lib576 lib578 lib579 lib582 \
|
||||
lib583 lib585 lib586 lib587 lib589 lib590 lib591 lib597 lib598 lib599 \
|
||||
lib643 lib644 lib645 lib650 lib651 lib652 lib653 lib654 lib655 lib658 \
|
||||
lib659 lib661 lib664 lib665 \
|
||||
lib659 lib661 \
|
||||
lib670 lib671 lib672 lib673 \
|
||||
lib1156 \
|
||||
lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1507 lib1508 \
|
||||
@ -349,14 +349,6 @@ lib659_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
lib661_SOURCES = lib661.c $(SUPPORTFILES)
|
||||
lib661_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
|
||||
lib664_SOURCES = lib664.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
|
||||
lib664_LDADD = $(TESTUTIL_LIBS)
|
||||
lib664_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
|
||||
lib665_SOURCES = lib665.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
|
||||
lib665_LDADD = $(TESTUTIL_LIBS)
|
||||
lib665_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
|
||||
lib670_SOURCES = lib670.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
|
||||
lib670_LDADD = $(TESTUTIL_LIBS)
|
||||
lib670_CPPFLAGS = $(AM_CPPFLAGS) -DLIB670
|
||||
|
||||
@ -26,9 +26,11 @@
|
||||
static char data[]=
|
||||
#ifdef CURL_DOES_CONVERSIONS
|
||||
/* ASCII representation with escape sequences for non-ASCII platforms */
|
||||
"\x64\x75\x6d\x6d\x79\x0a";
|
||||
"\x74\x68\x69\x73\x20\x69\x73\x20\x77\x68\x61\x74\x20\x77\x65\x20\x70"
|
||||
"\x6f\x73\x74\x20\x74\x6f\x20\x74\x68\x65\x20\x73\x69\x6c\x6c\x79\x20"
|
||||
"\x77\x65\x62\x20\x73\x65\x72\x76\x65\x72\x0a";
|
||||
#else
|
||||
"dummy\n";
|
||||
"this is what we post to the silly web server\n";
|
||||
#endif
|
||||
|
||||
struct WriteThis {
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
* Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
*
|
||||
* This software is licensed as described in the file COPYING, which
|
||||
* you should have received as part of this distribution. The terms
|
||||
@ -26,9 +26,11 @@
|
||||
static char data[]=
|
||||
#ifdef CURL_DOES_CONVERSIONS
|
||||
/* ASCII representation with escape sequences for non-ASCII platforms */
|
||||
"\x64\x75\x6d\x6d\x79\x0a";
|
||||
"\x74\x68\x69\x73\x20\x69\x73\x20\x77\x68\x61\x74\x20\x77\x65\x20\x70"
|
||||
"\x6f\x73\x74\x20\x74\x6f\x20\x74\x68\x65\x20\x73\x69\x6c\x6c\x79\x20"
|
||||
"\x77\x65\x62\x20\x73\x65\x72\x76\x65\x72\x0a";
|
||||
#else
|
||||
"dummy\n";
|
||||
"this is what we post to the silly web server\n";
|
||||
#endif
|
||||
|
||||
struct WriteThis {
|
||||
|
||||
@ -1,117 +0,0 @@
|
||||
/***************************************************************************
|
||||
* _ _ ____ _
|
||||
* Project ___| | | | _ \| |
|
||||
* / __| | | | |_) | |
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
*
|
||||
* This software is licensed as described in the file COPYING, which
|
||||
* you should have received as part of this distribution. The terms
|
||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
||||
*
|
||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
||||
* copies of the Software, and permit persons to whom the Software is
|
||||
* furnished to do so, under the terms of the COPYING file.
|
||||
*
|
||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
||||
* KIND, either express or implied.
|
||||
*
|
||||
***************************************************************************/
|
||||
#include "test.h"
|
||||
|
||||
#include "memdebug.h"
|
||||
|
||||
static char data[]=
|
||||
#ifdef CURL_DOES_CONVERSIONS
|
||||
/* ASCII representation with escape sequences for non-ASCII platforms */
|
||||
"\x64\x75\x6d\x6d\x79";
|
||||
#else
|
||||
"dummy";
|
||||
#endif
|
||||
|
||||
struct WriteThis {
|
||||
char *readptr;
|
||||
curl_off_t sizeleft;
|
||||
};
|
||||
|
||||
static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp)
|
||||
{
|
||||
struct WriteThis *pooh = (struct WriteThis *)userp;
|
||||
int eof = !*pooh->readptr;
|
||||
|
||||
if(size*nmemb < 1)
|
||||
return 0;
|
||||
|
||||
eof = pooh->sizeleft <= 0;
|
||||
if(!eof)
|
||||
pooh->sizeleft--;
|
||||
|
||||
if(!eof) {
|
||||
*ptr = *pooh->readptr; /* copy one single byte */
|
||||
pooh->readptr++; /* advance pointer */
|
||||
return 1; /* we return 1 byte at a time! */
|
||||
}
|
||||
|
||||
return 0; /* no more data left to deliver */
|
||||
}
|
||||
|
||||
int test(char *URL)
|
||||
{
|
||||
CURL *easy = NULL;
|
||||
curl_mime *mime = NULL;
|
||||
curl_mimepart *part;
|
||||
CURLcode result;
|
||||
int res = TEST_ERR_FAILURE;
|
||||
struct WriteThis pooh;
|
||||
|
||||
/*
|
||||
* Check proper handling of mime encoder feature when the part read callback
|
||||
* delivers data bytes one at a time. Use chunked encoding for accurate test.
|
||||
*/
|
||||
|
||||
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
||||
fprintf(stderr, "curl_global_init() failed\n");
|
||||
return TEST_ERR_MAJOR_BAD;
|
||||
}
|
||||
|
||||
easy = curl_easy_init();
|
||||
|
||||
/* First set the URL that is about to receive our POST. */
|
||||
test_setopt(easy, CURLOPT_URL, URL);
|
||||
|
||||
/* get verbose debug output please */
|
||||
test_setopt(easy, CURLOPT_VERBOSE, 1L);
|
||||
|
||||
/* include headers in the output */
|
||||
test_setopt(easy, CURLOPT_HEADER, 1L);
|
||||
|
||||
/* Prepare the callback structure. */
|
||||
pooh.readptr = data;
|
||||
pooh.sizeleft = (curl_off_t) strlen(data);
|
||||
|
||||
/* Build the mime tree. */
|
||||
mime = curl_mime_init(easy);
|
||||
part = curl_mime_addpart(mime);
|
||||
curl_mime_name(part, "field");
|
||||
curl_mime_encoder(part, "base64");
|
||||
/* Using an undefined length forces chunked transfer. */
|
||||
curl_mime_data_cb(part, (curl_off_t) -1, read_callback, NULL, NULL, &pooh);
|
||||
|
||||
/* Bind mime data to its easy handle. */
|
||||
test_setopt(easy, CURLOPT_MIMEPOST, mime);
|
||||
|
||||
/* Send data. */
|
||||
result = curl_easy_perform(easy);
|
||||
if(result) {
|
||||
fprintf(stderr, "curl_easy_perform() failed\n");
|
||||
res = (int) result;
|
||||
}
|
||||
|
||||
test_cleanup:
|
||||
curl_easy_cleanup(easy);
|
||||
curl_mime_free(mime);
|
||||
curl_global_cleanup();
|
||||
return res;
|
||||
}
|
||||
@ -1,122 +0,0 @@
|
||||
/***************************************************************************
|
||||
* _ _ ____ _
|
||||
* Project ___| | | | _ \| |
|
||||
* / __| | | | |_) | |
|
||||
* | (__| |_| | _ <| |___
|
||||
* \___|\___/|_| \_\_____|
|
||||
*
|
||||
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
|
||||
*
|
||||
* This software is licensed as described in the file COPYING, which
|
||||
* you should have received as part of this distribution. The terms
|
||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
||||
*
|
||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
||||
* copies of the Software, and permit persons to whom the Software is
|
||||
* furnished to do so, under the terms of the COPYING file.
|
||||
*
|
||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
||||
* KIND, either express or implied.
|
||||
*
|
||||
***************************************************************************/
|
||||
#include "test.h"
|
||||
|
||||
#include "memdebug.h"
|
||||
|
||||
static char data[]=
|
||||
#ifdef CURL_DOES_CONVERSIONS
|
||||
/* ASCII representation with escape sequences for non-ASCII platforms */
|
||||
"\x64\x75\x6d\x6d\x79";
|
||||
#else
|
||||
"dummy";
|
||||
#endif
|
||||
|
||||
struct WriteThis {
|
||||
char *readptr;
|
||||
curl_off_t sizeleft;
|
||||
};
|
||||
|
||||
static size_t read_callback(char *ptr, size_t size, size_t nmemb, void *userp)
|
||||
{
|
||||
struct WriteThis *pooh = (struct WriteThis *)userp;
|
||||
size_t len = strlen(pooh->readptr);
|
||||
|
||||
(void) size; /* Always 1.*/
|
||||
|
||||
if(len > nmemb)
|
||||
len = nmemb;
|
||||
if(len) {
|
||||
memcpy(ptr, pooh->readptr, len);
|
||||
pooh->readptr += len;
|
||||
}
|
||||
return len;
|
||||
}
|
||||
|
||||
int test(char *URL)
|
||||
{
|
||||
CURL *easy = NULL;
|
||||
curl_mime *mime = NULL;
|
||||
curl_mimepart *part;
|
||||
CURLcode result;
|
||||
int res = TEST_ERR_FAILURE;
|
||||
struct WriteThis pooh1, pooh2;
|
||||
|
||||
/*
|
||||
* Check early end of part data detection.
|
||||
*/
|
||||
|
||||
if(curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
|
||||
fprintf(stderr, "curl_global_init() failed\n");
|
||||
return TEST_ERR_MAJOR_BAD;
|
||||
}
|
||||
|
||||
easy = curl_easy_init();
|
||||
|
||||
/* First set the URL that is about to receive our POST. */
|
||||
test_setopt(easy, CURLOPT_URL, URL);
|
||||
|
||||
/* get verbose debug output please */
|
||||
test_setopt(easy, CURLOPT_VERBOSE, 1L);
|
||||
|
||||
/* include headers in the output */
|
||||
test_setopt(easy, CURLOPT_HEADER, 1L);
|
||||
|
||||
/* Prepare the callback structures. */
|
||||
pooh1.readptr = data;
|
||||
pooh1.sizeleft = (curl_off_t) strlen(data);
|
||||
pooh2 = pooh1;
|
||||
|
||||
/* Build the mime tree. */
|
||||
mime = curl_mime_init(easy);
|
||||
part = curl_mime_addpart(mime);
|
||||
curl_mime_name(part, "field1");
|
||||
/* Early end of data detection can be done because the data size is known. */
|
||||
curl_mime_data_cb(part, (curl_off_t) strlen(data),
|
||||
read_callback, NULL, NULL, &pooh1);
|
||||
part = curl_mime_addpart(mime);
|
||||
curl_mime_name(part, "field2");
|
||||
/* Using an undefined length forces chunked transfer and disables early
|
||||
end of data detection for this part. */
|
||||
curl_mime_data_cb(part, (curl_off_t) -1, read_callback, NULL, NULL, &pooh2);
|
||||
part = curl_mime_addpart(mime);
|
||||
curl_mime_name(part, "field3");
|
||||
/* Regular file part sources early end of data can be detected because
|
||||
the file size is known. In addition, and EOF test is performed. */
|
||||
curl_mime_filedata(part, "log/file665.txt");
|
||||
|
||||
/* Bind mime data to its easy handle. */
|
||||
test_setopt(easy, CURLOPT_MIMEPOST, mime);
|
||||
|
||||
/* Send data. */
|
||||
result = curl_easy_perform(easy);
|
||||
if(result) {
|
||||
fprintf(stderr, "curl_easy_perform() failed\n");
|
||||
res = (int) result;
|
||||
}
|
||||
|
||||
test_cleanup:
|
||||
curl_easy_cleanup(easy);
|
||||
curl_mime_free(mime);
|
||||
curl_global_cleanup();
|
||||
return res;
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user