httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_rewrite.c
Date Wed, 18 Jul 2001 19:41:21 GMT
wrowe       01/07/18 12:41:21

  Modified:    file_io/unix filedup.c
               modules/cache mod_file_cache.c
               modules/loggers mod_log_config.c
               modules/mappers mod_rewrite.c
  Log:
    Remove last public vestigages of APR_INHERIT
  
  Revision  Changes    Path
  1.34      +1 -0      apr/file_io/unix/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/filedup.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- filedup.c	2001/07/18 19:12:41	1.33
  +++ filedup.c	2001/07/18 19:41:20	1.34
  @@ -55,6 +55,7 @@
   #include "fileio.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
  +#include "inherit.h"
   
   apr_status_t apr_file_dup(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p)
   {
  
  
  
  1.58      +2 -1      httpd-2.0/modules/cache/mod_file_cache.c
  
  Index: mod_file_cache.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/cache/mod_file_cache.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- mod_file_cache.c	2001/07/16 21:07:36	1.57
  +++ mod_file_cache.c	2001/07/18 19:41:20	1.58
  @@ -207,13 +207,14 @@
   	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));
  
  
  
  1.62      +2 -1      httpd-2.0/modules/loggers/mod_log_config.c
  
  Index: mod_log_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/mod_log_config.c,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- mod_log_config.c	2001/07/16 21:07:37	1.61
  +++ mod_log_config.c	2001/07/18 19:41:20	1.62
  @@ -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 @@
                            "could not open transfer log file %s.", fname);
               exit(1);
           }
  +        apr_file_set_inherit(cls->log_fd);
       }
   #ifdef BUFFERED_LOGS
       cls->outcnt = 0;
  
  
  
  1.79      +2 -1      httpd-2.0/modules/mappers/mod_rewrite.c
  
  Index: mod_rewrite.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_rewrite.c,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- mod_rewrite.c	2001/07/16 21:07:38	1.78
  +++ mod_rewrite.c	2001/07/18 19:41:20	1.79
  @@ -3096,7 +3096,7 @@
       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 @@
                            "file %s", fname);
               exit(1);
           }
  +        apr_file_set_inherit(conf->rewritelogfp);
       }
       return;
   }
  
  
  

Mime
View raw message