diff options
| author | Mohammad AlSaleh <CE.Mohammad.AlSaleh@gmail.com> | 2016-01-09 00:50:38 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2016-01-11 23:38:42 +0100 |
| commit | 3d209b5fb0c792655288758d48a2703b88a84145 (patch) | |
| tree | c9846f65273bee6baeb21e365ba8c1d6c33dfe96 | |
| parent | ebfe00c05001f9830aefb0ea10cdeccc4f27c66b (diff) | |
lib: Prefix URLs with lower-case protocol names/schemes
Before this patch, if a URL does not start with the protocol
name/scheme, effective URLs would be prefixed with upper-case protocol
names/schemes. This behavior might not be expected by library users or
end users.
For example, if `CURLOPT_DEFAULT_PROTOCOL` is set to "https". And the
URL is "hostname/path". The effective URL would be
"HTTPS://hostname/path" instead of "https://hostname/path".
After this patch, effective URLs would be prefixed with a lower-case
protocol name/scheme.
Closes #597
Signed-off-by: Mohammad AlSaleh <CE.Mohammad.AlSaleh@gmail.com>
| -rw-r--r-- | lib/url.c | 5 | ||||
| -rw-r--r-- | tests/data/test1213 | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -5511,6 +5511,7 @@ static CURLcode create_conn(struct SessionHandle *data, we're gonna follow a Location: later or... then we need the protocol part added so that we have a valid URL. */ char *reurl; + char *ch_lower; reurl = aprintf("%s://%s", conn->handler->scheme, data->change.url); @@ -5519,6 +5520,10 @@ static CURLcode create_conn(struct SessionHandle *data, goto out; } + /* Change protocol prefix to lower-case */ + for(ch_lower = reurl; *ch_lower != ':'; ch_lower++) + *ch_lower = (char)TOLOWER(*ch_lower); + if(data->change.url_alloc) { Curl_safefree(data->change.url); data->change.url_alloc = FALSE; diff --git a/tests/data/test1213 b/tests/data/test1213 index 729a7034d..4f22f0d92 100644 --- a/tests/data/test1213 +++ b/tests/data/test1213 @@ -43,7 +43,7 @@ HTTP with proxy and host-only URL ^User-Agent:.* </strip> <protocol> -GET HTTP://we.want.that.site.com.1213/ HTTP/1.1
+GET http://we.want.that.site.com.1213/ HTTP/1.1
Host: we.want.that.site.com.1213
Accept: */*
Proxy-Connection: Keep-Alive
|