deal with the rename of kill_after_timeout to APR_KILL_AFTER_TIMEOUT

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

diff --git a/modules/experimental/mod_ext_filter.c b/modules/experimental/mod_ext_filter.c
index baff954ca186dcae41a0503f85911b9b2dd3f179..f425b5b352455def1725eebf5d9995f50bc37b29 100644 (file)
--- a/modules/experimental/mod_ext_filter.c
+++ b/modules/experimental/mod_ext_filter.c
@@ -416,7 +416,7 @@ static apr_status_t init_ext_filter_process(ap_filter_t *f)
         return rc;
     }
 
-    apr_pool_note_subprocess(ctx->p, ctx->proc, kill_after_timeout);
+    apr_pool_note_subprocess(ctx->p, ctx->proc, APR_KILL_AFTER_TIMEOUT);
 
     /* We don't want the handle to the child's stdin inherited by any
      * other processes created by httpd.  Otherwise, when we close our

diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index 400180d68b473ce5e8b59bd5414cdbb641f13f69..abc5107b8090dea620a141ed27a59bb4f3c29351 100644 (file)
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -462,7 +462,7 @@ static apr_status_t run_cgi_child(apr_file_t **script_out,
                         "couldn't create child process: %d: %s", rc, r->filename);
         }
         else {
-            apr_pool_note_subprocess(p, procnew, kill_after_timeout);
+            apr_pool_note_subprocess(p, procnew, APR_KILL_AFTER_TIMEOUT);
 
             *script_in = procnew->out;
             if (!*script_in)

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index 27a2346c427bde451d037124bb4f08d595350a9b..de1d55afd7cdf0c593e086c9264cf47495c5ad55 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -677,7 +677,7 @@ static int cgid_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
         procnew = apr_pcalloc(p, sizeof(*procnew));
         procnew->pid = daemon_pid;
         procnew->err = procnew->in = procnew->out = NULL;
-        apr_pool_note_subprocess(p, procnew, kill_after_timeout);
+        apr_pool_note_subprocess(p, procnew, APR_KILL_AFTER_TIMEOUT);
 #if APR_HAS_OTHER_CHILD
         apr_proc_other_child_register(procnew, cgid_maint, &procnew->pid, NULL, p);
 #endif

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 2408dd0f4b25e4dfeee7d5a94895739b3b1694db..d4196b0d4a8ee09796824588902572c6d172c82c 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3378,7 +3378,7 @@ static apr_status_t rewritemap_program_child(apr_pool_t *p, const char *progname
         rc = apr_proc_create(procnew, progname, NULL, NULL, procattr, p);
     
         if (rc == APR_SUCCESS) {
-            apr_pool_note_subprocess(p, procnew, kill_after_timeout);
+            apr_pool_note_subprocess(p, procnew, APR_KILL_AFTER_TIMEOUT);
 
             if (fpin) {
                 (*fpin) = procnew->in;

diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index bbaec55aa3d4e0ccf17725b6fd3520d21621418b..35bf14041bcde835ae4c69214075cd8f9b70fd85 100644 (file)
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -2195,7 +2195,7 @@ static int create_uncompress_child(struct uncompress_parms *parm, apr_pool_t *cn
                           compr[parm->method].argv[0]);
         }
         else {
-            apr_pool_note_subprocess(child_context, procnew, kill_after_timeout);
+            apr_pool_note_subprocess(child_context, procnew, APR_KILL_AFTER_TIMEOUT);
             *pipe_in = procnew->out;
         }
     }

diff --git a/modules/ssl/ssl_engine_pphrase.c b/modules/ssl/ssl_engine_pphrase.c
index cfeee51b39c577f177ffb50e103a2ed44b31671d..0348dfa75895da1ee01558abc1424c673f10cf44 100644 (file)
--- a/modules/ssl/ssl_engine_pphrase.c
+++ b/modules/ssl/ssl_engine_pphrase.c
@@ -569,7 +569,7 @@ static apr_status_t ssl_pipe_child_create(apr_pool_t *p, const char *progname)
                              NULL, procattr, p);
         if (rc == APR_SUCCESS) {
             /* XXX: not sure if we aught to...
-             * apr_pool_note_subprocess(p, procnew, kill_after_timeout);
+             * apr_pool_note_subprocess(p, procnew, APR_KILL_AFTER_TIMEOUT);
              */
             writetty = procnew->in;
             readtty = procnew->out;

diff --git a/server/log.c b/server/log.c
index fbc12ee919c629d7fe2fa5c95c51daa203753e60..c8edf972f33710dcf5f126fbc2f99323de166265 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -212,7 +212,7 @@ static int log_child(apr_pool_t *p, const char *progname,
                              NULL, procattr, p);
 
         if (rc == APR_SUCCESS) {
-            apr_pool_note_subprocess(p, procnew, kill_after_timeout);
+            apr_pool_note_subprocess(p, procnew, APR_KILL_AFTER_TIMEOUT);
             (*fpin) = procnew->in;
         }
     }