ath9k: fix various calibration related bugs and clean up the code

[openwrt.git] / package / uhttpd / src / uhttpd.h

diff --git a/package/uhttpd/src/uhttpd.h b/package/uhttpd/src/uhttpd.h
index bb08afa..c8fdaf4 100644 (file)
--- a/package/uhttpd/src/uhttpd.h
+++ b/package/uhttpd/src/uhttpd.h
@@ -26,12 +26,13 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/select.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/select.h>

+#include <sys/wait.h>

 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <linux/limits.h>
 #include <netdb.h>
 #include <ctype.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <linux/limits.h>
 #include <netdb.h>
 #include <ctype.h>

-
+#include <errno.h>

 #include <dlfcn.h>
 
 
 #include <dlfcn.h>
 
 


@@ -63,6 +64,11 @@ struct config {
        char docroot[PATH_MAX];
        char *realm;
        char *file;
        char docroot[PATH_MAX];
        char *realm;
        char *file;

+       char *index_file;
+       char *error_handler;
+       int no_symlinks;
+       int no_dirlists;
+       int network_timeout;

 #ifdef HAVE_CGI
        char *cgi_prefix;
 #endif
 #ifdef HAVE_CGI
        char *cgi_prefix;
 #endif


@@ -73,6 +79,9 @@ struct config {
        void (*lua_close) (lua_State *L);
        void (*lua_request) (struct client *cl, struct http_request *req, lua_State *L);
 #endif
        void (*lua_close) (lua_State *L);
        void (*lua_request) (struct client *cl, struct http_request *req, lua_State *L);
 #endif

+#if defined(HAVE_CGI) || defined(HAVE_LUA)
+       int script_timeout;
+#endif

 #ifdef HAVE_TLS
        char *cert;
        char *key;
 #ifdef HAVE_TLS
        char *cert;
        char *key;


@@ -118,6 +127,7 @@ struct auth_realm {
 struct http_request {
        int     method;
        float version;
 struct http_request {
        int     method;
        float version;

+       int redirect_status;

        char *url;
        char *headers[UH_LIMIT_HEADERS];
        struct auth_realm *realm;
        char *url;
        char *headers[UH_LIMIT_HEADERS];
        struct auth_realm *realm;