Remove last public vestigages of APR_INHERIT

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

diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c
index 95c8463bea8ba2e1b0714c9e3cdad0c90b6e7d9f..d29d472027661344c58d1d5b251c9442628f8111 100644 (file)
--- a/modules/cache/mod_file_cache.c
+++ b/modules/cache/mod_file_cache.c
@@ -207,13 +207,14 @@ static void cache_the_file(cmd_parms *cmd, const char *filename, int mmap)
        return;
     }
 
-    rc = apr_file_open(&fd, fspec, APR_READ | APR_BINARY | APR_XTHREAD | APR_INHERIT,
+    rc = apr_file_open(&fd, fspec, APR_READ | APR_BINARY | APR_XTHREAD,
                        APR_OS_DEFAULT, cmd->pool);
     if (rc != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, rc, cmd->server,
                      "mod_file_cache: unable to open(%s, O_RDONLY), skipping", fspec);
        return;
     }
+    apr_file_set_inherit(fd);
 
     /* WooHoo, we have a file to put in the cache */
     new_file = apr_pcalloc(cmd->pool, sizeof(a_file));

diff --git a/modules/loggers/mod_log_config.c b/modules/loggers/mod_log_config.c
index f0a3f8c726e2762861d8bcdd7117a6119691cf00..1b801cc79ffd3a9e9d9da5cbe7af482913450f49 100644 (file)
--- a/modules/loggers/mod_log_config.c
+++ b/modules/loggers/mod_log_config.c
@@ -206,7 +206,7 @@
 
 module AP_MODULE_DECLARE_DATA log_config_module;
 
-static int xfer_flags = (APR_WRITE | APR_APPEND | APR_CREATE | APR_INHERIT);
+static int xfer_flags = (APR_WRITE | APR_APPEND | APR_CREATE);
 static apr_fileperms_t xfer_perms = APR_OS_DEFAULT;
 static apr_hash_t *log_hash;
 
@@ -1051,6 +1051,7 @@ static config_log_state *open_config_log(server_rec *s, apr_pool_t *p,
                          "could not open transfer log file %s.", fname);
             exit(1);
         }
+        apr_file_set_inherit(cls->log_fd);
     }
 #ifdef BUFFERED_LOGS
     cls->outcnt = 0;

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 07af7e2fa34e0bcbf680cce87dee4dc519a886e3..cef06cef8fc6b888c21e10eff2b625c0f5297afd 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3096,7 +3096,7 @@ static void open_rewritelog(server_rec *s, apr_pool_t *p)
     const char *fname;
     apr_status_t rc;
     piped_log *pl;
-    int    rewritelog_flags = ( APR_WRITE | APR_APPEND | APR_CREATE | APR_INHERIT );
+    int    rewritelog_flags = ( APR_WRITE | APR_APPEND | APR_CREATE );
     apr_fileperms_t rewritelog_mode  = ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD );
 
     conf = ap_get_module_config(s->module_config, &rewrite_module);
@@ -3130,6 +3130,7 @@ static void open_rewritelog(server_rec *s, apr_pool_t *p)
                          "file %s", fname);
             exit(1);
         }
+        apr_file_set_inherit(conf->rewritelogfp);
     }
     return;
 }