X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=uhttpd.h;h=6ef28d922a5f2f90842149387528addd6a1e15db;hp=3226f8d5d79b01d785be6abda86d1878ebdc622d;hb=98839fdd7467f34011ef4b967b285fee3b0d8597;hpb=1f4c517bb889413e55ccee466d9dfe79156092e8

diff --git a/uhttpd.h b/uhttpd.h
index 3226f8d..6ef28d9 100644
--- a/uhttpd.h
+++ b/uhttpd.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;
@@ -62,9 +63,12 @@ struct config {
 	int network_timeout;
 	int rfc1918_filter;
 	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 +82,7 @@ enum http_method {
 	UH_HTTP_MSG_GET,
 	UH_HTTP_MSG_POST,
 	UH_HTTP_MSG_HEAD,
+	UH_HTTP_MSG_OPTIONS,
 };
 
 enum http_version {
@@ -86,12 +91,26 @@ enum http_version {
 	UH_HTTP_VER_1_1,
 };
 
+enum http_user_agent {
+	UH_UA_UNKNOWN,
+	UH_UA_GECKO,
+	UH_UA_CHROME,
+	UH_UA_SAFARI,
+	UH_UA_MSIE,
+	UH_UA_KONQUEROR,
+	UH_UA_OPERA,
+	UH_UA_MSIE_OLD,
+	UH_UA_MSIE_NEW,
+};
+
 struct http_request {
 	enum http_method method;
 	enum http_version version;
+	enum http_user_agent ua;
 	int redirect_status;
 	int content_length;
 	bool expect_cont;
+	bool connection_close;
 	uint8_t transfer_chunked;
 	const struct auth_realm *realm;
 };
@@ -102,6 +121,7 @@ enum client_state {
 	CLIENT_STATE_DATA,
 	CLIENT_STATE_DONE,
 	CLIENT_STATE_CLOSE,
+	CLIENT_STATE_CLEANUP,
 };
 
 struct interpreter {
@@ -130,9 +150,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;
 
@@ -142,6 +166,7 @@ struct relay {
 };
 
 struct dispatch_proc {
+	struct uloop_timeout timeout;
 	struct blob_buf hdr;
 	struct uloop_fd wrfd;
 	struct relay r;
@@ -151,6 +176,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);
@@ -167,7 +193,6 @@ struct dispatch_ubus {
 	struct json_object *jsobj_cur;
 	int post_len;
 
-	const char *sid;
 	uint32_t obj;
 	const char *func;
 
@@ -184,6 +209,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 {
@@ -200,6 +229,7 @@ struct dispatch {
 
 struct client {
 	struct list_head list;
+	int refcount;
 	int id;
 
 	struct ustream *us;
@@ -208,6 +238,7 @@ struct client {
 	struct ustream_ssl ssl;
 #endif
 	struct uloop_timeout timeout;
+	int requests;
 
 	enum client_state state;
 	bool tls;
@@ -265,6 +296,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,
@@ -273,4 +305,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