X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.h;h=4bae5715244857f9c43da10548bac7b5a9787f14;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=e075e0c6e811d75f604a841a1e620befab6715d4;hpb=284649ed257354c2fcb2f2a6c78cf5fd7cf2283d;p=pazpar2-moved-to-github.git diff --git a/src/http.h b/src/http.h index e075e0c..4bae571 100644 --- a/src/http.h +++ b/src/http.h @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 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,12 +20,16 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifndef HTTP_H #define HTTP_H +#include +#include + #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 { @@ -42,6 +46,7 @@ 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 @@ -49,6 +54,7 @@ struct http_channel 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 @@ -100,15 +106,15 @@ 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(const char *addr, 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, +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, +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); @@ -128,6 +134,9 @@ 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 /*