X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fhttp.h;h=b4cdd9e9ffa0706fc672be674239615c0e091deb;hb=eed30a5461c8c61a88582b69af6ff735839646b4;hp=8a6ac1d3b4c76b65f9181a54a87411ab79465bf4;hpb=1f6844b18354bd131532c1403179923848145c09;p=pazpar2-moved-to-github.git

diff --git a/src/http.h b/src/http.h
index 8a6ac1d..b4cdd9e 100644
--- a/src/http.h
+++ b/src/http.h
@@ -1,4 +1,4 @@
-/* $Id: http.h,v 1.8 2007-04-15 00:35:57 quinn Exp $
+/* $Id: http.h,v 1.13 2007-10-08 13:19:23 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -32,6 +32,8 @@ struct http_buf
     struct http_buf *next;
 };
 
+typedef struct http_channel_observer_s *http_channel_observer_t;
+
 struct http_channel
 {
     IOCHAN iochan;
@@ -44,12 +46,14 @@ struct http_channel
         Http_Idle,
         Http_Busy      // Don't process new HTTP requests while we're busy
     } state;
+    int keep_alive;
     NMEM nmem;
     WRBUF wrbuf;
     struct http_request *request;
     struct http_response *response;
     struct http_channel *next; // for freelist
     char addr[20]; // forwarded address
+    http_channel_observer_t observers;
 };
 
 struct http_proxy //  attached to iochan for proxy connection
@@ -81,6 +85,8 @@ struct http_request
     char method[20];
     char *path;
     char *search;
+    char *content_buf;
+    int content_len;
     struct http_header *headers;
     struct http_argument *arguments;
 };
@@ -92,6 +98,7 @@ struct http_response
     struct http_channel *channel;
     struct http_header *headers;
     char *payload;
+    char *content_type;
 };
 
 void http_set_proxyaddr(char *url, char *baseurl);
@@ -108,6 +115,17 @@ struct http_response *http_create_response(struct http_channel *c);
 void http_send_response(struct http_channel *c);
 void urlencode(const char *i, char *o);
 
+typedef void (*http_channel_destroy_t)(void *data, struct http_channel *c,
+                                       void *data2);
+
+http_channel_observer_t http_add_observer(struct http_channel *c, void *data,
+                                          http_channel_destroy_t);
+void http_observer_set_data2(http_channel_observer_t obs, void *data2);
+
+void http_remove_observer(http_channel_observer_t obs);
+struct http_channel *http_channel_observer_chan(http_channel_observer_t obs);
+#endif
+
 /*
  * Local variables:
  * c-basic-offset: 4
@@ -115,4 +133,3 @@ void urlencode(const char *i, char *o);
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
-#endif