X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.h;h=4bae5715244857f9c43da10548bac7b5a9787f14;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=a2ec7577a4e6537654a6dc3cf7925ffdbf6a6f38;hpb=e107b0011a295ccc61502d6e5ea79d9125a3fbb4;p=pazpar2-moved-to-github.git

diff --git a/src/http.h b/src/http.h
index a2ec757..4bae571 100644
--- a/src/http.h
+++ b/src/http.h
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2008 Index Data
+   Copyright (C) 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
@@ -20,18 +20,17 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #ifndef HTTP_H
 #define HTTP_H
 
-// Generic I/O buffer
-struct http_buf
-{
-#define HTTP_BUF_SIZE 4096
-    char buf[4096];
-    int offset;
-    int len;
-    struct http_buf *next;
-};
+#include <yaz/wrbuf.h>
+#include <yaz/timing.h>
 
+#include "eventl.h"
+// Generic I/O buffer
+struct http_buf;
 typedef struct http_channel_observer_s *http_channel_observer_t;
 
+typedef struct http_server *http_server_t;
+typedef struct http_sessions *http_sessions_t;
+
 struct http_channel
 {
     IOCHAN iochan;
@@ -47,11 +46,15 @@ struct http_channel
     int keep_alive;
     NMEM nmem;
     WRBUF wrbuf;
+    yaz_timing_t yt;
     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;
+    http_server_t http_server;
+    http_sessions_t http_sessions;
 };
 
 struct http_proxy //  attached to iochan for proxy connection
@@ -99,16 +102,22 @@ struct http_response
     char *content_type;
 };
 
-void http_set_proxyaddr(char *url, char *baseurl);
-void http_init(const char *addr);
-void http_addheader(struct http_response *r, 
+void http_mutex_init(struct conf_server *server);
+void http_server_destroy(http_server_t hs);
+
+void http_set_proxyaddr(const char *url, struct conf_server *ser);
+int http_init(struct conf_server *ser, const char *record_fname);
+void http_close_server(struct conf_server *ser);
+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 *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);
-char *http_argbyname(struct http_request *r, char *name);
-char *http_headerbyname(struct http_header *r, char *name);
+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);
@@ -122,12 +131,20 @@ 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);
+
+http_sessions_t http_sessions_create(void);
+void http_sessions_destroy(http_sessions_t hs);
+
 #endif
 
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+