jim 96/06/26 03:46:39
Modified:src README conf.h http_main.c util.c
Log:
back out infamous 18k patch with 17k patch
Revision ChangesPath
1.7 +19 -26apache/src/README
Index: README
===
RCS file: /export/home/cvs/apache/src/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -C3 -r1.6 -r1.7
*** README1996/06/22 13:58:33 1.6
--- README1996/06/26 10:46:35 1.7
***
*** 160,175
NEED_INITGROUPS:
NEED_WAITPID:
NEED_STRERROR:
--
HAVE_*:
Does this OS have/support this capablity?
! HAVE_GMTOFF:
Define if the OS's tm struct has the tm_gmtoff element
HAVE_RESOURCE:
! Define if the OS supports the getrlimit()/setrlimit() functions
HAVE_MMAP:
Define if the OS supports the BSD mmap() call. This is used by various
--- 160,178
NEED_INITGROUPS:
NEED_WAITPID:
NEED_STRERROR:
+ NEED_SELECT_H:
+ Define if the OS needs the sys/select.h header file.
+
--
HAVE_*:
Does this OS have/support this capablity?
! HAS_GMTOFF:
Define if the OS's tm struct has the tm_gmtoff element
HAVE_RESOURCE:
! Define as 1 if the OS supports the getrlimit()/setrlimit() functions
HAVE_MMAP:
Define if the OS supports the BSD mmap() call. This is used by various
***
*** 184,208
HAVE_CRYPT_H:
Define if the OS has the crypt.h header file.
- HAVE_SYS_SELECT_H:
- Define if the OS has the sys/select.h header file.
- --
-
- USE_*:
- These #defines are used for functions and ability that aren't exactly
- required but should be used.
-
- USE_FCNTL_SERIALIZED_ACCEPT:
- Define if the OS requires a mutex lock around the socket accept()
- call. Use fcntl() locking.
-
- USE_FLOCK_SERIALIZED_ACCEPT:
- Define if the OS requires a mutex lock around the socket accept()
- call. Use flock() locking (fcntl() is expensive on some OSs, esp.
- when using NFS).
-
- USE_LONGJMP:
- use the longjmp() call instead of siglongjmp()
--
NO_*:
--- 187,192
***
*** 218,226
MISC #DEFINES:
Various other #defines used in the code.
! JMP_BUF:
!The variable-type for siglongjmp() or longjmp() call.
! MOVEBREAK:
!Amount to move sbrk() breakpoint, if required, before attaching
!shared-memory segment.
--- 202,219
MISC #DEFINES:
Various other #defines used in the code.
! FCNTL_SERIALIZED_ACCEPT:
! Define if the OS requires a mutex lock around the socket accept()
! call. Use fcntl() locking.
!
! FLOCK_SERIALIZED_ACCEPT:
! Define if the OS requires a mutex lock around the socket accept()
! call. Use flock() locking (fcntl() is expensive on some OSs, esp.
! when using NFS).
!
! JMP_BUF:
! The variable-type for siglongjmp() or longjmp() call.
! MOVEBREAK:
! Amount to move sbrk() breakpoint, if required, before attaching
! shared-memory segment.
1.16 +37 -35apache/src/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C3 -r1.15 -r1.16
*** conf.h1996/06/22 13:58:34 1.15
--- conf.h1996/06/26 10:46:36 1.16
***
*** 54,60
/*
* conf.h: system-dependant #defines and includes...
! * See README for a list of what these mean
*/
#ifndef QNX
--- 54,60
/*
* conf.h: system-dependant #defines and includes...
! * See README for a listing of what they mean
*/
#ifndef QNX
***
*** 63,70
/* Define one of these according to your system. */
#if defined(SUNOS4)
! #define HAVE_GMTOFF
! #define HAVE_RESOURCE
#undef NO_KILLPG
#undef NO_SETSID
char *crypt(char *pw, char *salt);
--- 63,70
/* Define one of these according to your system. */
#if defined(SUNOS4)
! #define HAS_GMTOFF
! #define HAVE_RESOURCE 1
#undef NO_KILLPG
#undef NO_SETSID
char *crypt(char *pw, char *salt);
***
*** 74,102
#define NEED_STRERROR
#elif defined(SOLARIS2)
! #undef HAVE_GMTOFF
#define NO_KILLPG
#undef NO_SETSID
! #define HAVE_RESOURCE
#define bzero(a,b) memset(a,0,b)
#define getwd(d) getcwd(d,MAX_STRING_LEN)
#define JMP_BUF sigjmp_buf
! #define USE_FCNTL_SERIALIZED_ACCEPT
#define HAVE_MMAP
#define HAVE_CRYPT_H
#elif
