X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fgetaddrinfo.c;h=656b9e197175240d8d379a9f85ef6b2903546236;hb=a8559c6713a7130a271d77083d06b1561c38269c;hp=5796e32af560c3cf78b0d70b242824b02c6eb352;hpb=3100e2ef14dfed05d5dd7ede542b78c687c31e38;p=pazpar2-moved-to-github.git

diff --git a/src/getaddrinfo.c b/src/getaddrinfo.c
index 5796e32..656b9e1 100644
--- a/src/getaddrinfo.c
+++ b/src/getaddrinfo.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2013 Index Data
+   Copyright (C) Index Data
 
 Pazpar2 is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -69,7 +69,7 @@ static void perform_getaddrinfo(struct work *w)
 {
     struct addrinfo hints, *res;
     char host[512], *cp;
-    char *port = 0;
+    char *port = "210";
     int error;
 
     hints.ai_flags = 0;
@@ -81,14 +81,27 @@ static void perform_getaddrinfo(struct work *w)
     hints.ai_canonname      = NULL;
     hints.ai_next           = NULL;
 
-    strncpy(host, w->hostport, sizeof(host)-1);
+    if (!strncmp(w->hostport, "http://", 7))
+    {
+        port = "80";
+        strncpy(host, w->hostport + 7, sizeof(host)-1);
+    }
+    else if (!strncmp(w->hostport, "https://", 8))
+    {
+        port = "443";
+        strncpy(host, w->hostport + 8, sizeof(host)-1);
+    }
+    else
+    {
+        strncpy(host, w->hostport, sizeof(host)-1);
+    }
     host[sizeof(host)-1] = 0;
     if ((cp = strrchr(host, ':')))
     {
         *cp = '\0';
         port = cp + 1;
     }
-    error = getaddrinfo(host, port ? port : "210", &hints, &res);
+    error = getaddrinfo(host, port, &hints, &res);
     if (error)
     {
         yaz_log(YLOG_WARN, "Failed to resolve %s: %s",