mirror of
https://github.com/moparisthebest/curl
synced 2024-10-31 15:45:12 -04:00
moved a 100K buffer from the transfer loop to the urlstate struct, as it
seriously decreases the amount of used stack space
This commit is contained in:
parent
63f1f58077
commit
2cb893575d
@ -797,13 +797,9 @@ Transfer(struct connectdata *c_conn)
|
|||||||
if((keepon & KEEP_WRITE) && FD_ISSET(conn->writesockfd, &writefd)) {
|
if((keepon & KEEP_WRITE) && FD_ISSET(conn->writesockfd, &writefd)) {
|
||||||
/* write */
|
/* write */
|
||||||
|
|
||||||
char scratch[BUFSIZE * 2];
|
|
||||||
int i, si;
|
int i, si;
|
||||||
size_t bytes_written;
|
size_t bytes_written;
|
||||||
|
|
||||||
if(data->set.crlf)
|
|
||||||
buf = data->state.buffer; /* put it back on the buffer */
|
|
||||||
|
|
||||||
nread = data->set.fread(buf, 1, conn->upload_bufsize, data->set.in);
|
nread = data->set.fread(buf, 1, conn->upload_bufsize, data->set.in);
|
||||||
|
|
||||||
/* the signed int typecase of nread of for systems that has
|
/* the signed int typecase of nread of for systems that has
|
||||||
@ -821,15 +817,15 @@ Transfer(struct connectdata *c_conn)
|
|||||||
if (data->set.crlf) {
|
if (data->set.crlf) {
|
||||||
for(i = 0, si = 0; i < (int)nread; i++, si++) {
|
for(i = 0, si = 0; i < (int)nread; i++, si++) {
|
||||||
if (buf[i] == 0x0a) {
|
if (buf[i] == 0x0a) {
|
||||||
scratch[si++] = 0x0d;
|
data->state.scratch[si++] = 0x0d;
|
||||||
scratch[si] = 0x0a;
|
data->state.scratch[si] = 0x0a;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
scratch[si] = buf[i];
|
data->state.scratch[si] = buf[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
nread = si;
|
nread = si;
|
||||||
buf = scratch; /* point to the new buffer */
|
buf = data->state.scratch; /* point to the new buffer */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* write to socket */
|
/* write to socket */
|
||||||
@ -840,6 +836,8 @@ Transfer(struct connectdata *c_conn)
|
|||||||
failf(data, "Failed uploading data");
|
failf(data, "Failed uploading data");
|
||||||
return CURLE_WRITE_ERROR;
|
return CURLE_WRITE_ERROR;
|
||||||
}
|
}
|
||||||
|
if(data->set.crlf)
|
||||||
|
buf = data->state.buffer; /* put it back on the buffer */
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -439,6 +439,8 @@ struct UrlState {
|
|||||||
|
|
||||||
struct curl_ssl_session *session; /* array of 'numsessions' size */
|
struct curl_ssl_session *session; /* array of 'numsessions' size */
|
||||||
long sessionage; /* number of the most recent session */
|
long sessionage; /* number of the most recent session */
|
||||||
|
|
||||||
|
char scratch[BUFSIZE*2]; /* huge buffer when doing upload CRLF replacing */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user