httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dean Gaudet <dgau...@hyperreal.com>
Subject cvs commit: apache/src CHANGES httpd.h
Date Tue, 29 Apr 1997 02:43:55 GMT
dgaudet     97/04/28 19:43:54

  Modified:    src       CHANGES httpd.h
  Log:
  Allow HTTPD_ROOT, SERVER_CONFIG_FILE, DEFAULT_PATH, and SHELL_PATH
  to be configured via -D in Configuration.  PR#449
  
  Reviewed by:	Roy
  
  Revision  Changes    Path
  1.260     +3 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.259
  retrieving revision 1.260
  diff -C3 -r1.259 -r1.260
  *** CHANGES	1997/04/29 02:39:00	1.259
  --- CHANGES	1997/04/29 02:43:52	1.260
  ***************
  *** 1,5 ****
  --- 1,8 ----
    Changes with Apache 1.2b10
    
  +   *) Allow HTTPD_ROOT, SERVER_CONFIG_FILE, DEFAULT_PATH, and SHELL_PATH
  +      to be configured via -D in Configuration.  [Dean Gaudet] PR#449
  + 
      *) <VirtualHost _default_:portnum> didn't work properly.  [Dean Gaudet]
    
      *) Added prototype for mktemp() for SUNOS4 [Marc Slemko]
  
  
  
  1.100     +8 -3      apache/src/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/httpd.h,v
  retrieving revision 1.99
  retrieving revision 1.100
  diff -C3 -r1.99 -r1.100
  *** httpd.h	1997/04/27 11:57:16	1.99
  --- httpd.h	1997/04/29 02:43:52	1.100
  ***************
  *** 65,76 ****
  --- 65,78 ----
    /* Define this to be the default server home dir. Anything later in this
     * file with a relative pathname will have this added.
     */
  + #ifndef HTTPD_ROOT
    #ifdef __EMX__
    /* Set default for OS/2 file system */ 
    #define HTTPD_ROOT "/os2httpd"
    #else
    #define HTTPD_ROOT "/usr/local/etc/httpd"
    #endif
  + #endif
    
    /* Root of server */
    #ifdef __EMX__
  ***************
  *** 144,150 ****
  --- 146,154 ----
    #endif
    
    /* The name of the server config file */
  + #ifndef SERVER_CONFIG_FILE
    #define SERVER_CONFIG_FILE "conf/httpd.conf"
  + #endif
    
    /* The name of the document config file */
    #define RESOURCE_CONFIG_FILE "conf/srm.conf"
  ***************
  *** 161,175 ****
  --- 165,183 ----
    #define DEFAULT_USER_DIR "public_html"
    
    /* The default path for CGI scripts if none is currently set */
  + #ifndef DEFAULT_PATH
    #define DEFAULT_PATH "/bin:/usr/bin:/usr/ucb:/usr/bsd:/usr/local/bin"
  + #endif
    
    /* The path to the Bourne shell, for parsed docs */
  + #ifndef SHELL_PATH
    #ifdef __EMX__
    /* Set default for OS/2 file system */ 
    #define SHELL_PATH "CMD.EXE"
    #else
    #define SHELL_PATH "/bin/sh"
    #endif
  + #endif
    
    /* The path to the suExec wrapper, can be overridden in Configuration */
    #ifndef SUEXEC_BIN
  ***************
  *** 191,199 ****
    
    /* The size of the server's internal read-write buffers */
    #define IOBUFSIZE 8192
  - 
  - /* The number of header lines we will accept from a client */
  - #define MAX_HEADERS 200
    
    /* Number of servers to spawn off by default --- also, if fewer than
     * this free when the caretaker checks, it will spawn more.
  --- 199,204 ----
  
  
  

Mime
View raw message