diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-04-25 14:38:34 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-05-01 22:55:29 +0200 |
| commit | e40e9d7f0decc799e3ccfe2c418632f8bb52031a (patch) | |
| tree | 9099a157e632bd258e64af5373fac96298bce77e /lib/http.c | |
| parent | c79f4908d461cecaa9976099dcbb8a63b351f19e (diff) | |
| download | curl-e40e9d7f0decc799e3ccfe2c418632f8bb52031a.tar.gz | |
buffer: use data->set.buffer_size instead of BUFSIZE
... to properly use the dynamically set buffer size!
Diffstat (limited to 'lib/http.c')
| -rw-r--r-- | lib/http.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/http.c b/lib/http.c index af3a8db8f..93aac201c 100644 --- a/lib/http.c +++ b/lib/http.c @@ -1117,7 +1117,7 @@ CURLcode Curl_add_buffer_send(Curl_send_buffer *in, buffer is using this size. */ - sendsize = (size > CURL_MAX_WRITE_SIZE) ? CURL_MAX_WRITE_SIZE : size; + sendsize = CURLMIN(size, CURL_MAX_WRITE_SIZE); /* OpenSSL is very picky and we must send the SAME buffer pointer to the library when we attempt to re-send this buffer. Sending the same data @@ -2172,8 +2172,9 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) /* when seekerr == CURL_SEEKFUNC_CANTSEEK (can't seek to offset) */ do { size_t readthisamountnow = - (data->state.resume_from - passed > CURL_OFF_T_C(BUFSIZE)) ? - BUFSIZE : curlx_sotouz(data->state.resume_from - passed); + (data->state.resume_from - passed > data->set.buffer_size) ? + (size_t)data->set.buffer_size : + curlx_sotouz(data->state.resume_from - passed); size_t actuallyread = data->state.fread_func(data->state.buffer, 1, readthisamountnow, |