httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject cvs commit: httpd-2.0/modules/ssl mod_ssl.h ssl_engine_config.c ssl_engine_mutex.c
Date Sun, 30 Mar 2003 23:17:23 GMT
jim         2003/03/30 15:17:22

  Modified:    modules/ssl Tag: APACHE_2_0_BRANCH mod_ssl.h
                        ssl_engine_config.c ssl_engine_mutex.c
  Log:
  With SSL mutex lockfiles, the child_init is done after we change uid/gid (different that
how we do
  accept mutexes). This means that we need make sure that these
  child processes can access the lockfile... basically, flock
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.122.2.3 +1 -0      httpd-2.0/modules/ssl/mod_ssl.h
  
  Index: mod_ssl.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
  retrieving revision 1.122.2.2
  retrieving revision 1.122.2.3
  diff -u -r1.122.2.2 -r1.122.2.3
  --- mod_ssl.h	11 Mar 2003 06:40:44 -0000	1.122.2.2
  +++ mod_ssl.h	30 Mar 2003 23:17:22 -0000	1.122.2.3
  @@ -422,6 +422,7 @@
       ssl_mutexmode_t nMutexMode;
       apr_lockmech_e  nMutexMech;
       const char     *szMutexFile;
  +    BOOL            ChownMutexFile;
       apr_global_mutex_t   *pMutex;
       apr_array_header_t   *aRandSeed;
       apr_hash_t     *tVHostKeys;
  
  
  
  1.70.2.3  +3 -0      httpd-2.0/modules/ssl/ssl_engine_config.c
  
  Index: ssl_engine_config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_config.c,v
  retrieving revision 1.70.2.2
  retrieving revision 1.70.2.3
  diff -u -r1.70.2.2 -r1.70.2.3
  --- ssl_engine_config.c	11 Mar 2003 06:40:44 -0000	1.70.2.2
  +++ ssl_engine_config.c	30 Mar 2003 23:17:22 -0000	1.70.2.3
  @@ -101,6 +101,7 @@
       mc->nMutexMode             = SSL_MUTEXMODE_UNSET;
       mc->nMutexMech             = APR_LOCK_DEFAULT;
       mc->szMutexFile            = NULL;
  +    mc->ChownMutexFile         = FALSE;
       mc->pMutex                 = NULL;
       mc->aRandSeed              = apr_array_make(pool, 4,
                                                   sizeof(ssl_randseed_t));
  @@ -401,6 +402,7 @@
           mc->nMutexMech = APR_LOCK_FLOCK;
           mc->szMutexFile = apr_psprintf(mc->pPool, "%s.%lu",
                                          file, (unsigned long)getpid());
  +        mc->ChownMutexFile = TRUE;
       }
   #endif
   #if APR_HAS_FCNTL_SERIALIZE
  @@ -447,6 +449,7 @@
           mc->nMutexMode  = SSL_MUTEXMODE_USED;
   #if APR_HAS_FLOCK_SERIALIZE
           mc->nMutexMech  = APR_LOCK_FLOCK;
  +        mc->ChownMutexFile = TRUE;
   #endif
   #if APR_HAS_FCNTL_SERIALIZE
           mc->nMutexMech  = APR_LOCK_FCNTL;
  
  
  
  1.17.2.4  +2 -0      httpd-2.0/modules/ssl/ssl_engine_mutex.c
  
  Index: ssl_engine_mutex.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_mutex.c,v
  retrieving revision 1.17.2.3
  retrieving revision 1.17.2.4
  diff -u -r1.17.2.3 -r1.17.2.4
  --- ssl_engine_mutex.c	26 Mar 2003 22:32:10 -0000	1.17.2.3
  +++ ssl_engine_mutex.c	30 Mar 2003 23:17:22 -0000	1.17.2.4
  @@ -84,6 +84,8 @@
                            "Cannot create SSLMutex");
           return FALSE;
       }
  +    if (mc->szMutexFile && mc->ChownMutexFile == TRUE)
  +        chown(mc->szMutexFile, unixd_config.user_id, -1);
   
   #if APR_USE_SYSVSEM_SERIALIZE
       rv = unixd_set_global_mutex_perms(mc->pMutex);
  
  
  

Mime
View raw message