randy 97/08/23 09:01:24
Modified: src/main conf.h httpd.h Log: Conditionalize a few more defines. Revision Changes Path 1.127 +12 -0 apachen/src/main/conf.h Index: conf.h =================================================================== RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- conf.h 1997/08/18 10:59:03 1.126 +++ conf.h 1997/08/23 16:01:21 1.127 @@ -162,9 +162,13 @@ #ifndef __ps2__ #define HAVE_MMAP #define USE_MMAP_FILES +#ifndef DEFAULT_GROUP #define DEFAULT_GROUP "nobody" #endif +#endif +#ifndef DEFAULT_USER #define DEFAULT_USER "nobody" +#endif #ifdef NEED_RLIM_T typedef int rlim_t; #endif @@ -401,8 +405,12 @@ #undef NO_KILLPG #undef NO_SETSID #define JMP_BUF sigjmp_buf +#ifndef DEFAULT_USER #define DEFAULT_USER "nobody" +#endif +#ifndef DEFAULT_GROUP #define DEFAULT_GROUP "nogroup" +#endif #elif defined(UTS21) #undef HAVE_GMTOFF @@ -431,8 +439,12 @@ #define JMP_BUF sigjmp_buf #define HAVE_MMAP #define USE_MMAP_FILES +#ifndef DEFAULT_USER #define DEFAULT_USER "nobody" +#endif +#ifndef DEFAULT_GROUP #define DEFAULT_GROUP "nogroup" +#endif #if defined(__bsdi__) || \ (defined(__FreeBSD_version) && (__FreeBSD_version < 220000)) typedef quad_t rlim_t; 1.142 +2 -0 apachen/src/main/httpd.h Index: httpd.h =================================================================== RCS file: /export/home/cvs/apachen/src/main/httpd.h,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- httpd.h 1997/08/19 07:52:42 1.141 +++ httpd.h 1997/08/23 16:01:22 1.142 @@ -366,7 +366,9 @@ #define APACHE_RELEASE 1030000 #define SERVER_PROTOCOL "HTTP/1.1" +#ifndef SERVER_SUPPORT #define SERVER_SUPPORT "http://www.apache.org/"; +#endif #define DECLINED -1 /* Module declines to handle */ #define DONE -2 /* Module has served the response completely
