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

more reasonable timeouts

This commit is contained in:
Neale Pickett 2012-03-13 20:40:28 -06:00
parent 3c4ee62af4
commit a2179d8453
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cgi.c
View File

@ -166,7 +166,6 @@ serve_cgi(char *relpath)
alarm(CGI_TIMEOUT); alarm(CGI_TIMEOUT);
cgi_parent(cin[0], cout[1], 0); cgi_parent(cin[0], cout[1], 0);
alarm(0);
exit(0); exit(0);
} else { } else {

12
eris.c
View File

@ -48,12 +48,18 @@
/* Wait this long (seconds) for a valid HTTP request */ /* Wait this long (seconds) for a valid HTTP request */
#define READTIMEOUT 2 #define READTIMEOUT 2
/* Wait this long trying to write out the response */ /* Wait this long (seconds) for a non-file send to complete */
#define WRITETIMEOUT 20 #define WRITETIMEOUT 10
/* Quit if we can't write at least this many bytes per second */
#define MIN_WRITE_RATE 2560
/* Wait this long for CGI to complete */ /* Wait this long for CGI to complete */
#define CGI_TIMEOUT (5*60) #define CGI_TIMEOUT (5*60)
/* How long each sendfile call can take */
#define SENDFILE_TIMEOUT ((int)(SIZE_MAX / MIN_WRITE_RATE))
/* Maximum size of a request header (the whole block) */ /* Maximum size of a request header (the whole block) */
#define MAXHEADERLEN 8192 #define MAXHEADERLEN 8192
@ -349,6 +355,7 @@ serve_file(int fd, char *filename, struct stat *st)
size_t count = min(remain, SIZE_MAX); size_t count = min(remain, SIZE_MAX);
ssize_t sent; ssize_t sent;
alarm(SENDFILE_TIMEOUT);
sent = sendfile(1, fd, &range_start, count); sent = sendfile(1, fd, &range_start, count);
if (-1 == sent) { if (-1 == sent) {
fake_sendfile(1, fd, &range_start, count); fake_sendfile(1, fd, &range_start, count);
@ -730,6 +737,7 @@ handle_request()
} }
/* Serve the file */ /* Serve the file */
alarm(WRITETIMEOUT);
cork(1); cork(1);
find_serve_file(fspath); find_serve_file(fspath);
fflush(stdout); fflush(stdout);