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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 4d7df16210109142b958db64bc5a6ccc1add52f4..e1281d10cad0624e38ff76eba17129983cc40c5c 100644 (file)
--- 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 99b2c88d9bfcab31dde5475816083fdff085e8b7..af25717972836a75c0d37ebec19b34a273abb672 100644 (file)
--- 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 3a6a110adca2ba8bf312d44ce12f8896ca2975c6..585740ee9ee8922bf9a6e732118c23350ad669a5 100644 (file)
--- 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 279958557805a045d26745ab540eef33b6894912..47a082867c67e72ced921ad91b810a9f9c068a49 100644 (file)
--- 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
             "<html><head><title>Server Information</title></head>\n", r);
@@ -641,7 +640,6 @@ static int display_info(request_rec *r)
     ap_rputs(ap_psignature("",r), r);
     ap_rputs("</body></html>\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 9e387cb4f7f81c7fa3a42763e47eb1304a4eb3a9..1839d9326488e7d1d37c44660324866a8a0b33a9 100644 (file)
--- 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, "<html><head>\n<title>Menu for ", r->uri,
            "</title>\n</head><body>\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</body>\n</html>\n", r);         /* finish the menu */
-    ap_kill_timeout(r);
 }
 
 static int imap_handler(request_rec *r)