diff options
| -rw-r--r-- | lib/http_negotiate.c | 6 | ||||
| -rw-r--r-- | lib/url.c | 12 | ||||
| -rw-r--r-- | lib/url.h | 3 |
3 files changed, 4 insertions, 17 deletions
diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c index 9e1a83ccc..92113eb07 100644 --- a/lib/http_negotiate.c +++ b/lib/http_negotiate.c @@ -53,14 +53,16 @@ CURLcode Curl_input_negotiate(struct connectdata *conn, bool proxy, if(proxy) { userp = conn->proxyuser; passwdp = conn->proxypasswd; - service = data->set.str[STRING_PROXY_SERVICE_NAME]; + service = data->set.str[STRING_PROXY_SERVICE_NAME] ? + data->set.str[STRING_PROXY_SERVICE_NAME] : "HTTP"; host = conn->proxy.name; neg_ctx = &data->state.proxyneg; } else { userp = conn->user; passwdp = conn->passwd; - service = data->set.str[STRING_SERVICE_NAME]; + service = data->set.str[STRING_SERVICE_NAME] ? + data->set.str[STRING_SERVICE_NAME] : "HTTP"; host = conn->host.name; neg_ctx = &data->state.negotiate; } @@ -576,18 +576,6 @@ CURLcode Curl_init_userdefined(struct UserDefined *set) CURL_DEFAULT_SOCKS5_GSSAPI_SERVICE); if(result) return result; - - /* set default negotiate proxy service name */ - result = setstropt(&set->str[STRING_PROXY_SERVICE_NAME], - CURL_DEFAULT_PROXY_SERVICE_NAME); - if(result) - return result; - - /* set default negotiate service name */ - result = setstropt(&set->str[STRING_SERVICE_NAME], - CURL_DEFAULT_SERVICE_NAME); - if(result) - return result; #endif /* This is our preferred CA cert bundle/path since install time */ @@ -69,9 +69,6 @@ void Curl_close_connections(struct SessionHandle *data); #define CURL_DEFAULT_PROXY_PORT 1080 /* default proxy port unless specified */ #define CURL_DEFAULT_SOCKS5_GSSAPI_SERVICE "rcmd" /* default socks5 gssapi service */ -#define CURL_DEFAULT_PROXY_SERVICE_NAME "HTTP" /* default negotiate proxy - service */ -#define CURL_DEFAULT_SERVICE_NAME "HTTP" /* default negotiate service */ CURLcode Curl_connected_proxy(struct connectdata *conn, int sockindex); |