use pipes instead of a socketpair, EOF handling is broken with sockets

[project/uhttpd.git] / uhttpd.h

diff --git a/uhttpd.h b/uhttpd.h
index e92c469..a9777e8 100644 (file)
--- a/uhttpd.h
+++ b/uhttpd.h
@@ -78,9 +78,10 @@ enum http_version {
 struct http_request {
        enum http_method method;
        enum http_version version;
-       bool expect_cont;
        int redirect_status;
-       const char *url;
+       int content_length;
+       bool expect_cont;
+       uint8_t transfer_chunked;
        const struct auth_realm *realm;
 };
 
@@ -129,6 +130,14 @@ struct relay {
        void (*close)(struct relay *r, int ret);
 };
 
+struct dispatch_proc {
+       struct blob_buf hdr;
+       struct uloop_fd wrfd;
+       struct relay r;
+       int status_code;
+       char *status_msg;
+};
+
 struct dispatch_handler {
        struct list_head list;
 
@@ -138,20 +147,19 @@ struct dispatch_handler {
 };
 
 struct dispatch {
+       int (*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);
+       bool data_blocked;
+
        union {
                struct {
                        struct blob_attr **hdr;
                        int fd;
                } file;
-               struct {
-                       struct blob_buf hdr;
-                       struct relay r;
-                       int status_code;
-                       char *status_msg;
-               } proc;
+               struct dispatch_proc proc;
        };
 };
 
@@ -205,6 +213,7 @@ void __printf(4, 5)
 uh_client_error(struct client *cl, int code, const char *summary, const char *fmt, ...);
 
 void uh_handle_request(struct client *cl);
+void client_poll_post_data(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);
@@ -221,6 +230,6 @@ void uh_relay_free(struct relay *r);
 
 struct env_var *uh_get_process_vars(struct client *cl, struct path_info *pi);
 bool uh_create_process(struct client *cl, struct path_info *pi,
-                      void (*cb)(struct client *cl, struct path_info *pi, int fd));
+                      void (*cb)(struct client *cl, struct path_info *pi));
 
 #endif