neale
/
eris
mirror of https://github.com/nealey/eris.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle Status: header from cgi

This commit is contained in:
Neale Pickett 2012-10-09 12:36:06 -05:00
parent 9683c12bbd
commit aaf9c85731
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cgi.c
View File

@ -42,6 +42,7 @@ cgi_parent(int cin, int cout, int passthru)
FILE *cinf = fdopen(cin, "rb"); FILE *cinf = fdopen(cin, "rb");
size_t size = 0; size_t size = 0;
int header_sent = 0; int header_sent = 0;
int code = 200;
fcntl(cin, F_SETFL, O_NONBLOCK); fcntl(cin, F_SETFL, O_NONBLOCK);
signal(SIGCHLD, sigchld); signal(SIGCHLD, sigchld);
@ -114,11 +115,15 @@ cgi_parent(int cin, int cout, int passthru)
printf("%s: %s\r\n\r\n", cgiheader, val); printf("%s: %s\r\n\r\n", cgiheader, val);
dolog(302, 0); dolog(302, 0);
exit(0); exit(0);
} } else if (! strcasecmp(cgiheader, "Status")) {
char *txt = val + 4;
code = atoi(val);
header(code, txt);
} else {
header(200, "OK"); header(200, "OK");
printf("Pragma: no-cache\r\n"); printf("Pragma: no-cache\r\n");
}
header_sent = 1; header_sent = 1;
} }
printf("%s: %s\r\n", cgiheader, val); printf("%s: %s\r\n", cgiheader, val);

15
test.sh
View File

@ -61,6 +61,15 @@ echo "Location: http://example.com/froot"
EOD EOD
chmod +x default/redir.cgi chmod +x default/redir.cgi
cat <<'EOD' > default/status.cgi
#! /bin/sh
echo "Status: 300 wat"
echo "Merf: merf"
echo
echo "james"
EOD
chmod +x default/status.cgi
mkdir -p default/empty mkdir -p default/empty
mkdir -p default/subdir mkdir -p default/subdir
touch default/subdir/a touch default/subdir/a
@ -79,10 +88,10 @@ echo "IDX: $HTTPD_IDX "
H "Basic tests" H "Basic tests"
title "GET /index.html" title "GET /index.html"
printf 'GET /index.html HTTP/1.0\r\n\r\n' | $HTTPD 2>/dev/null | d | grep -q 'HTTP/1.0 200 OK#%Server: [a-z]*/[0-9.]*#%Connection: close#%Content-Type: text/html; charset=UTF-8#%Content-Length: 6#%Last-Modified: ..., .. ... 20.. ..:..:.. GMT#%#%james%' && pass || fail printf 'GET /index.html HTTP/1.0\r\n\r\n' | $HTTPD 2>/dev/null | d | grep -q 'HTTP/1.0 200 OK#%Server: [a-z]*/[0-9a-z.]*#%Connection: close#%Content-Type: text/html; charset=UTF-8#%Content-Length: 6#%Last-Modified: ..., .. ... 20.. ..:..:.. GMT#%#%james%' && pass || fail
title "GET /" title "GET /"
printf 'GET / HTTP/1.0\r\n\r\n' | $HTTPD 2>/dev/null | d | grep -q 'HTTP/1.0 200 OK#%Server: [a-z]*/[0-9.]*#%Connection: close#%Content-Type: text/html; charset=UTF-8#%Content-Length: 6#%Last-Modified: ..., .. ... 20.. ..:..:.. GMT#%#%james%' && pass || fail printf 'GET / HTTP/1.0\r\n\r\n' | $HTTPD 2>/dev/null | d | grep -q 'HTTP/1.0 200 OK#%Server: [a-z]*/[0-9a-z.]*#%Connection: close#%Content-Type: text/html; charset=UTF-8#%Content-Length: 6#%Last-Modified: ..., .. ... 20.. ..:..:.. GMT#%#%james%' && pass || fail
title "Keepalive" title "Keepalive"
printf 'GET / HTTP/1.1\r\n\r\nGET / HTTP/1.1\r\n\r\n' | $HTTPD 2>/dev/null | grep -c 'james' | grep -q 2 && pass || fail printf 'GET / HTTP/1.1\r\n\r\nGET / HTTP/1.1\r\n\r\n' | $HTTPD 2>/dev/null | grep -c 'james' | grep -q 2 && pass || fail
@ -211,6 +220,8 @@ printf 'GET /mongo.cgi HTTP/1.0\r\n\r\n' | $HTTPD_CGI 2>/dev/null | grep -q jame
title "Redirect" title "Redirect"
printf 'GET /redir.cgi HTTP/1.0\r\n\r\n' | $HTTPD_CGI 2>/dev/null | grep -Fq 'Location: http://example.com/froot' && pass || fail printf 'GET /redir.cgi HTTP/1.0\r\n\r\n' | $HTTPD_CGI 2>/dev/null | grep -Fq 'Location: http://example.com/froot' && pass || fail
title "Status"
printf 'GET /status.cgi HTTP/1.0\r\n\r\n' | $HTTPD_CGI 2>/dev/null | d | grep -q '^HTTP/1.0 300 wat#%' && pass || fail
H "Timeouts" H "Timeouts"