projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
[pazpar2-moved-to-github.git]
/
src
/
http.h
diff --git
a/src/http.h
b/src/http.h
index
df2c3c2
..
9a00fee
100644
(file)
--- a/
src/http.h
+++ b/
src/http.h
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ Copyright (C) 2006-2011 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
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,16
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef HTTP_H
#define HTTP_H
#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 "eventl.h"
+// Generic I/O buffer
+struct http_buf;
typedef struct http_channel_observer_s *http_channel_observer_t;
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;
struct http_channel
{
IOCHAN iochan;
@@
-53,6
+51,8
@@
struct http_channel
char addr[20]; // forwarded address
http_channel_observer_t observers;
struct conf_server *server;
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
};
struct http_proxy // attached to iochan for proxy connection
@@
-100,17
+100,22
@@
struct http_response
char *content_type;
};
char *content_type;
};
-void http_set_proxyaddr(char *url, char *baseurl);
+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(const char *addr, struct conf_server *ser);
-void http_close_server(void);
+void http_close_server(struct conf_server *ser);
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);
+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);
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);
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);
@@
-124,6
+129,12
@@
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_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
/*
#endif
/*