http_negotiate: Calculate service name and proxy service name locally

Calculate the service name and proxy service names locally, rather than
in url.c which will allow for us to support overriding the service name
for other protocols such as FTP, IMAP, POP3 and SMTP.

1 files changed, 4 insertions, 2 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;
   }