httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@apache.org
Subject cvs commit: httpd-2.0/support suexec.c
Date Thu, 01 Mar 2001 00:55:04 GMT
gstein      01/02/28 16:55:03

  Modified:    include  mpm_common.h
               modules/aaa mod_auth_digest.c
               support  suexec.c
  Log:
  Don't directly include ap_config_auto.h directly. It isn't available on
  Windows platforms. Including ap_config.h will pick it up, or it will grab
  the appropriate Windows header/defines.
  
  Revision  Changes    Path
  1.16      +1 -3      httpd-2.0/include/mpm_common.h
  
  Index: mpm_common.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/include/mpm_common.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -u -r1.15 -r1.16
  --- mpm_common.h	2001/02/16 04:26:31	1.15
  +++ mpm_common.h	2001/03/01 00:55:02	1.16
  @@ -70,9 +70,7 @@
   #ifndef APACHE_MPM_COMMON_H
   #define APACHE_MPM_COMMON_H
   
  -#ifndef WIN32
  -#include "ap_config_auto.h"
  -#endif
  +#include "ap_config.h"
   
   #ifdef HAVE_NETINET_TCP_H
   #include <netinet/tcp.h>    /* for TCP_NODELAY */
  
  
  
  1.43      +12 -12    httpd-2.0/modules/aaa/mod_auth_digest.c
  
  Index: mod_auth_digest.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/mod_auth_digest.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -u -r1.42 -r1.43
  --- mod_auth_digest.c	2001/02/25 00:51:30	1.42
  +++ mod_auth_digest.c	2001/03/01 00:55:03	1.43
  @@ -96,17 +96,6 @@
    *   - expired nonces give amaya fits.  
    */
   
  -#ifndef WIN32
  -#include "ap_config_auto.h"
  -#endif
  -#include "httpd.h"
  -#include "http_config.h"
  -#include "http_core.h"
  -#include "http_request.h"
  -#include "http_log.h"
  -#include "http_protocol.h"
  -#include "util_uri.h"
  -#include "util_md5.h"
   #include "apr_sha1.h"
   #include "apr_base64.h"
   #include "apr_lib.h"
  @@ -114,9 +103,20 @@
   #include "apr_errno.h"
   #include "apr_lock.h"
   #include "apr_strings.h"
  +
   #define APR_WANT_STRFUNC
   #include "apr_want.h"
   
  +#include "ap_config.h"
  +#include "httpd.h"
  +#include "http_config.h"
  +#include "http_core.h"
  +#include "http_request.h"
  +#include "http_log.h"
  +#include "http_protocol.h"
  +#include "util_uri.h"
  +#include "util_md5.h"
  +
   #if APR_HAS_SHARED_MEMORY
   #include "apr_shmem.h"
   #else
  @@ -151,7 +151,7 @@
   apr_status_t apr_shm_avail(apr_shmem_t *c, apr_size_t *avail) {
       return APR_ENOTIMPL;
   }
  -#endif
  +#endif /* APR_HAS_SHARED_MEMORY */
   
   
   /* struct to hold the configuration info */
  
  
  
  1.12      +2 -3      httpd-2.0/support/suexec.c
  
  Index: suexec.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/support/suexec.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -u -r1.11 -r1.12
  --- suexec.c	2001/02/16 04:26:53	1.11
  +++ suexec.c	2001/03/01 00:55:03	1.12
  @@ -81,13 +81,12 @@
   #include <stdlib.h>
   
   #include "suexec.h"
  -#include "ap_config_auto.h"
   
  -#if HAVE_PWD_H
  +#ifdef HAVE_PWD_H
   #include <pwd.h>
   #endif
   
  -#if HAVE_GRP_H
  +#ifdef HAVE_GRP_H
   #include <grp.h>
   #endif
   
  
  
  

Mime
View raw message