fix the alias support

[project/uhttpd.git] / uhttpd.h

diff --git a/uhttpd.h b/uhttpd.h
index 59f1565..897d4b3 100644 (file)
--- 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;
 };
@@ -118,6 +131,7 @@ enum client_state {
        CLIENT_STATE_DATA,
        CLIENT_STATE_DONE,
        CLIENT_STATE_CLOSE,
+       CLIENT_STATE_CLEANUP,
 };
 
 struct interpreter {
@@ -150,6 +164,9 @@ struct relay {
        struct client *cl;
 
        bool process_done;
+       bool error;
+       bool skip_data;
+
        int ret;
        int header_ofs;
 
@@ -186,7 +203,6 @@ struct dispatch_ubus {
        struct json_object *jsobj_cur;
        int post_len;
 
-       const char *sid;
        uint32_t obj;
        const char *func;
 
@@ -223,6 +239,7 @@ struct dispatch {
 
 struct client {
        struct list_head list;
+       int refcount;
        int id;
 
        struct ustream *us;
@@ -236,6 +253,7 @@ struct client {
        enum client_state state;
        bool tls;
 
+       int http_code;
        struct http_request request;
        struct uh_addr srv_addr, peer_addr;
 
@@ -258,6 +276,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);
@@ -298,4 +318,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