Automaked pazpar2. Bug #799. Preprocessor defines are put in cconfig.h and

[pazpar2-moved-to-github.git] / src / http.c

diff --git a/src/http.c b/src/http.c
index 48a2643..09d9f5c 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -1,5 +1,5 @@
 /*
- * $Id: http.c,v 1.2 2006-12-20 23:31:24 adam Exp $
+ * $Id: http.c,v 1.6 2007-01-08 12:43:41 adam Exp $
  */
 
 #include <stdio.h>
@@ -15,11 +15,14 @@
 #include <errno.h>
 #include <assert.h>
 
+#if HAVE_CONFIG_H
+#include <cconfig.h>
+#endif
+
 #include <yaz/yaz-util.h>
 #include <yaz/comstack.h>
 #include <netdb.h>
 
-#include "command.h"
 #include "util.h"
 #include "eventl.h"
 #include "pazpar2.h"
@@ -263,6 +266,7 @@ struct http_request *http_parse_request(struct http_channel *c, struct http_buf
     if (http_buf_read(queue, buf, len) < len)
         return 0;
 
+    r->search = "";
     r->channel = c;
     r->arguments = 0;
     r->headers = 0;
@@ -293,6 +297,7 @@ struct http_request *http_parse_request(struct http_channel *c, struct http_buf
     r->path = nmem_strdup(c->nmem, buf);
     if (p2)
     {
+        r->search = nmem_strdup(c->nmem, p2);
         // Parse Arguments
         while (*p2)
         {
@@ -548,8 +553,10 @@ static void http_io(IOCHAN i, int event)
                 return;
             }
             hc->response = 0;
-            yaz_log(YLOG_LOG, "Request: %s %s v %s", hc->request->method,
-                    hc->request->path, hc->request->http_version);
+            yaz_log(YLOG_LOG, "Request: %s %s%s%s", hc->request->method,
+                    hc->request->path,
+                    *hc->request->search ? "?" : "",
+                    hc->request->search);
             if (http_weshouldproxy(hc->request))
                 http_proxy(hc->request);
             else
@@ -754,7 +761,7 @@ static void http_accept(IOCHAN i, int event)
     if (fcntl(s, F_SETFL, flags | O_NONBLOCK) < 0)
         yaz_log(YLOG_FATAL|YLOG_ERRNO, "fcntl2");
 
-    yaz_log(YLOG_LOG, "New command connection");
+    yaz_log(YLOG_DEBUG, "New command connection");
     c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT);
 
     ch = http_create();