dgaudet 98/01/13 16:00:40
Modified: . Tag: APACHE_1_2_X STATUS src Tag: APACHE_1_2_X CHANGES httpd.h Log: more #define wrappers from FreeBSD port Submitted by: Ralf Engelschall Reviewed by: Ralf Engelschall, Dean Gaudet, Martin Kraemer, Roy Fielding Revision Changes Path No revision No revision 1.1.2.11 +1 -85 apache/Attic/STATUS Index: STATUS =================================================================== RCS file: /export/home/cvs/apache/Attic/STATUS,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -u -r1.1.2.10 -r1.1.2.11 --- STATUS 1998/01/13 23:52:11 1.1.2.10 +++ STATUS 1998/01/14 00:00:35 1.1.2.11 @@ -8,6 +8,7 @@ * Martin's [PATCH]-1.2.6: passing escaped CC='$(CC)' * Martin's [PATCH]-1.2.6: avoid B_ERROR redeclaration * Mark Bixby's MPE port patch + * more #define wrappers from FreeBSD port Available: @@ -23,10 +24,6 @@ see below Status: Ralf +1, Dean +1, Roy +1 - * Something from the FreeBSD port -- more #define wrappers - see below - Status: Ralf +1, Dean +1, Martin +1, Roy +1 - * Dean's backport of the bputc()/chunking bugfix. <[EMAIL PROTECTED]> Status: Dean +1, Martin +1, Roy +1 @@ -69,85 +66,4 @@ For 1.3 this bugfix is different and already replaced by the new patch replacing the complete rewriting engine I'll post these days . - -* The following patch from the FreeBSD ports area which I find very useful - because it allows one to set the pathnames from Configuration without - hacking the httpd.h every time. It is already comitted in 1.3. - - Index: httpd.h - =================================================================== - RCS file: /e/apache/REPOS/apache/src/httpd.h,v - retrieving revision 1.111.2.17 - diff -u -r1.111.2.17 httpd.h - --- httpd.h 1997/08/22 08:04:27 1.111.2.17 - +++ httpd.h 1997/11/04 12:38:45 - @@ -74,6 +74,7 @@ - #endif - #endif - - +#ifndef DOCUMENT_LOCATION - /* Root of server */ - #ifdef __EMX__ - /* Set default for OS/2 file system */ - @@ -81,6 +82,7 @@ - #else - #define DOCUMENT_LOCATION "/usr/local/etc/httpd/htdocs" - #endif - +#endif - - /* Max. number of dynamically loaded modules */ - #define DYNAMIC_MODULE_LIMIT 64 - @@ -112,21 +114,31 @@ - #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 /* DEFAULT_XFERLOG */ - +#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 /* DEFAULT_ERRORLOG */ - +#ifndef DEFAULT_PIDLOG - #define DEFAULT_PIDLOG "logs/httpd.pid" - +#endif - +#ifndef DEFAULT_SCOREBOARD - #define DEFAULT_SCOREBOARD "logs/apache_runtime_status" - +#endif - +#ifndef DEFAULT_LOCKFILE - #define DEFAULT_LOCKFILE "logs/accept.lock" - +#endif - - /* Define this to be what your HTML directory content files are called */ - #define DEFAULT_INDEX "index.html" - @@ -151,14 +163,20 @@ - #define SERVER_CONFIG_FILE "conf/httpd.conf" - #endif - - +#ifndef RESOURCE_CONFIG_FILE - /* The name of the document config file */ - #define RESOURCE_CONFIG_FILE "conf/srm.conf" - +#endif - - +#ifndef TYPES_CONFIG_FILE - /* The name of the MIME types file */ - #define TYPES_CONFIG_FILE "conf/mime.types" - +#endif - - +#ifndef ACCESS_CONFIG_FILE - /* The name of the access file */ - #define ACCESS_CONFIG_FILE "conf/access.conf" - +#endif - - /* Whether we should enable rfc1413 identity checking */ - #define DEFAULT_RFC1413 0 No revision No revision 1.286.2.63 +3 -0 apache/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.286.2.62 retrieving revision 1.286.2.63 diff -u -r1.286.2.62 -r1.286.2.63 --- CHANGES 1998/01/10 03:48:48 1.286.2.62 +++ CHANGES 1998/01/14 00:00:37 1.286.2.63 @@ -1,5 +1,8 @@ Changes with Apache 1.2.6 + *) #ifdef wrap a few #defines in httpd.h to make life easier on + some ports. [Ralf Engelschall] + *) Fix MPE compilation error in mod_usertrack.c. [Mark Bixby] *) Quote CC='$(CC)' to improve recurse make calls. [Martin Kraemer] 1.111.2.20 +18 -0 apache/src/httpd.h Index: httpd.h =================================================================== RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.111.2.19 retrieving revision 1.111.2.20 diff -u -r1.111.2.19 -r1.111.2.20 --- httpd.h 1998/01/06 22:24:25 1.111.2.19 +++ httpd.h 1998/01/14 00:00:39 1.111.2.20 @@ -74,6 +74,7 @@ #endif #endif +#ifndef DOCUMENT_LOCATION /* Root of server */ #ifdef __EMX__ /* Set default for OS/2 file system */ @@ -81,6 +82,7 @@ #else #define DOCUMENT_LOCATION "/usr/local/etc/httpd/htdocs" #endif +#endif /* Max. number of dynamically loaded modules */ #define DYNAMIC_MODULE_LIMIT 64 @@ -112,21 +114,31 @@ #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 /* DEFAULT_XFERLOG */ +#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 /* DEFAULT_ERRORLOG */ +#ifndef DEFAULT_PIDLOG #define DEFAULT_PIDLOG "logs/httpd.pid" +#endif +#ifndef DEFAULT_SCOREBOARD #define DEFAULT_SCOREBOARD "logs/apache_runtime_status" +#endif +#ifndef DEFAULT_LOCKFILE #define DEFAULT_LOCKFILE "logs/accept.lock" +#endif /* Define this to be what your HTML directory content files are called */ #define DEFAULT_INDEX "index.html" @@ -151,14 +163,20 @@ #define SERVER_CONFIG_FILE "conf/httpd.conf" #endif +#ifndef RESOURCE_CONFIG_FILE /* The name of the document config file */ #define RESOURCE_CONFIG_FILE "conf/srm.conf" +#endif +#ifndef TYPES_CONFIG_FILE /* The name of the MIME types file */ #define TYPES_CONFIG_FILE "conf/mime.types" +#endif +#ifndef ACCESS_CONFIG_FILE /* The name of the access file */ #define ACCESS_CONFIG_FILE "conf/access.conf" +#endif /* Whether we should enable rfc1413 identity checking */ #define DEFAULT_RFC1413 0