ath9k: merge some more pending fixes - should improve throughput

[openwrt.git] / package / uhttpd / src / uhttpd-cgi.c

diff --git a/package/uhttpd/src/uhttpd-cgi.c b/package/uhttpd/src/uhttpd-cgi.c
index 8bd2250..855a72f 100644 (file)
--- a/package/uhttpd/src/uhttpd-cgi.c
+++ b/package/uhttpd/src/uhttpd-cgi.c
@@ -68,7 +68,7 @@ static struct http_response * uh_cgi_header_parse(char *buf, int len, int *off)
                                if( (pos < len) && (buf[pos] == '\n') )
                                        pos++;
 
                                if( (pos < len) && (buf[pos] == '\n') )
                                        pos++;
 

-                               if( pos < len )
+                               if( pos <= len )

                                {
                                        if( (hdrcount + 1) < array_size(res.headers) )
                                        {
                                {
                                        if( (hdrcount + 1) < array_size(res.headers) )
                                        {


@@ -376,7 +376,7 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
                                FD_SET(wfd[1], &writer);
 
                                /* wait until we can read or write or both */
                                FD_SET(wfd[1], &writer);
 
                                /* wait until we can read or write or both */

-                               if( select(fd_max, &reader,
+                               if( select_intr(fd_max, &reader,

                                        (content_length > -1) ? &writer : NULL, NULL,
                                        (header_sent < 1) ? &timeout : NULL) > 0
                                ) {
                                        (content_length > -1) ? &writer : NULL, NULL,
                                        (header_sent < 1) ? &timeout : NULL) > 0
                                ) {


@@ -562,7 +562,10 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
                        close(wfd[1]);
 
                        if( !kill(child, 0) )
                        close(wfd[1]);
 
                        if( !kill(child, 0) )

+                       {

                                kill(child, SIGTERM);
                                kill(child, SIGTERM);

+                               waitpid(child, NULL, 0);
+                       }

 
                        break;
        }
 
                        break;
        }