mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gc/http-with-non-ascii-username-url'

Browse Source 
* gc/http-with-non-ascii-username-url:
  Fix username and password extraction from HTTP URLs
  t5550: test HTTP authentication and userinfo decoding

Conflicts:
	t/lib-httpd/apache.conf
This commit is contained in:
Junio C Hamano
2010-12-08 11:24:14 -08:00
parent 09a8fbd59c f39f72d8cf
commit 16c06fcb39
5 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
http.c
View File

@ -2,6 +2,7 @@
#include "pack.h"
#include "sideband.h"
#include "run-command.h"
#include "url.h"
int data_received;
int active_requests;
@ -302,7 +303,7 @@ static CURL *get_curl_handle(void)
static void http_auth_init(const char *url)
{
char *at, *colon, *cp, *slash;
char *at, *colon, *cp, *slash, *decoded;
int len;
cp = strstr(url, "://");
@ -327,16 +328,25 @@ static void http_auth_init(const char *url)
user_name = xmalloc(len + 1);
memcpy(user_name, cp, len);
user_name[len] = '\0';
decoded = url_decode(user_name);
free(user_name);
user_name = decoded;
user_pass = NULL;
} else {
len = colon - cp;
user_name = xmalloc(len + 1);
memcpy(user_name, cp, len);
user_name[len] = '\0';
decoded = url_decode(user_name);
free(user_name);
user_name = decoded;
len = at - (colon + 1);
user_pass = xmalloc(len + 1);
memcpy(user_pass, colon + 1, len);
user_pass[len] = '\0';
decoded = url_decode(user_pass);
free(user_pass);
user_pass = decoded;
}
}