X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.h;h=ba8f16323a28d0318e1e0860ed5113c25d09d579;hb=401d3364f84085a8b665a78aad7864fe5eabe095;hp=1420f6e7ac15b795b2b251e87cb26c4586a3a545;hpb=a567f55ee47da94c337b232a3848d1c8bab254b2;p=pazpar2-moved-to-github.git

diff --git a/src/http.h b/src/http.h
index 1420f6e..ba8f163 100644
--- a/src/http.h
+++ b/src/http.h
@@ -1,3 +1,24 @@
+/* $Id: http.h,v 1.11 2007-09-26 08:53:53 adam Exp $
+   Copyright (c) 2006-2007, Index Data.
+
+This file is part of Pazpar2.
+
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Pazpar2; see the file LICENSE.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+ */
+
 #ifndef HTTP_H
 #define HTTP_H
 
@@ -11,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;
@@ -23,11 +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
@@ -59,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;
 };
@@ -74,11 +102,26 @@ struct http_response
 
 void http_set_proxyaddr(char *url, char *baseurl);
 void http_init(const char *addr);
-void http_addheader(struct http_response *r, const char *name, const char *value);
+void http_addheader(struct http_response *r, 
+                    const char *name, const char *value);
+struct http_header * http_header_append(struct http_channel *ch, 
+                                        struct http_header * hp, 
+                                        const char *name, 
+                                        const char *value);
 char *http_argbyname(struct http_request *r, char *name);
 char *http_headerbyname(struct http_header *r, char *name);
 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);
+
+http_channel_observer_t http_add_observer(struct http_channel *c, void *data,
+                                          http_channel_destroy_t);
+
+void http_remove_observer(http_channel_observer_t obs);
+struct http_channel *http_channel_observer_chan(http_channel_observer_t obs);
+#endif
 
 /*
  * Local variables:
@@ -87,4 +130,3 @@ void http_send_response(struct http_channel *c);
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
-#endif