X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.c;h=c0f9596c0b0c612d2fecc95952c6e4dd6fe88261;hb=6424430743ec2d233dfc8118313cfa4299432e2c;hp=c9cca1df605fc30a52781880f91eea2bfefb4915;hpb=9bd9aee82a4ff48f9a1b248e44a47f9f905831c8;p=pazpar2-moved-to-github.git

diff --git a/src/http.c b/src/http.c
index c9cca1d..c0f9596 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2011 Index Data
+   Copyright (C) 2006-2012 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
@@ -70,6 +70,7 @@ typedef int socklen_t;
 #include "ppmutex.h"
 #include "session.h"
 #include "http.h"
+#include "parameters.h"
 
 #define MAX_HTTP_HEADER 4096
 
@@ -649,6 +650,12 @@ static struct http_buf *http_serialize_response(struct http_channel *c,
     if (r->payload)
         wrbuf_puts(c->wrbuf, r->payload);
 
+    if (global_parameters.dump_records > 1)
+    {
+        FILE *lf = yaz_log_file();
+        yaz_log(YLOG_LOG, "Response:");
+        fwrite(wrbuf_buf(c->wrbuf), 1, wrbuf_len(c->wrbuf), lf);
+    }
     return http_buf_bywrbuf(c->http_server, c->wrbuf);
 }
 
@@ -889,7 +896,7 @@ static void http_io(IOCHAN i, int event)
                 {
                     struct timeval tv;
                     gettimeofday(&tv, 0);
-                    fprintf(hc->http_server->record_file, "%lld %lld %lld 0\n",
+                    fprintf(hc->http_server->record_file, "r %lld %lld %lld 0\n",
                             (long long) tv.tv_sec, (long long) tv.tv_usec,
                             (long long) iochan_getfd(i));
                 }
@@ -921,11 +928,12 @@ static void http_io(IOCHAN i, int event)
                     for (hb = hc->iqueue; hb; hb = hb->next)
                         sz += hb->len;
                     gettimeofday(&tv, 0);
-                    fprintf(hc->http_server->record_file, "%lld %lld %lld %d\n",
+                    fprintf(hc->http_server->record_file, "r %lld %lld %lld %d\n",
                             (long long) tv.tv_sec, (long long) tv.tv_usec,
                             (long long) iochan_getfd(i), sz);
                     for (hb = hc->iqueue; hb; hb = hb->next)
                         fwrite(hb->buf, 1, hb->len, hc->http_server->record_file);
+                    fflush(hc->http_server->record_file);
                 }
  #endif
                 if (!(hc->request = http_parse_request(hc, &hc->iqueue, reqlen)))
@@ -968,6 +976,21 @@ static void http_io(IOCHAN i, int event)
                 }
                 if (res == wb->len)
                 {
+#if HAVE_SYS_TIME_H
+                    if (hc->http_server->record_file)
+                    {
+                        struct timeval tv;
+                        int sz = wb->offset + wb->len;
+                        gettimeofday(&tv, 0);
+                        fprintf(hc->http_server->record_file, "w %lld %lld %lld %d\n",
+                                (long long) tv.tv_sec, (long long) tv.tv_usec,
+                                (long long) iochan_getfd(i), sz);
+                        fwrite(wb->buf, 1, wb->offset + wb->len,
+                               hc->http_server->record_file);
+                        fputc('\n', hc->http_server->record_file);
+                        fflush(hc->http_server->record_file);
+                    }
+ #endif
                     hc->oqueue = hc->oqueue->next;
                     http_buf_destroy(hc->http_server, wb);
                 }
@@ -1081,6 +1104,7 @@ static void proxy_io(IOCHAN pi, int event)
         default:
             yaz_log(YLOG_WARN, "Unexpected event on connection");
             http_channel_destroy(hc->iochan);
+            break;
     }
 }