X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=uhttpd.h;h=fe05f0d9284782dbdf1ec600a41f2042c3fa605e;hp=a620030ae20962684a360d1f2c8cd6664f451c00;hb=c0b5444b533e7177394ceaa247de4495307f72d6;hpb=cd66639800ee2882a0867ec54868502eb9b893d8

diff --git a/uhttpd.h b/uhttpd.h
index a620030..fe05f0d 100644
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -31,7 +31,7 @@
 #include <libubox/utils.h>
 #ifdef HAVE_UBUS
 #include <libubus.h>
-#include <json/json.h>
+#include <json-c/json.h>
 #endif
 #ifdef HAVE_TLS
 #include <libubox/ustream-ssl.h>
@@ -46,12 +46,19 @@
 
 struct client;
 
+struct alias {
+	struct list_head list;
+	char *alias;
+	char *path;
+};
+
 struct config {
 	const char *docroot;
 	const char *realm;
 	const char *file;
 	const char *error_handler;
 	const char *cgi_prefix;
+	const char *cgi_docroot_path;
 	const char *cgi_path;
 	const char *lua_handler;
 	const char *lua_prefix;
@@ -61,12 +68,16 @@ struct config {
 	int no_dirlists;
 	int network_timeout;
 	int rfc1918_filter;
+	int tls_redirect;
 	int tcp_keepalive;
 	int max_script_requests;
 	int max_connections;
 	int http_keepalive;
 	int script_timeout;
 	int ubus_noauth;
+	int ubus_cors;
+	int cgi_prefix_len;
+	struct list_head cgi_alias;
 };
 
 struct auth_realm {
@@ -80,6 +91,7 @@ enum http_method {
 	UH_HTTP_MSG_GET,
 	UH_HTTP_MSG_POST,
 	UH_HTTP_MSG_HEAD,
+	UH_HTTP_MSG_OPTIONS,
 };
 
 enum http_version {
@@ -108,6 +120,7 @@ struct http_request {
 	int content_length;
 	bool expect_cont;
 	bool connection_close;
+	bool disable_chunked;
 	uint8_t transfer_chunked;
 	const struct auth_realm *realm;
 };
@@ -152,6 +165,8 @@ struct relay {
 
 	bool process_done;
 	bool error;
+	bool skip_data;
+
 	int ret;
 	int header_ofs;
 
@@ -209,6 +224,7 @@ struct dispatch {
 	void (*req_free)(struct client *cl);
 
 	bool data_blocked;
+	bool no_cache;
 
 	union {
 		struct {
@@ -238,10 +254,12 @@ struct client {
 	enum client_state state;
 	bool tls;
 
+	int http_code;
 	struct http_request request;
 	struct uh_addr srv_addr, peer_addr;
 
 	struct blob_buf hdr;
+	struct blob_buf hdr_response;
 	struct dispatch dispatch;
 };
 
@@ -260,6 +278,8 @@ void uh_unblock_listeners(void);
 void uh_setup_listeners(void);
 int uh_socket_bind(const char *host, const char *port, bool tls);
 
+int uh_first_tls_port(int family);
+
 bool uh_use_chunked(struct client *cl);
 void uh_chunk_write(struct client *cl, const void *data, int len);
 void uh_chunk_vprintf(struct client *cl, const char *format, va_list arg);
@@ -300,6 +320,11 @@ bool uh_create_process(struct client *cl, struct path_info *pi, char *url,
 int uh_plugin_init(const char *name);
 void uh_plugin_post_init(void);
 
+int uh_handler_add(const char *file);
+int uh_handler_run(struct client *cl, char **url, bool fallback);
+
+struct path_info *uh_path_lookup(struct client *cl, const char *url);
+
 static inline void uh_client_ref(struct client *cl)
 {
 	cl->refcount++;