X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuhttpd.git;a=blobdiff_plain;f=uhttpd.h;h=b2404f400efa5b238da4fd35e3d47dfffcc2b167;hp=22653b50bdf6916adc51defa5049fb8b2514c771;hb=9c767787dba81bd5713e1a45eef8b381e7d4b79b;hpb=b016f111233e840da8879b1fe933b72aa8ac625f

diff --git a/uhttpd.h b/uhttpd.h
index 22653b5..b2404f4 100644
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -33,7 +33,6 @@
 #include "utils.h"
 
 #define UH_LIMIT_CLIENTS	64
-#define UH_LIMIT_HEADERS	64
 
 #define __enum_header(_name) HDR_##_name,
 #define __blobmsg_header(_name) [HDR_##_name] = { .name = #_name, .type = BLOBMSG_TYPE_STRING },
@@ -80,6 +79,9 @@ struct http_request {
 	enum http_method method;
 	enum http_version version;
 	int redirect_status;
+	int content_length;
+	bool expect_cont;
+	uint8_t transfer_chunked;
 	const char *url;
 	const struct auth_realm *realm;
 };
@@ -104,6 +106,7 @@ struct path_info {
 	const char *name;
 	const char *info;
 	const char *query;
+	const char *auth;
 	bool redirected;
 	struct stat stat;
 	const struct interpreter *ip;
@@ -136,12 +139,23 @@ struct dispatch_handler {
 	void (*handle_request)(struct client *cl, const char *url, struct path_info *pi);
 };
 
-struct uh_addr {
-	uint8_t family;
-	uint16_t port;
+struct dispatch {
+	void (*data_send)(struct client *cl, const char *data, int len);
+	void (*data_done)(struct client *cl);
+	void (*write_cb)(struct client *cl);
+	void (*close_fds)(struct client *cl);
+	void (*free)(struct client *cl);
 	union {
-		struct in_addr in;
-		struct in6_addr in6;
+		struct {
+			struct blob_attr **hdr;
+			int fd;
+		} file;
+		struct {
+			struct blob_buf hdr;
+			struct relay r;
+			int status_code;
+			char *status_msg;
+		} proc;
 	};
 };
 
@@ -162,24 +176,7 @@ struct client {
 	struct uh_addr srv_addr, peer_addr;
 
 	struct blob_buf hdr;
-
-	struct {
-		void (*write_cb)(struct client *cl);
-		void (*close_fds)(struct client *cl);
-		void (*free)(struct client *cl);
-		union {
-			struct {
-				struct blob_attr **hdr;
-				int fd;
-			} file;
-			struct {
-				struct blob_buf hdr;
-				struct relay r;
-				int status_code;
-				char *status_msg;
-			} proc;
-		};
-	} dispatch;
+	struct dispatch dispatch;
 };
 
 extern char uh_buf[4096];
@@ -214,6 +211,7 @@ uh_client_error(struct client *cl, int code, const char *summary, const char *fm
 void uh_handle_request(struct client *cl);
 
 void uh_auth_add(const char *path, const char *user, const char *pass);
+bool uh_auth_check(struct client *cl, struct path_info *pi);
 
 void uh_close_listen_fds(void);
 void uh_close_fds(void);