From dc349534f3f11b8bba33d70fa3970e3dcb3507d4 Mon Sep 17 00:00:00 2001 From: "Roy T. Fielding" Date: Thu, 26 Aug 1999 17:17:22 +0000 Subject: [PATCH] Remove timeouts as part of pthreads changes. Submitted by: Bill Stoddard git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83788 13f79535-47bb-0310-9956-ffa450edef68 --- modules/filters/mod_include.c | 3 --- modules/generators/mod_autoindex.c | 4 +--- modules/generators/mod_cgi.c | 10 ---------- modules/generators/mod_info.c | 2 -- modules/mappers/mod_imap.c | 3 +-- 5 files changed, 2 insertions(+), 20 deletions(-) diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c index 4d7df16210..e1281d10ca 100644 --- a/modules/filters/mod_include.c +++ b/modules/filters/mod_include.c @@ -2400,8 +2400,6 @@ static int send_parsed_file(request_rec *r) * expect to be signal-ready to SIGALRM. There is no clean way to * fix this, except to put alarm support into BUFF. -djg */ - ap_hard_timeout("send SSI", r); - #ifdef CHARSET_EBCDIC /* XXX:@@@ Is the generated/included output ALWAYS in text/ebcdic format? */ ap_bsetflag(r->connection->client, B_EBCDIC2ASCII, 1); @@ -2415,7 +2413,6 @@ static int send_parsed_file(request_rec *r) NESTED_INCLUDE_MAGIC); } - ap_kill_timeout(r); return OK; } diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c index 99b2c88d9b..af25717972 100644 --- a/modules/generators/mod_autoindex.c +++ b/modules/generators/mod_autoindex.c @@ -1151,7 +1151,7 @@ static struct ent *make_autoindex_entry(char *name, int autoindex_opts, p->ascending = (ap_toupper(direction) == D_ASCENDING); if (autoindex_opts & FANCY_INDEXING) { - request_rec *rr = ap_sub_req_lookup_file(name, r); + request_rec *rr = ap_sub_req_lookup_file(name, r); if (rr->finfo.st_mode != 0) { p->lm = rr->finfo.st_mtime; @@ -1521,7 +1521,6 @@ static int index_directory(request_rec *r, ap_pclosedir(r->pool, d); return 0; } - ap_hard_timeout("send directory", r); /* Spew HTML preamble */ @@ -1603,7 +1602,6 @@ static int index_directory(request_rec *r, emit_tail(r, find_readme(autoindex_conf, r), autoindex_opts & SUPPRESS_PREAMBLE); - ap_kill_timeout(r); return 0; } diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c index 3a6a110adc..585740ee9e 100644 --- a/modules/generators/mod_cgi.c +++ b/modules/generators/mod_cgi.c @@ -474,8 +474,6 @@ static int cgi_handler(request_rec *r) dbpos = 0; } - ap_hard_timeout("copy script args", r); - while ((len_read = ap_get_client_block(r, argsbuffer, HUGE_STRING_LEN)) > 0) { if (conf->logname) { @@ -488,7 +486,6 @@ static int cgi_handler(request_rec *r) memcpy(dbuf + dbpos, argsbuffer, dbsize); dbpos += dbsize; } - ap_reset_timeout(r); if (ap_bwrite(script_out, argsbuffer, len_read) < len_read) { /* silly script stopped reading, soak up remaining message */ while (ap_get_client_block(r, argsbuffer, HUGE_STRING_LEN) > 0) { @@ -500,7 +497,6 @@ static int cgi_handler(request_rec *r) ap_bflush(script_out); - ap_kill_timeout(r); } ap_bclose(script_out); @@ -525,16 +521,12 @@ static int cgi_handler(request_rec *r) if (location && location[0] == '/' && r->status == 200) { /* Soak up all the script output */ - ap_hard_timeout("read from script", r); while (ap_bgets(argsbuffer, HUGE_STRING_LEN, script_in) > 0) { continue; } while (ap_bgets(argsbuffer, HUGE_STRING_LEN, script_err) > 0) { continue; } - ap_kill_timeout(r); - - /* This redirect needs to be a GET no matter what the original * method was. */ @@ -563,11 +555,9 @@ static int cgi_handler(request_rec *r) } ap_bclose(script_in); - ap_soft_timeout("soaking script stderr", r); while (ap_bgets(argsbuffer, HUGE_STRING_LEN, script_err) > 0) { continue; } - ap_kill_timeout(r); ap_bclose(script_err); } diff --git a/modules/generators/mod_info.c b/modules/generators/mod_info.c index 2799585578..47a082867c 100644 --- a/modules/generators/mod_info.c +++ b/modules/generators/mod_info.c @@ -376,7 +376,6 @@ static int display_info(request_rec *r) if (r->header_only) { return 0; } - ap_hard_timeout("send server info", r); ap_rputs(DOCTYPE_HTML_3_2 "Server Information\n", r); @@ -641,7 +640,6 @@ static int display_info(request_rec *r) ap_rputs(ap_psignature("",r), r); ap_rputs("\n", r); /* Done, turn off timeout, close file and return */ - ap_kill_timeout(r); return 0; } diff --git a/modules/mappers/mod_imap.c b/modules/mappers/mod_imap.c index 9e387cb4f7..1839d93264 100644 --- a/modules/mappers/mod_imap.c +++ b/modules/mappers/mod_imap.c @@ -506,7 +506,7 @@ static void menu_header(request_rec *r, char *menu) { r->content_type = "text/html"; ap_send_http_header(r); - ap_hard_timeout("send menu", r); /* killed in menu_footer */ + ap_rvputs(r, DOCTYPE_HTML_3_2, "\nMenu for ", r->uri, "\n\n", NULL); @@ -590,7 +590,6 @@ static void menu_directive(request_rec *r, char *menu, char *href, char *text) static void menu_footer(request_rec *r) { ap_rputs("\n\n\n\n", r); /* finish the menu */ - ap_kill_timeout(r); } static int imap_handler(request_rec *r) -- 2.50.1