X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp.c;h=ef88f1745a52272ed6be06bdc74bac8aa965ee7b;hb=46c9d84fb19ceb838f5372f414e07f314575cb38;hp=c9cca1df605fc30a52781880f91eea2bfefb4915;hpb=9bd9aee82a4ff48f9a1b248e44a47f9f905831c8;p=pazpar2-moved-to-github.git

diff --git a/src/http.c b/src/http.c
index c9cca1d..ef88f17 100644
--- a/src/http.c
+++ b/src/http.c
@@ -889,7 +889,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 +921,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 +969,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);
                 }