diff options
| -rw-r--r-- | modules/cache/mod_file_cache.c | 2 | ||||
| -rw-r--r-- | modules/loggers/mod_log_config.c | 2 | ||||
| -rw-r--r-- | modules/mappers/mod_rewrite.c | 2 | ||||
| -rw-r--r-- | server/log.c | 2 | ||||
| -rw-r--r-- | server/mpm_common.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/modules/cache/mod_file_cache.c b/modules/cache/mod_file_cache.c index 0a58de0517..646d77bf0b 100644 --- a/modules/cache/mod_file_cache.c +++ b/modules/cache/mod_file_cache.c @@ -226,7 +226,7 @@ static void cache_the_file(cmd_parms *cmd, const char *filename, int mmap) "mod_file_cache: unable to open(%s, O_RDONLY), skipping", fspec); return; } - apr_file_set_inherit(fd); + apr_file_inherit_set(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 e8276404ef..44111cdbf8 100644 --- a/modules/loggers/mod_log_config.c +++ b/modules/loggers/mod_log_config.c @@ -1111,7 +1111,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); + apr_file_inherit_set(cls->log_fd); } #ifdef BUFFERED_LOGS cls->outcnt = 0; diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c index ee628626cf..4061e78612 100644 --- a/modules/mappers/mod_rewrite.c +++ b/modules/mappers/mod_rewrite.c @@ -3183,7 +3183,7 @@ static void open_rewritelog(server_rec *s, apr_pool_t *p) "file %s", fname); exit(1); } - apr_file_set_inherit(conf->rewritelogfp); + apr_file_inherit_set(conf->rewritelogfp); } return; } diff --git a/server/log.c b/server/log.c index 19647a1832..091f8fcfa4 100644 --- a/server/log.c +++ b/server/log.c @@ -312,7 +312,7 @@ static void open_error_log(server_rec *s, apr_pool_t *p) exit(1); } - apr_file_set_inherit(s->error_log); + apr_file_inherit_set(s->error_log); } } diff --git a/server/mpm_common.c b/server/mpm_common.c index bfe7c755d3..98f482dd63 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -244,7 +244,7 @@ void ap_wait_or_timeout(apr_exit_why_e *status, int *exitcode, apr_proc_t *ret, int ap_process_child_status(apr_proc_t *pid, apr_exit_why_e why, int status) { int signum = status; - const char *sigdesc = apr_signal_get_description(signum); + const char *sigdesc = apr_signal_description_get(signum); /* Child died... if it died due to a fatal error, * we should simply bail out. The caller needs to |