httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject cvs commit: httpd-2.0/os/unix unixd.h unixd.c
Date Sun, 24 Feb 2002 08:33:56 GMT
brianp      02/02/24 00:33:56

  Modified:    os/unix  unixd.h unixd.c
  Log:
  Removed unixd_set_lock_perms(apr_lock_t *), which is no longer
  used by any of the MPMs.  (This is another step toward eliminating
  the httpd's dependencies on the old lock API.)
  
  Revision  Changes    Path
  1.33      +0 -2      httpd-2.0/os/unix/unixd.h
  
  Index: unixd.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/unix/unixd.h,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- unixd.h	25 Dec 2001 12:24:14 -0000	1.32
  +++ unixd.h	24 Feb 2002 08:33:56 -0000	1.33
  @@ -70,7 +70,6 @@
   #endif
   #include "apr_hooks.h"
   #include "apr_thread_proc.h"
  -#include "apr_lock.h"
   #include "apr_proc_mutex.h"
   
   #include <pwd.h>
  @@ -119,7 +118,6 @@
   AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
                              const char *arg, const char * arg2, int type);
   #endif
  -AP_DECLARE(apr_status_t) unixd_set_lock_perms(apr_lock_t *lock);
   AP_DECLARE(apr_status_t) unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex);
   AP_DECLARE(apr_status_t) unixd_accept(void **accepted, ap_listen_rec *lr, apr_pool_t *ptrans);
   
  
  
  
  1.47      +0 -33     httpd-2.0/os/unix/unixd.c
  
  Index: unixd.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/os/unix/unixd.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- unixd.c	17 Jan 2002 22:59:48 -0000	1.46
  +++ unixd.c	24 Feb 2002 08:33:56 -0000	1.47
  @@ -63,7 +63,6 @@
   #include "http_main.h"
   #include "http_log.h"
   #include "unixd.h"
  -#include "apr_lock.h"
   #include "mpm_common.h"
   #include "os.h"
   #include "ap_mpm.h"
  @@ -376,38 +375,6 @@
   
       return ap_unix_create_privileged_process(newproc, progname, args, env,
                                                 attr, ugid, p);
  -}
  -
  -AP_DECLARE(apr_status_t) unixd_set_lock_perms(apr_lock_t *lock)
  -{
  -/* MPM shouldn't call us unless we're actually using a SysV sem;
  - * this is just to avoid compile issues on systems without that
  - * feature
  - */
  -#if APR_HAS_SYSVSEM_SERIALIZE
  -    apr_os_lock_t oslock;
  -#if !APR_HAVE_UNION_SEMUN
  -    union semun {
  -        long val;
  -        struct semid_ds *buf;
  -        ushort *array;
  -    };
  -#endif
  -    union semun ick;
  -    struct semid_ds buf;
  -
  -    if (!geteuid()) {
  -        apr_os_lock_get(&oslock, lock);
  -        buf.sem_perm.uid = unixd_config.user_id;
  -        buf.sem_perm.gid = unixd_config.group_id;
  -        buf.sem_perm.mode = 0600;
  -        ick.buf = &buf;
  -        if (semctl(oslock.crossproc, 0, IPC_SET, ick) < 0) {
  -            return errno;
  -        }
  -    }
  -#endif
  -    return APR_SUCCESS;
   }
   
   AP_DECLARE(apr_status_t) unixd_set_proc_mutex_perms(apr_proc_mutex_t *pmutex)
  
  
  

Mime
View raw message