projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] kernel: rename kmod-switch-rtl8366_smi to kmod-switch-rtl8366-smi to avoid...
[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
4a30f2f
..
16bfda7
100644
(file)
--- a/
package/uhttpd/src/uhttpd-cgi.c
+++ b/
package/uhttpd/src/uhttpd-cgi.c
@@
-1,7
+1,7
@@
/*
* uhttpd - Tiny single-threaded httpd - CGI handler
*
/*
* uhttpd - Tiny single-threaded httpd - CGI handler
*
- * Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
+ * Copyright (C) 2010
-2011
Jo-Philipp Wich <xm@subsignal.org>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-42,7
+42,7
@@
static struct http_response * uh_cgi_header_parse(char *buf, int len, int *off)
bufptr = &buf[0];
bufptr = &buf[0];
- for( pos = 0; pos <
len
; pos++ )
+ for( pos = 0; pos <
*off
; pos++ )
{
if( !hdrname && (buf[pos] == ':') )
{
{
if( !hdrname && (buf[pos] == ':') )
{
@@
-60,15
+60,15
@@
static struct http_response * uh_cgi_header_parse(char *buf, int len, int *off)
else if( (buf[pos] == '\r') || (buf[pos] == '\n') )
{
else if( (buf[pos] == '\r') || (buf[pos] == '\n') )
{
- buf[pos++] = 0;
-
if( ! hdrname )
break;
if( ! hdrname )
break;
+ buf[pos++] = 0;
+
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;
@@
-155,6
+157,8
@@
void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
fd_set reader;
fd_set writer;
fd_set reader;
fd_set writer;
+ sigset_t ss;
+
struct sigaction sa;
struct timeval timeout;
struct http_response *res;
struct sigaction sa;
struct timeval timeout;
struct http_response *res;
@@
-185,6
+189,10
@@
void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
/* exec child */
case 0:
/* exec child */
case 0:
+ /* unblock signals */
+ sigemptyset(&ss);
+ sigprocmask(SIG_SETMASK, &ss, NULL);
+
/* restore SIGTERM */
sa.sa_flags = 0;
sa.sa_handler = SIG_DFL;
/* restore SIGTERM */
sa.sa_flags = 0;
sa.sa_handler = SIG_DFL;
@@
-199,9
+207,13
@@
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)
+ /* avoid leaking our pipe into child-child processes */
+ fd_cloexec(rfd[1]);
+ fd_cloexec(wfd[0]);
+
+ /* 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
+246,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
+332,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
+386,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
+395,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 =
cl->server->conf->script_timeout
;
+ 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
+417,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
+473,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
+483,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
+491,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
+527,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
+535,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
+555,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,11
+563,11
@@
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;
}
}
@@
-543,13
+578,13
@@
void uh_cgi_request(struct client *cl, struct http_request *req, struct path_inf
{
if( (errno != EINTR) && ! header_sent )
{
{
if( (errno != EINTR) && ! header_sent )
{
- ensure(uh_http_sendhf(cl, 504, "Gateway Timeout",
+ 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 */
"The CGI script took too long to produce "
"a response"));
}
/* 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;
}
@@
-560,7
+595,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;
}
This page took
0.039695 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff