diff --git a/lib/url.c b/lib/url.c index f250f2ff2..9b8b2bdde 100644 --- a/lib/url.c +++ b/lib/url.c @@ -2788,12 +2788,14 @@ static CURLcode override_login(struct Curl_easy *data, /* for updated strings, we update them in the URL */ if(user_changed) { - uc = curl_url_set(data->state.uh, CURLUPART_USER, *userp, 0); + uc = curl_url_set(data->state.uh, CURLUPART_USER, *userp, + CURLU_URLENCODE); if(uc) return Curl_uc_to_curlcode(uc); } if(passwd_changed) { - uc = curl_url_set(data->state.uh, CURLUPART_PASSWORD, *passwdp, 0); + uc = curl_url_set(data->state.uh, CURLUPART_PASSWORD, *passwdp, + CURLU_URLENCODE); if(uc) return Curl_uc_to_curlcode(uc); } diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 004a90b23..bb6bf0f2f 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -136,6 +136,7 @@ test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \ test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \ test1152 test1153 test1154 test1155 test1156 test1157 test1158 test1159 \ test1160 test1161 test1162 test1163 test1164 test1165 test1166 test1167 \ +test1168 \ \ test1170 test1171 test1172 test1173 test1174 test1175 test1176 test1177 \ \ diff --git a/tests/data/test1168 b/tests/data/test1168 new file mode 100644 index 000000000..283e91e01 --- /dev/null +++ b/tests/data/test1168 @@ -0,0 +1,78 @@ + + + +HTTP +HTTP GET +followlocation + + +# Server-side + + +HTTP/1.1 301 This is a weirdo text message swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Location: /data/11680002.txt +Connection: close + +This server reply is for testing a simple Location: following + + + +HTTP/1.1 200 Followed here fine swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 52 + +If this is received, the location following worked + + + +HTTP/1.1 301 This is a weirdo text message swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Location: /data/11680002.txt +Connection: close + +HTTP/1.1 200 Followed here fine swsclose +Date: Thu, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Content-Length: 52 + +If this is received, the location following worked + + + + +# Client-side + + +http + + +HTTP redirect with credentials using # in user and password + + +http://%HOSTIP:%HTTPPORT/want/1168 -L -u "catmai#d:#DZaRJYrixKE*gFY" + + + +# Verify data after the test has been "shot" + + +^User-Agent:.* + + +GET /want/1168 HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ== +Accept: */* + +GET /data/11680002.txt HTTP/1.1 +Host: %HOSTIP:%HTTPPORT +Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ== +Accept: */* + + + +