fixes for json 0.12

[oweals/uhttpd.git] / uhttpd.h

diff --git a/uhttpd.h b/uhttpd.h
index cace950fc41b0d4bc26b907ff2f4c0f9f38f0004..1c82d76cd3f98a9c00f97be50b1817da4d035848 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>
@@ -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;
@@ -67,6 +68,7 @@ struct config {
        int http_keepalive;
        int script_timeout;
        int ubus_noauth;
+       int ubus_cors;
 };
 
 struct auth_realm {
@@ -80,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 {
@@ -240,6 +243,7 @@ struct client {
        enum client_state state;
        bool tls;
 
+       int http_code;
        struct http_request request;
        struct uh_addr srv_addr, peer_addr;