[PATCH] conditionalize more of httpd.h

[Randy Terbush <ra...@zyzzyva.com>]

I remember some discussion about this, but do not see a reason not 
to protect at least the macros that deal with file locations.

Index: httpd.h
===================================================================
RCS file: /export/home/cvs/apache/src/httpd.h,v
retrieving revision 1.102
diff -c -r1.102 httpd.h
*** httpd.h	1997/04/29 05:18:53	1.102
--- httpd.h	1997/05/05 23:30:06
***************
*** 75,86 ****
--- 75,88 ----
  #endif
  
  /* Root of server */
+ #ifndef DOCUMENT_LOCATION
  #ifdef __EMX__
  /* Set default for OS/2 file system */ 
  #define DOCUMENT_LOCATION "/os2httpd/docs"
  #else
  #define DOCUMENT_LOCATION "/usr/local/etc/httpd/htdocs"
  #endif
+ #endif
  
  /* Max. number of dynamically loaded modules */
  #define DYNAMIC_MODULE_LIMIT 64
***************
*** 112,131 ****
--- 114,144 ----
  #endif
  
  /* The name of the log files */
+ #ifndef DEFAULT_XFERLOG
  #ifdef __EMX__
  /* Set default for OS/2 file system */ 
  #define DEFAULT_XFERLOG "logs/access.log"
  #else
  #define DEFAULT_XFERLOG "logs/access_log"
  #endif
+ #endif
+ 
+ #ifndef DEFAULT_ERRORLOG
  #ifdef __EMX__
  /* Set default for OS/2 file system */ 
  #define DEFAULT_ERRORLOG "logs/error.log"
  #else
  #define DEFAULT_ERRORLOG "logs/error_log"
  #endif
+ #endif
+ 
+ #ifndef DEFAULT_PIDLOG
  #define DEFAULT_PIDLOG "logs/httpd.pid"
+ #endif
+ 
+ #ifndef DEFAULT_SCOREBOARD
  #define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
+ #endif
  
  /* Define this to be what your HTML directory content files are called */
  #define DEFAULT_INDEX "index.html"
***************
*** 151,168 ****
--- 164,189 ----
  #endif
  
  /* The name of the document config file */
+ #ifndef RESOURCE_CONFIG_FILE
  #define RESOURCE_CONFIG_FILE "conf/srm.conf"
+ #endif
  
  /* The name of the MIME types file */
+ #ifndef TYPES_CONFIG_FILE
  #define TYPES_CONFIG_FILE "conf/mime.types"
+ #endif
  
  /* The name of the access file */
+ #ifndef ACCESS_CONFIG_FILE
  #define ACCESS_CONFIG_FILE "conf/access.conf"
+ #endif
  
  /* Whether we should enable rfc1413 identity checking */
  #define DEFAULT_RFC1413 0
  /* The default directory in user's home dir */
+ #ifndef DEFAULT_USER_DIR
  #define DEFAULT_USER_DIR "public_html"
+ #endif
  
  /* The default path for CGI scripts if none is currently set */
  #ifndef DEFAULT_PATH

Re: [PATCH] conditionalize more of httpd.h

[Marc Slemko <ma...@worldgate.com>]

On Mon, 5 May 1997, Randy Terbush wrote:

> I remember some discussion about this, but do not see a reason not 
> to protect at least the macros that deal with file locations.

I think Dean already did all the ones that _can't_ be overridden in the
config file or have to be around before config files are read.  My goal is
for a vendor to be able to distribute Apache so that it fits into their
system nicely without having to change anything except the Configuration
file and config files.  Aside from things that should be configurable but
aren't (eg. /usr/tmp), the changes Dean made to httpd.h should allow that.

I would not object to conditionalizing more than is absolutely needed, but
don't see a need. 

> 
> Index: httpd.h
> ===================================================================
> RCS file: /export/home/cvs/apache/src/httpd.h,v
> retrieving revision 1.102
> diff -c -r1.102 httpd.h
> *** httpd.h	1997/04/29 05:18:53	1.102
> --- httpd.h	1997/05/05 23:30:06
> ***************
> *** 75,86 ****
> --- 75,88 ----
>   #endif
>   
>   /* Root of server */
> + #ifndef DOCUMENT_LOCATION
>   #ifdef __EMX__
>   /* Set default for OS/2 file system */ 
>   #define DOCUMENT_LOCATION "/os2httpd/docs"
>   #else
>   #define DOCUMENT_LOCATION "/usr/local/etc/httpd/htdocs"
>   #endif
> + #endif
>   
>   /* Max. number of dynamically loaded modules */
>   #define DYNAMIC_MODULE_LIMIT 64
> ***************
> *** 112,131 ****
> --- 114,144 ----
>   #endif
>   
>   /* The name of the log files */
> + #ifndef DEFAULT_XFERLOG
>   #ifdef __EMX__
>   /* Set default for OS/2 file system */ 
>   #define DEFAULT_XFERLOG "logs/access.log"
>   #else
>   #define DEFAULT_XFERLOG "logs/access_log"
>   #endif
> + #endif
> + 
> + #ifndef DEFAULT_ERRORLOG
>   #ifdef __EMX__
>   /* Set default for OS/2 file system */ 
>   #define DEFAULT_ERRORLOG "logs/error.log"
>   #else
>   #define DEFAULT_ERRORLOG "logs/error_log"
>   #endif
> + #endif
> + 
> + #ifndef DEFAULT_PIDLOG
>   #define DEFAULT_PIDLOG "logs/httpd.pid"
> + #endif
> + 
> + #ifndef DEFAULT_SCOREBOARD
>   #define DEFAULT_SCOREBOARD "logs/apache_runtime_status"
> + #endif
>   
>   /* Define this to be what your HTML directory content files are called */
>   #define DEFAULT_INDEX "index.html"
> ***************
> *** 151,168 ****
> --- 164,189 ----
>   #endif
>   
>   /* The name of the document config file */
> + #ifndef RESOURCE_CONFIG_FILE
>   #define RESOURCE_CONFIG_FILE "conf/srm.conf"
> + #endif
>   
>   /* The name of the MIME types file */
> + #ifndef TYPES_CONFIG_FILE
>   #define TYPES_CONFIG_FILE "conf/mime.types"
> + #endif
>   
>   /* The name of the access file */
> + #ifndef ACCESS_CONFIG_FILE
>   #define ACCESS_CONFIG_FILE "conf/access.conf"
> + #endif
>   
>   /* Whether we should enable rfc1413 identity checking */
>   #define DEFAULT_RFC1413 0
>   /* The default directory in user's home dir */
> + #ifndef DEFAULT_USER_DIR
>   #define DEFAULT_USER_DIR "public_html"
> + #endif
>   
>   /* The default path for CGI scripts if none is currently set */
>   #ifndef DEFAULT_PATH
> 
> 
>