X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.h;h=d221c4317b6cadb6028c3f9e0b2de03079488f1c;hb=dbfdc896b3613efda66ca9ddcbf9863ee2e8817e;hp=34ef41a26986ed5ccaef5b6a444349dc96eafd01;hpb=3c94e0ffce0f67640094e9448fcd1d2dba6ffba4;p=pazpar2-moved-to-github.git

diff --git a/src/http.h b/src/http.h
index 34ef41a..d221c43 100644
--- a/src/http.h
+++ b/src/http.h
@@ -1,7 +1,5 @@
-/* $Id: http.h,v 1.9 2007-06-15 19:35:17 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2008 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
@@ -14,10 +12,10 @@ 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.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #ifndef HTTP_H
 #define HTTP_H
@@ -46,6 +44,7 @@ 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;
@@ -84,6 +83,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;
 };
@@ -95,10 +96,12 @@ struct http_response
     struct http_channel *channel;
     struct http_header *headers;
     char *payload;
+    char *content_type;
 };
 
 void http_set_proxyaddr(char *url, char *baseurl);
-void http_init(const char *addr);
+int http_init(const char *addr);
+void http_close_server(void);
 void http_addheader(struct http_response *r, 
                     const char *name, const char *value);
 struct http_header * http_header_append(struct http_channel *ch, 
@@ -111,10 +114,12 @@ 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);
+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);