Remove all remaining instances in Apache code of

ap_{block,unblock}_alarms.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85265 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index 270e8f67afcaca8eddba660ff0f8632b09c52053..2ff36d36e81c252e504383c5c80114d2c840e496 100644 (file)
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -310,8 +310,6 @@ static ap_status_t run_cgi_child(BUFF **script_out, BUFF **script_in, BUFF **scr
     int i;
 #endif
 
-    ap_block_alarms();
-
     RAISE_SIGSTOP(CGI_CHILD);
 #ifdef DEBUG_CGI
     fprintf(dbg, "Attempting to exec %s as %sCGI child (argv0 = %s)\n",
@@ -381,7 +379,6 @@ static ap_status_t run_cgi_child(BUFF **script_out, BUFF **script_in, BUFF **scr
             ap_bsetopt(*script_err, BO_TIMEOUT, &r->server->timeout);
         }
     }
-    ap_unblock_alarms();
     return (rc);
 }
 static ap_status_t build_argv_list(char ***argv, request_rec *r, ap_pool_t *p)

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 9a3ebc96311c908d78a6f919acaa8e07df4bb96b..6e5404c6f17e09046a8c76f94ba07015bcff343a 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3413,8 +3413,6 @@ static int rewritemap_program_child(ap_pool_t *p, char *progname,
     ap_procattr_t *procattr;
     ap_proc_t *procnew;
 
-    ap_block_alarms();
-
 #ifdef SIGHUP
     ap_signal(SIGHUP, SIG_IGN);
 #endif
@@ -3450,8 +3448,6 @@ static int rewritemap_program_child(ap_pool_t *p, char *progname,
         }
     }
 
-    ap_unblock_alarms();
-
     return (rc);
 }
 

diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index 21cfc16c2821728f08d52a0753312ae25fd39865..55dabdc6fb4070f1fa575bf41584d80ec23f80a7 100644 (file)
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -2158,8 +2158,6 @@ static int uncompress_child(struct uncompress_parms *parm, ap_pool_t *cntxt,
     ap_file_t *file = NULL;
     ap_iol *iol;
 
-    ap_block_alarms();
-
     env = ap_create_environment(child_context, r->subprocess_env);
 
     if ((ap_createprocattr_init(&procattr, child_context) != APR_SUCCESS) ||
@@ -2203,7 +2201,6 @@ static int uncompress_child(struct uncompress_parms *parm, ap_pool_t *cntxt,
             ap_bpush_iol(*script_in, iol);
         }
     }
-    ap_unblock_alarms();
 
     return (rc);
 }

diff --git a/server/log.c b/server/log.c
index c719e7ce05c62f0f8b02c86cdc9e299bd490211d..d63bcc5efefad597392b6527a7234165702d20db 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -197,8 +197,6 @@ static int log_child(ap_pool_t *p, const char *progname,
         }
     }
 
-    ap_unblock_alarms();
-
     return(rc);
 }
 

diff --git a/server/util.c b/server/util.c
index 9e4344aeedcf5f26da0b9ce83c8aed262452a185..bc8b9c55e31447a2fae1af8e55e831ea043f21a9 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -275,10 +275,8 @@ API_EXPORT(regex_t *) ap_pregcomp(ap_pool_t *p, const char *pattern,
 
 API_EXPORT(void) ap_pregfree(ap_pool_t *p, regex_t * reg)
 {
-    ap_block_alarms();
     regfree(reg);
     ap_kill_cleanup(p, (void *) reg, regex_cleanup);
-    ap_unblock_alarms();
 }
 
 /*

diff --git a/support/httpd.exp b/support/httpd.exp
index b6976c210df20a66409b4c108bd2a3c3ad757c14..38129d337e74ba8fafc728608bbc8a0556fa04e9 100644 (file)
--- a/support/httpd.exp
+++ b/support/httpd.exp
@@ -39,7 +39,6 @@ ap_bgetopt
 ap_bgets
 ap_bhalfduplex
 ap_bind_address
-ap_block_alarms
 ap_blookc
 ap_bnonblock
 ap_bonerror
@@ -356,7 +355,6 @@ ap_threads_per_child
 ap_tm2sec
 ap_translate_name
 ap_uname2id
-ap_unblock_alarms
 ap_unescape_url
 ap_unparse_uri_components
 ap_unregister_other_child