Commit c2d61940 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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
parent 262da4eb

modules/cache/mod_file_cache.c

+2 −1
Original line number Diff line number Diff line
@@ -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));

modules/loggers/mod_log_config.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

modules/mappers/mod_rewrite.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

}