X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=uhttpd.h;h=fbcb1ed7a0c968087f39e1eca4e65305752c7b8e;hp=38f60d3884dde010c971622ba79d45b7c813a2b4;hb=993cace15114a0f06f720f34a4748ab54b695f0d;hpb=4c6ee39cb985e47c88bd65783ff5385a32c4bd3f

diff --git a/uhttpd.h b/uhttpd.h
index 38f60d3..fbcb1ed 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>
@@ -52,6 +52,7 @@ struct config {
 	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,10 +62,14 @@ struct config {
 	int no_dirlists;
 	int network_timeout;
 	int rfc1918_filter;
+	int tls_redirect;
 	int tcp_keepalive;
-	int max_requests;
+	int max_script_requests;
+	int max_connections;
 	int http_keepalive;
 	int script_timeout;
+	int ubus_noauth;
+	int ubus_cors;
 };
 
 struct auth_realm {
@@ -78,6 +83,7 @@ enum http_method {
 	UH_HTTP_MSG_GET,
 	UH_HTTP_MSG_POST,
 	UH_HTTP_MSG_HEAD,
+	UH_HTTP_MSG_OPTIONS,
 };
 
 enum http_version {
@@ -106,6 +112,7 @@ struct http_request {
 	int content_length;
 	bool expect_cont;
 	bool connection_close;
+	bool respond_chunked;
 	uint8_t transfer_chunked;
 	const struct auth_realm *realm;
 };
@@ -116,6 +123,7 @@ enum client_state {
 	CLIENT_STATE_DATA,
 	CLIENT_STATE_DONE,
 	CLIENT_STATE_CLOSE,
+	CLIENT_STATE_CLEANUP,
 };
 
 struct interpreter {
@@ -144,9 +152,13 @@ struct env_var {
 struct relay {
 	struct ustream_fd sfd;
 	struct uloop_process proc;
+	struct uloop_timeout timeout;
 	struct client *cl;
 
 	bool process_done;
+	bool error;
+	bool skip_data;
+
 	int ret;
 	int header_ofs;
 
@@ -156,6 +168,7 @@ struct relay {
 };
 
 struct dispatch_proc {
+	struct uloop_timeout timeout;
 	struct blob_buf hdr;
 	struct uloop_fd wrfd;
 	struct relay r;
@@ -165,6 +178,7 @@ struct dispatch_proc {
 
 struct dispatch_handler {
 	struct list_head list;
+	bool script;
 
 	bool (*check_url)(const char *url);
 	bool (*check_path)(struct path_info *pi, const char *url);
@@ -181,7 +195,6 @@ struct dispatch_ubus {
 	struct json_object *jsobj_cur;
 	int post_len;
 
-	const char *sid;
 	uint32_t obj;
 	const char *func;
 
@@ -198,6 +211,10 @@ struct dispatch {
 	void (*write_cb)(struct client *cl);
 	void (*close_fds)(struct client *cl);
 	void (*free)(struct client *cl);
+
+	void *req_data;
+	void (*req_free)(struct client *cl);
+
 	bool data_blocked;
 
 	union {
@@ -214,6 +231,7 @@ struct dispatch {
 
 struct client {
 	struct list_head list;
+	int refcount;
 	int id;
 
 	struct ustream *us;
@@ -227,6 +245,7 @@ struct client {
 	enum client_state state;
 	bool tls;
 
+	int http_code;
 	struct http_request request;
 	struct uh_addr srv_addr, peer_addr;
 
@@ -249,6 +268,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);
@@ -280,6 +301,7 @@ void uh_dispatch_add(struct dispatch_handler *d);
 void uh_relay_open(struct client *cl, struct relay *r, int fd, int pid);
 void uh_relay_close(struct relay *r, int ret);
 void uh_relay_free(struct relay *r);
+void uh_relay_kill(struct client *cl, struct relay *r);
 
 struct env_var *uh_get_process_vars(struct client *cl, struct path_info *pi);
 bool uh_create_process(struct client *cl, struct path_info *pi, char *url,
@@ -288,4 +310,18 @@ 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);
 
+static inline void uh_client_ref(struct client *cl)
+{
+	cl->refcount++;
+}
+
+static inline void uh_client_unref(struct client *cl)
+{
+	if (--cl->refcount)
+		return;
+
+	if (cl->state == CLIENT_STATE_CLEANUP)
+		ustream_state_change(cl->us);
+}
+
 #endif