X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.h;h=2a5d1fe9f10df6d7c5df206766870a68d5966cbf;hb=8e26c620fe9f4cd52e0dc3bec5964c89e9a1b2b6;hp=75014247fee977cd590f49c5f2f468499cffca94;hpb=fe3383c0559a453df1e5076fc6faac6d1a11685c;p=pazpar2-moved-to-github.git

diff --git a/src/http.h b/src/http.h
index 7501424..2a5d1fe 100644
--- a/src/http.h
+++ b/src/http.h
@@ -1,6 +1,26 @@
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2010 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
+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 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
 
+#include "eventl.h"
 // Generic I/O buffer
 struct http_buf
 {
@@ -11,6 +31,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 +45,15 @@ 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 conf_server *server;
 };
 
 struct http_proxy //  attached to iochan for proxy connection
@@ -35,6 +61,7 @@ struct http_proxy //  attached to iochan for proxy connection
     IOCHAN iochan;
     struct http_channel *channel;
     struct http_buf *oqueue;
+    int first_response;
 };
 
 struct http_header
@@ -57,6 +84,9 @@ struct http_request
     char http_version[20];
     char method[20];
     char *path;
+    char *search;
+    char *content_buf;
+    int content_len;
     struct http_header *headers;
     struct http_argument *arguments;
 };
@@ -68,21 +98,46 @@ struct http_response
     struct http_channel *channel;
     struct http_header *headers;
     char *payload;
+    char *content_type;
 };
 
-void http_set_proxyaddr(char *url);
-void http_init(const char *addr);
-void http_addheader(struct http_response *r, const char *name, const char *value);
-char *http_argbyname(struct http_request *r, char *name);
-char *http_headerbyname(struct http_request *r, char *name);
+void http_set_proxyaddr(const char *url, struct conf_server *ser);
+int http_init(const char *addr, struct conf_server *ser);
+void http_close_server(struct conf_server *ser);
+void http_addheader(struct http_response *r, 
+                    const char *name, const char *value);
+const char *http_lookup_header(struct http_header *header,
+                               const char *name);
+struct http_header * http_header_append(struct http_channel *ch, 
+                                        struct http_header * hp, 
+                                        const char *name, 
+                                        const char *value);
+const char *http_argbyname(struct http_request *r, const char *name);
+const char *http_headerbyname(struct http_header *r, const 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,
+                                       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);
+
+void http_command(struct http_channel *c);
+
+#endif
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
-#endif
+