X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.c;h=020e285bbad31a72270930fc45a8507f2ec3b854;hb=e3b0fb8e03240ba2809bf59db1975f8114134fa1;hp=527e887a2668369858ab6a42870fe5206bb3b0c2;hpb=7cb18e001c719f24b9f440f91fc44ddaaeda3303;p=pazpar2-moved-to-github.git

diff --git a/src/http.c b/src/http.c
index 527e887..020e285 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1,5 +1,22 @@
-/*
- * $Id: http.c,v 1.22 2007-04-08 23:04:20 adam Exp $
+/* $Id: http.c,v 1.27 2007-04-16 09:03:25 adam Exp $
+   Copyright (c) 2006-2007, Index Data.
+
+This file is part of Pazpar2.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Pazpar2; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
  */
 
 #include <stdio.h>
@@ -39,10 +56,6 @@ static void proxy_io(IOCHAN i, int event);
 static struct http_channel *http_create(const char *addr);
 static void http_destroy(IOCHAN i);
 
-extern IOCHAN channel_list;
-extern struct parameters global_parameters;
-//extern NMEM nmem;
-
 // If this is set, we proxy normal HTTP requests
 static struct sockaddr_in *proxy_addr = 0; 
 static char proxy_url[256] = "";
@@ -930,7 +943,7 @@ static struct http_channel *http_create(const char *addr)
         yaz_log(YLOG_WARN, "Invalid HTTP forward address");
         exit(1);
     }
-    r->addr = nmem_strdup(r->nmem, addr);
+    strcpy(r->addr, addr);
     return r;
 }
 
@@ -1008,26 +1021,12 @@ void http_init(const char *addr)
     }
     else
     {
-        //size_t len = 128;
-        //char h[len];
         port = atoi(addr);
         myaddr.sin_addr.s_addr = INADDR_ANY;
-
-#if 0
-        // get hostname from system - after deciding to bind to any 
-        // IP address this box might have.
-        if (0 == gethostname(h, len)){
-            h[len - 1] = '\0';
-            global_parameters.server->host = nmem_strdup(nmem, h);
-        } else 
-            yaz_log(YLOG_WARN, "Could not get host name");
-#endif
     }
 
-
     myaddr.sin_port = htons(port);
 
-
     if (!(p = getprotobyname("tcp"))) {
         abort();
     }