summaryrefslogtreecommitdiff
path: root/lib/url.c
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2017-04-25 15:31:14 +0200
committerDaniel Stenberg <daniel@haxx.se>2017-05-01 22:55:29 +0200
commite3ed5cb380e615e91d99b09da9f0ead0eaf3e0b5 (patch)
treec12a427c0307188e8aa805a696b1faf26659457d /lib/url.c
parent799c7048dc9d5b4e4af50a4f36867742578c7663 (diff)
downloadcurl-e3ed5cb380e615e91d99b09da9f0ead0eaf3e0b5.tar.gz
BUFSIZE: rename to READBUFFER_*, make separate MASTERBUF_SIZE
Diffstat (limited to 'lib/url.c')
-rw-r--r--lib/url.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/lib/url.c b/lib/url.c
index e28acf5f9..e018927c0 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -140,6 +140,10 @@ static CURLcode parse_login_details(const char *login, const size_t len,
char **optionsptr);
static unsigned int get_protocol_family(unsigned int protocol);
+#define READBUFFER_SIZE CURL_MAX_WRITE_SIZE
+#define READBUFFER_MAX CURL_MAX_READ_SIZE
+#define READBUFFER_MIN 1024
+
/*
* Protocol table.
*/
@@ -607,7 +611,7 @@ CURLcode Curl_init_userdefined(struct UserDefined *set)
set->expect_100_timeout = 1000L; /* Wait for a second by default. */
set->sep_headers = TRUE; /* separated header lists by default */
- set->buffer_size = BUFSIZE;
+ set->buffer_size = READBUFFER_SIZE;
Curl_http2_init_userset(set);
return result;
@@ -645,7 +649,7 @@ CURLcode Curl_open(struct Curl_easy **curl)
/* We do some initial setup here, all those fields that can't be just 0 */
- data->state.buffer = malloc(BUFSIZE + 1);
+ data->state.buffer = malloc(READBUFFER_SIZE + 1);
if(!data->state.buffer) {
DEBUGF(fprintf(stderr, "Error: malloc of buffer failed\n"));
result = CURLE_OUT_OF_MEMORY;
@@ -2287,16 +2291,16 @@ CURLcode Curl_setopt(struct Curl_easy *data, CURLoption option,
*/
arg = va_arg(param, long);
- if(arg > MAX_BUFSIZE)
- arg = MAX_BUFSIZE; /* huge internal default */
+ if(arg > READBUFFER_MAX)
+ arg = READBUFFER_MAX;
else if(arg < 1)
- arg = BUFSIZE;
- else if(arg < MIN_BUFSIZE)
- arg = BUFSIZE;
+ arg = READBUFFER_SIZE;
+ else if(arg < READBUFFER_MIN)
+ arg = READBUFFER_MIN;
/* Resize only if larger than default buffer size. */
- if(arg > BUFSIZE) {
- char *newbuff = realloc(data->state.buffer, data->set.buffer_size + 1);
+ if(arg > READBUFFER_SIZE) {
+ char *newbuff = realloc(data->state.buffer, arg + 1);
if(!newbuff) {
DEBUGF(fprintf(stderr, "Error: realloc of buffer failed\n"));
result = CURLE_OUT_OF_MEMORY;
@@ -4208,7 +4212,7 @@ static struct connectdata *allocate_conn(struct Curl_easy *data)
if(Curl_pipeline_wanted(data->multi, CURLPIPE_HTTP1) &&
!conn->master_buffer) {
/* Allocate master_buffer to be used for HTTP/1 pipelining */
- conn->master_buffer = calloc(BUFSIZE, sizeof(char));
+ conn->master_buffer = calloc(MASTERBUF_SIZE, sizeof(char));
if(!conn->master_buffer)
goto error;
}