D2673.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2673.diff
View Options

	Index: head/lib/libfetch/http.c
	===================================================================
	--- head/lib/libfetch/http.c
	+++ head/lib/libfetch/http.c
	@@ -1625,10 +1625,8 @@
	http_auth_params_t aparams;
	init_http_auth_params(&aparams);
	if (purl->user \|\| purl->pwd) {
	- aparams.user = purl->user ?
	- strdup(purl->user) : strdup("");
	- aparams.password = purl->pwd?
	- strdup(purl->pwd) : strdup("");
	+ aparams.user = strdup(purl->user);
	+ aparams.password = strdup(purl->pwd);
	} else if ((p = getenv("HTTP_PROXY_AUTH")) != NULL &&
	*p != '\0') {
	if (http_authfromenv(p, &aparams) < 0) {
	@@ -1654,10 +1652,8 @@
	http_auth_params_t aparams;
	init_http_auth_params(&aparams);
	if (url->user \|\| url->pwd) {
	- aparams.user = url->user ?
	- strdup(url->user) : strdup("");
	- aparams.password = url->pwd ?
	- strdup(url->pwd) : strdup("");
	+ aparams.user = strdup(url->user);
	+ aparams.password = strdup(url->pwd);
	} else if ((p = getenv("HTTP_AUTH")) != NULL &&
	*p != '\0') {
	if (http_authfromenv(p, &aparams) < 0) {
	@@ -1666,10 +1662,8 @@
	}
	} else if (fetchAuthMethod &&
	fetchAuthMethod(url) == 0) {
	- aparams.user = url->user ?
	- strdup(url->user) : strdup("");
	- aparams.password = url->pwd ?
	- strdup(url->pwd) : strdup("");
	+ aparams.user = strdup(url->user);
	+ aparams.password = strdup(url->pwd);
	} else {
	http_seterr(HTTP_NEED_AUTH);
	goto ouch;