X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.c;h=a327cf32558efba6e925482c119daf7ef99c9b94;hb=d716fe118643f845b127b5a12be8b6a08d735a82;hp=32b32b43357211f91c659767d95661524d11f321;hpb=245e16ffa5df630f1eb5f50bc674b422ccf1a1f0;p=pazpar2-moved-to-github.git

diff --git a/src/http.c b/src/http.c
index 32b32b4..a327cf3 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1,5 +1,5 @@
 /*
- * $Id: http.c,v 1.15 2007-03-29 09:16:34 marc Exp $
+ * $Id: http.c,v 1.21 2007-04-02 09:43:08 marc Exp $
  */
 
 #include <stdio.h>
@@ -21,10 +21,11 @@
 #endif
 
 #include <netinet/in.h>
+#include <netdb.h>
 
 #include <yaz/yaz-util.h>
 #include <yaz/comstack.h>
-#include <netdb.h>
+#include <yaz/nmem.h>
 
 #include "cconfig.h"
 #include "util.h"
@@ -39,6 +40,7 @@ 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; 
@@ -610,20 +612,16 @@ static int http_proxy(struct http_request *rq)
     {
         hp = rq->headers;
         hp = http_header_append(c, hp, 
-                                PACKAGE_NAME "-version", PACKAGE_VERSION);
+                                "X-Pazpar2-Version", PACKAGE_VERSION);
         hp = http_header_append(c, hp, 
-                                PACKAGE_NAME "-server-host", ser->myurl);
+                                "X-Pazpar2-Server-Host", ser->host);
         sprintf(server_port, "%d",  ser->port);
         hp = http_header_append(c, hp, 
-                                PACKAGE_NAME "-server-port", server_port);
+                                "X-Pazpar2-Server-Port", server_port);
         sprintf(server_via,  "1.1 %s:%s (%s/%s)",  
-                ser->myurl, server_port, PACKAGE_NAME, PACKAGE_VERSION);
-        hp = http_header_append(c, hp, 
-                                "Via" , server_via);
-        //hp = http_header_append(c, hp,"Client-ip", 
-        //                        c->iochan->addr_str);
-        hp = http_header_append(c, hp,"X-Forwarded-For", 
-                                c->iochan->addr_str);
+                ser->host, server_port, PACKAGE_NAME, PACKAGE_VERSION);
+        hp = http_header_append(c, hp, "Via" , server_via);
+        hp = http_header_append(c, hp,"X-Forwarded-For", c->iochan->addr_str);
       }
 
     requestbuf = http_serialize_request(rq);
@@ -760,6 +758,7 @@ static void http_io(IOCHAN i, int event)
     }
 }
 
+#ifdef GAGA
 // If this hostname contains our proxy host as a prefix, replace with myurl
 static char *sub_hostname(struct http_channel *c, char *buf)
 {
@@ -776,6 +775,7 @@ static char *sub_hostname(struct http_channel *c, char *buf)
     }
     return buf;
 }
+#endif
 
 // Handles I/O on a client connection to a backend web server (proxy mode)
 static void proxy_io(IOCHAN pi, int event)
@@ -813,6 +813,7 @@ static void proxy_io(IOCHAN pi, int event)
                 htbuf->buf[res] = '\0';
                 htbuf->offset = 0;
                 htbuf->len = res;
+#ifdef GAGA
                 if (pc->first_response) // Check if this is a redirect
                 {
                     int len;
@@ -838,6 +839,7 @@ static void proxy_io(IOCHAN pi, int event)
                     }
                     pc->first_response = 0;
                 }
+#endif
                 // Write any remaining payload
                 if (htbuf->len - htbuf->offset > 0)
                     http_buf_enqueue(&hc->oqueue, htbuf);
@@ -970,7 +972,7 @@ void http_init(const char *addr)
     const char *pp;
     int port;
 
-    yaz_log(YLOG_LOG, "HTTP listener is %s", addr);
+    yaz_log(YLOG_LOG, "HTTP listener %s", addr);
 
     memset(&myaddr, 0, sizeof myaddr);
     myaddr.sin_family = AF_INET;
@@ -988,16 +990,37 @@ void http_init(const char *addr)
             yaz_log(YLOG_FATAL, "Unable to resolve '%s'", hostname);
             exit(1);
         }
+        
         memcpy(&myaddr.sin_addr.s_addr, he->h_addr_list[0], he->h_length);
         port = atoi(pp + 1);
+
+        yaz_log(YLOG_LOG, "HTTP address  %s:%d", 
+                "" == he->h_addr_list[0] ? he->h_addr_list[0] : "127.0.0.1" , 
+                    port);
+
     }
     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();
     }
@@ -1027,6 +1050,7 @@ void http_set_proxyaddr(char *host, char *base_url)
     strcpy(proxy_url, host);
     p = strchr(host, ':');
     yaz_log(YLOG_DEBUG, "Proxying for %s", host);
+    yaz_log(YLOG_LOG, "HTTP backend  %s", proxy_url);
     if (p) {
         port = atoi(p + 1);
         *p = '\0';