fix the alias support

[project/uhttpd.git] / uhttpd.h

diff --git a/uhttpd.h b/uhttpd.h
index cace950..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;
 };
@@ -240,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;
 
@@ -262,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);