X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.h;h=c93a85b7e3d0da7db2a7e28ee571e2a73acaa0e2;hb=5b4ea0cf66dd82c871ed7d69a5801d78789087b2;hp=ffb1ca9803438ce49440c3052c2ee1ca6d91f5c9;hpb=56a55ffd1562165febc1a2a66d0c2a95e966d540;p=pazpar2-moved-to-github.git

diff --git a/src/http.h b/src/http.h
index ffb1ca9..c93a85b 100644
--- a/src/http.h
+++ b/src/http.h
@@ -1,7 +1,5 @@
-/* $Id: http.h,v 1.12 2007-10-02 12:11:14 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2009 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
@@ -54,6 +52,7 @@ struct http_channel
     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
@@ -98,18 +97,20 @@ 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);
+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);
 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);
@@ -123,12 +124,17 @@ 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
  */
+