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

Output blank line in badrequest

This commit is contained in:
Neale Pickett 2014-10-25 04:27:21 +00:00
parent 0b4f892169
commit 7a4ac95441
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eris.c
View File

@ -154,7 +154,7 @@ badrequest(long code, const char *httpcomment, const char *message)
if (message) { if (message) {
msglen = (strlen(message) * 2) + 15; msglen = (strlen(message) * 2) + 15;
printf("Content-Length: %lu\r\nContent-Type: text/html\r\n", printf("Content-Length: %lu\r\nContent-Type: text/html\r\n\r\n",
(unsigned long) msglen); (unsigned long) msglen);
printf("<title>%s</title>%s", message, message); printf("<title>%s</title>%s", message, message);
} }
@ -335,6 +335,7 @@ cgi_parent(int cin, int cout, int passthru)
fcntl(cin, F_SETFL, O_NONBLOCK); fcntl(cin, F_SETFL, O_NONBLOCK);
signal(SIGCHLD, sigchld); signal(SIGCHLD, sigchld);
signal(SIGPIPE, SIG_IGN); /* NO! no signal! */ signal(SIGPIPE, SIG_IGN); /* NO! no signal! */
signal(SIGALRM, sigalarm_cgi);
while (1) { while (1) {
int nfds; int nfds;
@ -356,6 +357,7 @@ cgi_parent(int cin, int cout, int passthru)
cout = -1; cout = -1;
} }
alarm(CGI_TIMEOUT);
if (-1 == select(nfds+1, &rfds, &wfds, NULL, NULL)) { if (-1 == select(nfds+1, &rfds, &wfds, NULL, NULL)) {
break; break;
} }
@ -476,8 +478,6 @@ serve_cgi(char *relpath)
/* Eris is not this smart yet */ /* Eris is not this smart yet */
keepalive = 0; keepalive = 0;
alarm(CGI_TIMEOUT);
signal(SIGALRM, sigalarm_cgi);
cgi_parent(cin[0], cout[1], 0); cgi_parent(cin[0], cout[1], 0);
exit(0); exit(0);