relay: do forward data if the http request type was HEAD

[project/uhttpd.git] / uhttpd.h

diff --git a/uhttpd.h b/uhttpd.h
index 38f60d3..cace950 100644 (file)
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -62,9 +62,11 @@ 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;
 };
 
 struct auth_realm {
@@ -116,6 +118,7 @@ enum client_state {
        CLIENT_STATE_DATA,
        CLIENT_STATE_DONE,
        CLIENT_STATE_CLOSE,
+       CLIENT_STATE_CLEANUP,
 };
 
 struct interpreter {
@@ -144,9 +147,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 +163,7 @@ struct relay {
 };
 
 struct dispatch_proc {
+       struct uloop_timeout timeout;
        struct blob_buf hdr;
        struct uloop_fd wrfd;
        struct relay r;
@@ -165,6 +173,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 +190,6 @@ struct dispatch_ubus {
        struct json_object *jsobj_cur;
        int post_len;
 
-       const char *sid;
        uint32_t obj;
        const char *func;
 
@@ -198,6 +206,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 +226,7 @@ struct dispatch {
 
 struct client {
        struct list_head list;
+       int refcount;
        int id;
 
        struct ustream *us;
@@ -280,6 +293,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 +302,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