uClibc: fix version check for 0.9.32

[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 5565197..8c17251 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) )
                                        {


@@ -135,9 +135,11 @@ static int uh_cgi_error_500(struct client *cl, struct http_request *req, const c
 }
 
 
 }
 
 

-void uh_cgi_request(struct client *cl, struct http_request *req, struct path_info *pi)
-{
-       int i, hdroff, bufoff;
+void uh_cgi_request(
+       struct client *cl, struct http_request *req,
+       struct path_info *pi, struct interpreter *ip
+) {
+       int i, hdroff, bufoff, rv;

        int hdrlen = 0;
        int buflen = 0;
        int fd_max = 0;
        int hdrlen = 0;
        int buflen = 0;
        int fd_max = 0;


@@ -199,9 +201,9 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
                        dup2(rfd[1], 1);
                        dup2(wfd[0], 0);
 
                        dup2(rfd[1], 1);
                        dup2(wfd[0], 0);
 

-                       /* check for regular, world-executable file */
-                       if( (pi->stat.st_mode & S_IFREG) &&
-                           (pi->stat.st_mode & S_IXOTH)
+                       /* check for regular, world-executable file _or_ interpreter */
+                       if( ((pi->stat.st_mode & S_IFREG) &&
+                            (pi->stat.st_mode & S_IXOTH)) || (ip != NULL)

                        ) {
                                /* build environment */
                                clearenv();
                        ) {
                                /* build environment */
                                clearenv();


@@ -234,6 +236,17 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
                                if( pi->info )
                                        setenv("PATH_INFO", pi->info, 1);
 
                                if( pi->info )
                                        setenv("PATH_INFO", pi->info, 1);
 

+                               /* REDIRECT_STATUS, php-cgi wants it */
+                               switch( req->redirect_status )
+                               {
+                                       case 404:
+                                               setenv("REDIRECT_STATUS", "404", 1);
+                                               break;
+
+                                       default:
+                                               setenv("REDIRECT_STATUS", "200", 1);
+                                               break;
+                               }

 
                                /* http version */
                                if( req->version > 1.0 )
 
                                /* http version */
                                if( req->version > 1.0 )


@@ -309,14 +322,17 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
                                if( chdir(pi->root) )
                                        perror("chdir()");
 
                                if( chdir(pi->root) )
                                        perror("chdir()");
 

-                               execl(pi->phys, pi->phys, NULL);
+                               if( ip != NULL )
+                                       execl(ip->path, ip->path, pi->phys, NULL);
+                               else
+                                       execl(pi->phys, pi->phys, NULL);

 
                                /* in case it fails ... */
                                printf(
                                        "Status: 500 Internal Server Error\r\n\r\n"
                                        "Unable to launch the requested CGI program:\n"
                                        "  %s: %s\n",
 
                                /* in case it fails ... */
                                printf(
                                        "Status: 500 Internal Server Error\r\n\r\n"
                                        "Unable to launch the requested CGI program:\n"
                                        "  %s: %s\n",

-                                               pi->phys, strerror(errno)
+                                               ip ? ip->path : pi->phys, strerror(errno)

                                );
                        }
 
                                );
                        }
 


@@ -360,9 +376,6 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
 
                        memset(hdr, 0, sizeof(hdr));
 
 
                        memset(hdr, 0, sizeof(hdr));
 

-#define ensure(x) \
-       do { if( x < 0 ) goto out; } while(0)
-

                        /* I/O loop, watch our pipe ends and dispatch child reads/writes from/to socket */
                        while( 1 )
                        {
                        /* I/O loop, watch our pipe ends and dispatch child reads/writes from/to socket */
                        while( 1 )
                        {


@@ -372,11 +385,20 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
                                FD_SET(rfd[0], &reader);
                                FD_SET(wfd[1], &writer);
 
                                FD_SET(rfd[0], &reader);
                                FD_SET(wfd[1], &writer);
 

-                               timeout.tv_sec = 15;
+                               timeout.tv_sec = (header_sent < 1) ? cl->server->conf->script_timeout : 3;

                                timeout.tv_usec = 0;
 
                                timeout.tv_usec = 0;
 

+                               ensure_out(rv = select_intr(fd_max, &reader,
+                                       (content_length > -1) ? &writer : NULL, NULL, &timeout));
+
+                               /* timeout */
+                               if( rv == 0 )
+                               {
+                                       ensure_out(kill(child, 0));
+                               }
+

                                /* wait until we can read or write or both */
                                /* wait until we can read or write or both */

-                               if( select(fd_max, &reader, (content_length > -1) ? &writer : NULL, NULL, &timeout) > 0 )
+                               else if( rv > 0 )

                                {
                                        /* ready to write to cgi program */
                                        if( FD_ISSET(wfd[1], &writer) )
                                {
                                        /* ready to write to cgi program */
                                        if( FD_ISSET(wfd[1], &writer) )


@@ -385,7 +407,10 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
                                                if( content_length > 0 )
                                                {
                                                        /* read it from socket ... */
                                                if( content_length > 0 )
                                                {
                                                        /* read it from socket ... */

-                                                       if( (buflen = uh_tcp_recv(cl, buf, min(content_length, sizeof(buf)))) > 0 )
+                                                       ensure_out(buflen = uh_tcp_recv(cl, buf,
+                                                               min(content_length, sizeof(buf))));
+
+                                                       if( buflen > 0 )

                                                        {
                                                                /* ... and write it to child's stdin */
                                                                if( write(wfd[1], buf, buflen) < 0 )
                                                        {
                                                                /* ... and write it to child's stdin */
                                                                if( write(wfd[1], buf, buflen) < 0 )


@@ -438,7 +463,7 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
                                                                if( (res = uh_cgi_header_parse(hdr, hdrlen, &hdroff)) != NULL )
                                                                {
                                                                        /* write status */
                                                                if( (res = uh_cgi_header_parse(hdr, hdrlen, &hdroff)) != NULL )
                                                                {
                                                                        /* write status */

-                                                                       ensure(uh_http_sendf(cl, NULL,
+                                                                       ensure_out(uh_http_sendf(cl, NULL,

                                                                                "HTTP/%.1f %03d %s\r\n"
                                                                                "Connection: close\r\n",
                                                                                req->version, res->statuscode,
                                                                                "HTTP/%.1f %03d %s\r\n"
                                                                                "Connection: close\r\n",
                                                                                req->version, res->statuscode,


@@ -448,7 +473,7 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
                                                                        if( !uh_cgi_header_lookup(res, "Location") &&
                                                                            !uh_cgi_header_lookup(res, "Content-Type")
                                                                        ) {
                                                                        if( !uh_cgi_header_lookup(res, "Location") &&
                                                                            !uh_cgi_header_lookup(res, "Content-Type")
                                                                        ) {

-                                                                               ensure(uh_http_send(cl, NULL,
+                                                                               ensure_out(uh_http_send(cl, NULL,

                                                                                        "Content-Type: text/plain\r\n", -1));
                                                                        }
 
                                                                                        "Content-Type: text/plain\r\n", -1));
                                                                        }
 


@@ -456,32 +481,32 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
                                                                        if( (req->version > 1.0) &&
                                                                            !uh_cgi_header_lookup(res, "Transfer-Encoding")
                                                                        ) {
                                                                        if( (req->version > 1.0) &&
                                                                            !uh_cgi_header_lookup(res, "Transfer-Encoding")
                                                                        ) {

-                                                                               ensure(uh_http_send(cl, NULL,
+                                                                               ensure_out(uh_http_send(cl, NULL,

                                                                                        "Transfer-Encoding: chunked\r\n", -1));
                                                                        }
 
                                                                        /* write headers from CGI program */
                                                                        foreach_header(i, res->headers)
                                                                        {
                                                                                        "Transfer-Encoding: chunked\r\n", -1));
                                                                        }
 
                                                                        /* write headers from CGI program */
                                                                        foreach_header(i, res->headers)
                                                                        {

-                                                                               ensure(uh_http_sendf(cl, NULL, "%s: %s\r\n",
+                                                                               ensure_out(uh_http_sendf(cl, NULL, "%s: %s\r\n",

                                                                                        res->headers[i], res->headers[i+1]));
                                                                        }
 
                                                                        /* terminate header */
                                                                                        res->headers[i], res->headers[i+1]));
                                                                        }
 
                                                                        /* terminate header */

-                                                                       ensure(uh_http_send(cl, NULL, "\r\n", -1));
+                                                                       ensure_out(uh_http_send(cl, NULL, "\r\n", -1));

 
                                                                        /* push out remaining head buffer */
                                                                        if( hdroff < hdrlen )
 
                                                                        /* push out remaining head buffer */
                                                                        if( hdroff < hdrlen )

-                                                                               ensure(uh_http_send(cl, req, &hdr[hdroff], hdrlen - hdroff));
+                                                                               ensure_out(uh_http_send(cl, req, &hdr[hdroff], hdrlen - hdroff));

                                                                }
 
                                                                /* ... failed and head buffer exceeded */
                                                                else if( hdrlen >= sizeof(hdr) )
                                                                {
                                                                }
 
                                                                /* ... failed and head buffer exceeded */
                                                                else if( hdrlen >= sizeof(hdr) )
                                                                {

-                                                                       ensure(uh_cgi_error_500(cl, req,
+                                                                       ensure_out(uh_cgi_error_500(cl, req,

                                                                                "The CGI program generated an invalid response:\n\n"));
 
                                                                                "The CGI program generated an invalid response:\n\n"));
 

-                                                                       ensure(uh_http_send(cl, req, hdr, hdrlen));
+                                                                       ensure_out(uh_http_send(cl, req, hdr, hdrlen));

                                                                }
 
                                                                /* ... failed but free buffer space, try again */
                                                                }
 
                                                                /* ... failed but free buffer space, try again */


@@ -492,7 +517,7 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
 
                                                                /* push out remaining read buffer */
                                                                if( bufoff < buflen )
 
                                                                /* push out remaining read buffer */
                                                                if( bufoff < buflen )

-                                                                       ensure(uh_http_send(cl, req, &buf[bufoff], buflen - bufoff));
+                                                                       ensure_out(uh_http_send(cl, req, &buf[bufoff], buflen - bufoff));

 
                                                                header_sent = 1;
                                                                continue;
 
                                                                header_sent = 1;
                                                                continue;


@@ -500,7 +525,7 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
 
 
                                                        /* headers complete, pass through buffer to socket */
 
 
                                                        /* headers complete, pass through buffer to socket */

-                                                       ensure(uh_http_send(cl, req, buf, buflen));
+                                                       ensure_out(uh_http_send(cl, req, buf, buflen));

                                                }
 
                                                /* looks like eof from child */
                                                }
 
                                                /* looks like eof from child */


@@ -520,7 +545,7 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
                                                                 * build the required headers here.
                                                                 */
 
                                                                 * build the required headers here.
                                                                 */
 

-                                                               ensure(uh_http_sendf(cl, NULL,
+                                                               ensure_out(uh_http_sendf(cl, NULL,

                                                                        "HTTP/%.1f 200 OK\r\n"
                                                                        "Content-Type: text/plain\r\n"
                                                                        "%s\r\n",
                                                                        "HTTP/%.1f 200 OK\r\n"
                                                                        "Content-Type: text/plain\r\n"
                                                                        "%s\r\n",


@@ -528,21 +553,28 @@ void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
                                                                                        ? "Transfer-Encoding: chunked\r\n" : ""
                                                                ));
 
                                                                                        ? "Transfer-Encoding: chunked\r\n" : ""
                                                                ));
 

-                                                               ensure(uh_http_send(cl, req, hdr, hdrlen));
+                                                               ensure_out(uh_http_send(cl, req, hdr, hdrlen));

                                                        }
 
                                                        /* send final chunk if we're in chunked transfer mode */
                                                        }
 
                                                        /* send final chunk if we're in chunked transfer mode */

-                                                       ensure(uh_http_send(cl, req, "", 0));
+                                                       ensure_out(uh_http_send(cl, req, "", 0));

                                                        break;
                                                }
                                        }
                                }
 
                                                        break;
                                                }
                                        }
                                }
 

-                               /* no activity for 15 seconds... looks dead */
+                               /* timeout exceeded or interrupted by SIGCHLD */

                                else
                                {
                                else
                                {

-                                       ensure(uh_http_sendhf(cl, 504, "Gateway Timeout",
-                                               "The CGI script took too long to produce a response"));
+                                       if( (errno != EINTR) && ! header_sent )
+                                       {
+                                               ensure_out(uh_http_sendhf(cl, 504, "Gateway Timeout",
+                                                       "The CGI script took too long to produce "
+                                                       "a response"));
+                                       }
+
+                                       /* send final chunk if we're in chunked transfer mode */
+                                       ensure_out(uh_http_send(cl, req, "", 0));

 
                                        break;
                                }
 
                                        break;
                                }


@@ -553,7 +585,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;
        }