cvs commit: apache-1.3/src/include conf.h

1998-07-12 Thread jim 
jim 98/07/12 07:38:04

  Modified:src/include conf.h
  Log:
  Hmmm... A/UX has sys/resource.h but no rlimit()
  functions to read/write the values. The rub is that it's sys/resource.h
  file DOES define RLIMIT_CPU, which causes http_core.c to barf. S
  we just don't include the header
  
  Revision  ChangesPath
  1.223 +1 -0  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.222
  retrieving revision 1.223
  diff -u -r1.222 -r1.223
  --- conf.h1998/07/12 09:07:31 1.222
  +++ conf.h1998/07/12 14:38:03 1.223
  @@ -467,6 +467,7 @@
   #define NO_LINGCLOSE
   #define NO_SLACK
   #define HAVE_SYSLOG 1
  +#undef HAVE_SYS_RESOURCE_H   /* exists but does not provide *rlimit funcs */
   
   #elif defined(SVR4)
   #define NO_KILLPG

cvs commit: apache-1.3/src/include conf.h

1998-07-08 Thread jim 
jim 98/07/07 17:23:43

  Modified:src  CHANGES
   src/include conf.h
  Log:
  PR:2398
  Submitted by: Kristian Kraemmer Nielsen [EMAIL PROTECTED]
  Reviewed by:  Jim Jagielski
  Change 'nobody' to 'nogroup for DEFAULT_GROUP under AIX
  
  Revision  ChangesPath
  1.951 +3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.950
  retrieving revision 1.951
  diff -u -r1.950 -r1.951
  --- CHANGES   1998/07/07 23:19:22 1.950
  +++ CHANGES   1998/07/08 00:23:39 1.951
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.1
   
  +  *) AIX was sing 'nobody' instead of 'nogroup' for DEFAULT_GROUP.
  + [Kristian Kraemmer Nielsen [EMAIL PROTECTED]] PR#2398
  +
 *) suexec's error messages have been clarified a little bit.  [Ken Coar]
   
 *) PORT: Apache is not 8-bit clean in many settings, a problem we're
  
  
  
  1.218 +1 -1  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.217
  retrieving revision 1.218
  diff -u -r1.217 -r1.218
  --- conf.h1998/06/20 11:20:38 1.217
  +++ conf.h1998/07/08 00:23:41 1.218
  @@ -242,7 +242,7 @@
   #define USE_MMAP_FILES
   #define HAVE_SYSLOG 1
   #ifndef DEFAULT_GROUP
  -#define DEFAULT_GROUP nobody
  +#define DEFAULT_GROUP nogroup
   #endif
   #endif
   #ifndef DEFAULT_USER

cvs commit: apache-1.3/src/include conf.h

1998-07-08 Thread jim 
jim 98/07/07 17:46:06

  Modified:src  CHANGES
   src/include conf.h
  Log:
  Why the flying fuck even bother...
  
  Revision  ChangesPath
  1.952 +0 -3  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.951
  retrieving revision 1.952
  diff -u -r1.951 -r1.952
  --- CHANGES   1998/07/08 00:23:39 1.951
  +++ CHANGES   1998/07/08 00:46:03 1.952
  @@ -1,8 +1,5 @@
   Changes with Apache 1.3.1
   
  -  *) AIX was sing 'nobody' instead of 'nogroup' for DEFAULT_GROUP.
  - [Kristian Kraemmer Nielsen [EMAIL PROTECTED]] PR#2398
  -
 *) suexec's error messages have been clarified a little bit.  [Ken Coar]
   
 *) PORT: Apache is not 8-bit clean in many settings, a problem we're
  
  
  
  1.219 +1 -1  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.218
  retrieving revision 1.219
  diff -u -r1.218 -r1.219
  --- conf.h1998/07/08 00:23:41 1.218
  +++ conf.h1998/07/08 00:46:05 1.219
  @@ -242,7 +242,7 @@
   #define USE_MMAP_FILES
   #define HAVE_SYSLOG 1
   #ifndef DEFAULT_GROUP
  -#define DEFAULT_GROUP nogroup
  +#define DEFAULT_GROUP nobody
   #endif
   #endif
   #ifndef DEFAULT_USER

cvs commit: apache-1.3/src/include conf.h

1998-06-17 Thread dgaudet 
dgaudet 98/06/17 00:10:45

  Modified:src  CHANGES
   src/include conf.h
  Log:
  fix compilation on linux arm
  
  PR:   2443
  Submitted by: Sam Kington [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.923 +3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.922
  retrieving revision 1.923
  diff -u -r1.922 -r1.923
  --- CHANGES   1998/06/16 09:42:30 1.922
  +++ CHANGES   1998/06/17 07:10:38 1.923
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3.1
   
  +  *) PORT: Fix compilation problem on ARM Linux.
  + [Sam Kington [EMAIL PROTECTED]] PR#2443
  +
 *) Let APACI's configure script determine some configuration parameters
(Group, Port, ServerAdmin, ServerName) via some intelligent tests to
remove some of the classical hurdles for new users when setting up
  
  
  
  1.216 +1 -1  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.215
  retrieving revision 1.216
  diff -u -r1.215 -r1.216
  --- conf.h1998/06/06 19:30:46 1.215
  +++ conf.h1998/06/17 07:10:42 1.216
  @@ -1056,7 +1056,7 @@
* so we don't have to.  Sigh...
*/
   
  -#if defined(CRAY) || defined(__arm)
  +#if defined(CRAY) || (defined(__arm)  !defined(LINUX))
   #ifdef __STDC__
   #define XtOffset(p_type,field) _Offsetof(p_type,field)
   #else

cvs commit: apache-1.3/src/include conf.h

1998-06-03 Thread dgaudet 
dgaudet 98/06/03 10:54:46

  Modified:src  PORTING
   src/include conf.h
  Log:
  explain NET_SIZE_T and why it is a mess
  
  Revision  ChangesPath
  1.29  +2 -1  apache-1.3/src/PORTING
  
  Index: PORTING
  ===
  RCS file: /export/home/cvs/apache-1.3/src/PORTING,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- PORTING   1998/05/09 03:25:41 1.28
  +++ PORTING   1998/06/03 17:54:45 1.29
  @@ -338,7 +338,8 @@
 NET_SIZE_T:
  Some functions such as accept(), getsockname(), getpeername() take
  an int *len on some architectures and a size_t *len on others.
  -   If left undefined apache will default it to int.
  +   If left undefined apache will default it to int.  See include/conf.h
  +   for a description of NET_SIZE_T.
   
 NEED_HASHBANG_EMUL:
  The execve()/etc. functions on this platform do not deal with #!,
  
  
  
  1.213 +19 -2 apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.212
  retrieving revision 1.213
  diff -u -r1.212 -r1.213
  --- conf.h1998/05/29 00:15:56 1.212
  +++ conf.h1998/06/03 17:54:45 1.213
  @@ -1066,8 +1066,25 @@
   #define XtOffsetOf(s_type,field) XtOffset(s_type*,field)
   #endif
   
  -/* some architectures require size_t * pointers where others require int *
  - * pointers in functions such as accept(), getsockname(), getpeername()
  +/*
  + * NET_SIZE_T exists because of shortsightedness on the POSIX committee.  BSD
  + * systems used int * as the parameter to accept(), getsockname(),
  + * getpeername() et al.  Consequently many unixes took an int * for that
  + * parameter.  The POSIX committee decided that int was just too generic 
and
  + * had to be replaced with size_t almost everywhere.  There's no problem with
  + * that when you're passing by value.  But when you're passing by reference
  + * this creates a gross source incompatibility with existing programs.  On
  + * 32-bit architectures it creates only a warning.  On 64-bit architectures 
it
  + * creates broken code -- because int * is a pointer to a 64-bit quantity 
and
  + * size_t * is frequently a pointer to a 32-bit quantity.
  + *
  + * Some Unixes adopted size_t * for the sake of POSIX compliance.  Others
  + * ignored it because it was such a broken interface.  Chaos ensued.  POSIX
  + * finally woke up and decided that it was wrong and created a new type
  + * socklen_t.  The only useful value for socklen_t is int, and that's how
  + * everyone who has a clue implements it.  It is almost always the case that
  + * NET_SIZE_T should be defined to be an int, unless the system being 
compiled
  + * for was created in the window of POSIX madness.
*/
   #ifndef NET_SIZE_T
   #define NET_SIZE_T int

cvs commit: apache-1.3/src/include conf.h

1998-05-29 Thread dgaudet 
dgaudet 98/05/28 16:59:40

  Modified:src  CHANGES
   src/main http_main.c
   src/include conf.h
  Log:
  PORT: QNX needed a #include sys/mman.h; and now it uses flock
  serialized accept to handle multiple sockets.
  
  PR: 2295, 2296
  Submitted by:   Rob Saccoccio [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.872 +4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.871
  retrieving revision 1.872
  diff -u -r1.871 -r1.872
  --- CHANGES   1998/05/28 23:27:59 1.871
  +++ CHANGES   1998/05/28 23:59:33 1.872
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3b8
   
  +  *) PORT: QNX needed a #include sys/mman.h; and now it uses flock
  + serialized accept to handle multiple sockets.
  + [Rob Saccoccio [EMAIL PROTECTED]] PR#2295, 2296
  + 
 *) Have NT properly set the directory for CGI scripts 
( other spawned children)
[W G Stoddard [EMAIL PROTECTED]]
  
  
  
  1.355 +1 -0  apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.354
  retrieving revision 1.355
  diff -u -r1.354 -r1.355
  --- http_main.c   1998/05/21 04:07:21 1.354
  +++ http_main.c   1998/05/28 23:59:35 1.355
  @@ -1518,6 +1518,7 @@
   }
   
   #elif defined(USE_POSIX_SCOREBOARD)
  +#include sys/mman.h
   /* 
* POSIX 1003.4 style
*
  
  
  
  1.211 +2 -0  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.210
  retrieving revision 1.211
  diff -u -r1.210 -r1.211
  --- conf.h1998/05/11 19:59:01 1.210
  +++ conf.h1998/05/28 23:59:39 1.211
  @@ -626,6 +626,8 @@
   #include unix.h
   #define HAVE_MMAP 1
   #define USE_POSIX_SCOREBOARD
  +#define USE_FLOCK_SERIALIZED_ACCEPT
  +#define SINGLE_LISTEN_UNSERIALIZED_ACCEPT
   #define HAVE_SYSLOG 1
   
   #elif defined(LYNXOS)

cvs commit: apache-1.3/src/include conf.h

1998-05-01 Thread rse 
rse 98/05/01 03:00:46

  Modified:.STATUS
   src  CHANGES Configure
   src/include conf.h
  Log:
  Some optimization defines for NetBSD
  
  Submitted by: Jaromir Dolecek [EMAIL PROTECTED]
  PR: 2165
  
  Revision  ChangesPath
  1.343 +1 -0  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.342
  retrieving revision 1.343
  diff -u -r1.342 -r1.343
  --- STATUS1998/04/30 11:27:01 1.342
  +++ STATUS1998/05/01 10:00:39 1.343
  @@ -77,6 +77,7 @@
   * Ralf's fixes for compiler warnings under AIX 4.2 (NET_SIZE_T is size_t)
   * Ralf's DSO support for AIX
   * Ralf's DSO support for NetBSD, PR#2158
  +* Some optimization defines for NetBSD, PR#2165
   
   Available Patches:
   
  
  
  
  1.805 +3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.804
  retrieving revision 1.805
  diff -u -r1.804 -r1.805
  --- CHANGES   1998/04/30 11:27:02 1.804
  +++ CHANGES   1998/05/01 10:00:41 1.805
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3b7
   
  +  *) PORT: Some optimization defines for NetBSD
  + [Jaromir Dolecek [EMAIL PROTECTED]] PR#2165
  +
 *) PORT: Dynamic Shared Object (DSO) support for NetBSD.
[Jaromir Dolecek [EMAIL PROTECTED], Ralf S. Engelschall] PR#2158
   
  
  
  
  1.251 +1 -0  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.250
  retrieving revision 1.251
  diff -u -r1.250 -r1.251
  --- Configure 1998/04/30 11:27:02 1.250
  +++ Configure 1998/05/01 10:00:42 1.251
  @@ -445,6 +445,7 @@
LIBS=$LIBS -lcrypt
DBM_LIB=
DB_LIB=
  + DEF_WANTHSREGEX=no
;;
   *-freebsd*)
PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'`
  
  
  
  1.204 +5 -0  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.203
  retrieving revision 1.204
  diff -u -r1.203 -r1.204
  --- conf.h1998/04/28 08:19:49 1.203
  +++ conf.h1998/05/01 10:00:45 1.204
  @@ -547,6 +547,11 @@
   #endif
   #ifndef DEFAULT_GROUP
   #define DEFAULT_GROUP nogroup
  +#define HAVE_SHMGET 1
  +#define USE_SHMGET_SCOREBOARD
  +#define HAVE_MMAP 1
  +#define USE_MMAP_SCOREBOARD
  +#define USE_MMAP_FILES
   #endif
   
   #elif defined(UTS21)

cvs commit: apache-1.3/src/include conf.h

1998-04-28 Thread rse 
rse 98/04/28 01:19:51

  Modified:.STATUS
   src  CHANGES Configure
   src/include conf.h
  Log:
  Fix nasty compiler warnings under AIX 4.2 because there we need
  NET_SIZE_T=size_t according to the include files and not NET_SIZE_T=int as the
  manual pages of getsockname() etc. indicate.
  
  Revision  ChangesPath
  1.340 +1 -0  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.339
  retrieving revision 1.340
  diff -u -r1.339 -r1.340
  --- STATUS1998/04/28 08:13:06 1.339
  +++ STATUS1998/04/28 08:19:47 1.340
  @@ -74,6 +74,7 @@
   * Ralf's more granular install paths: runtimedir, logfiledir, 
proxycachedir
   * Roy's bugfixes for select() handling
   * Martin's suppress error(0) messages for ap_log_error()
  +* Ralf's fixes for compiler warnings under AIX 4.2 (NET_SIZE_T is size_t)
   
   Available Patches:
   
  
  
  
  1.802 +4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.801
  retrieving revision 1.802
  diff -u -r1.801 -r1.802
  --- CHANGES   1998/04/28 05:59:48 1.801
  +++ CHANGES   1998/04/28 08:19:47 1.802
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3b7
 
  +  *) PORT: Fix compiler warnings under AIX = 4.2 where the manual pages 
imply
  + that we should use NET_SIZE_T == int but the include files force size_t.
  + [Ralf S. Engelschall]
  +
 *) Fix two bugs in select() handling in http_main.c.
[Roy Fielding]
   
  
  
  
  1.248 +3 -3  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.247
  retrieving revision 1.248
  diff -u -r1.247 -r1.248
  --- Configure 1998/04/27 08:17:26 1.247
  +++ Configure 1998/04/28 08:19:48 1.248
  @@ -305,16 +305,16 @@
;;
   i386-ibm-aix*)
OS='IBM AIX PS/2'
  - CFLAGS=$CFLAGS -DAIX -U__STR__ -DUSEBCOPY
  + CFLAGS=$CFLAGS -DAIX=1 -U__STR__ -DUSEBCOPY
DEF_WANTHSREGEX=no
;;
   *-ibm-aix[1-3].*|*-ibm-aix4.[0-1])
   OS='IBM AIX  v4.2'
  -CFLAGS=$CFLAGS -DAIX -DNEED_RLIM_T -U__STR__
  +CFLAGS=$CFLAGS -DAIX=1 -DNEED_RLIM_T -U__STR__
   ;;
   *-ibm-aix*)
   OS='IBM AIX = 4.2'
  -CFLAGS=$CFLAGS -DAIX -U__STR__
  +CFLAGS=$CFLAGS -DAIX=42 -U__STR__
LDFLAGS=$LDFLAGS -lm
   ;;
   *-apollo-*)
  
  
  
  1.203 +3 -0  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.202
  retrieving revision 1.203
  diff -u -r1.202 -r1.203
  --- conf.h1998/04/20 23:49:08 1.202
  +++ conf.h1998/04/28 08:19:49 1.203
  @@ -250,6 +250,9 @@
   #ifdef USEBCOPY
   #define memmove(a,b,c) bcopy(b,a,c)
   #endif
  +#if AIX = 42
  +#define NET_SIZE_T size_t
  +#endif
   
   #elif defined(ULTRIX)
   #define HAVE_GMTOFF 1

cvs commit: apache-1.3/src/include conf.h

1998-04-21 Thread jim 
jim 98/04/20 16:49:08

  Modified:src  Configure
   src/include conf.h
  Log:
  Obtained from: Jeff Earickson [EMAIL PROTECTED]
  Submitted by: Jim Jagielski
  Add HP-UX 11 Port
  
  Revision  ChangesPath
  1.241 +8 -2  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.240
  retrieving revision 1.241
  diff -u -r1.240 -r1.241
  --- Configure 1998/04/17 18:49:36 1.240
  +++ Configure 1998/04/20 23:49:07 1.241
  @@ -341,6 +341,12 @@
OS='HI-UX'
CFLAGS=$CFLAGS -DHIUX
;;
  +*-hp-hpux11.*)
  + OS='HP-UX 11'
  + CFLAGS=$CFLAGS -DHPUX11
  + LIBS=$LIBS -lm -lpthread
  + DEF_WANTHSREGEX=yes
  + ;;
   *-hp-hpux10.*)
OS='HP-UX 10'
CFLAGS=$CFLAGS -DHPUX10
  @@ -876,7 +882,7 @@
   LDFLAGS_SHLIB=-b
   LDFLAGS_SHLIB_EXPORT=-Wl,-E -Wl,-B,deferred
   ;;
  -*-hp-hpux10.*)
  +*-hp-hpux10.*|*-hp-hpux11.*)
   case $CC in
   */gcc|gcc ) CFLAGS_SHLIB=-fpic ;;
   */cc|cc   ) CFLAGS_SHLIB=+z ;;
  @@ -992,7 +998,7 @@
;;
esac
;;
  -'HP-UX'|'HP-UX 10')
  +'HP-UX'|'HP-UX 10'|'HP-UX 11')
case $CC in
*/cc|cc )
CFLAGS=$CFLAGS -Aa -D_HPUX_SOURCE
  
  
  
  1.202 +21 -0 apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.201
  retrieving revision 1.202
  diff -u -r1.201 -r1.202
  --- conf.h1998/04/15 17:09:27 1.201
  +++ conf.h1998/04/20 23:49:08 1.202
  @@ -205,6 +205,27 @@
   typedef int rlim_t;
   #endif
   
  +#elif defined(HPUX11)
  +#ifndef _HPUX_SOURCE
  +#define _HPUX_SOURCE
  +#endif
  +#define HAVE_SHMGET
  +#define USE_SHMGET_SCOREBOARD
  +#undef  HAVE_GMTOFF
  +#define HAVE_RESOURCE
  +#define HAVE_CRYPT_H
  +#undef  HAVE_SYS_SELECT_H
  +#define HAVE_SYS_RESOURCE_H
  +#define USE_FCNTL_SERIALIZED_ACCEPT
  +/* feeling brave?  want to try using POSIX mutexes? */
  +/* #define HAVE_MMAP */
  +/* #define USE_MMAP_SCOREBOARD */
  +/* #define USE_MMAP_FILES */
  +/* #define USE_PTHREAD_SERIALIZED_ACCEPT */
  +#define NO_KILLPG
  +#undef  NO_SETSID
  +#define HAVE_SYSLOG
  +
   #elif defined(AIX)
   #undef HAVE_GMTOFF
   #undef NO_KILLPG

cvs commit: apache-1.3/src/include conf.h

1998-03-28 Thread rse 
rse 98/03/28 08:53:19

  Modified:src  PORTING
   src/include conf.h
  Log:
  Remove still dangling HAVE_SNPRINTF stuff. Dean has removed the include/conf.h
  hack, so this define is no longer useable thus there is no need for
  documenting it any longer.
  
  Revision  ChangesPath
  1.23  +0 -7  apache-1.3/src/PORTING
  
  Index: PORTING
  ===
  RCS file: /export/home/cvs/apache-1.3/src/PORTING,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- PORTING   1998/03/25 20:38:38 1.22
  +++ PORTING   1998/03/28 16:53:17 1.23
  @@ -193,13 +193,6 @@
 Define if the OS has and supports the getrlimit/setrlimit
 family. Apache uses this to determine if RLIMIT_CPU|VMEM|DATA|RLIMIT
 is found and used.
  -
  -HAVE_SNPRINTF:
  -  Apache makes extensive use of the snprintf() function. many
  -  platforms do not provide this function. If your platform
  -  does provide it _and_ it's reliable (most are not) then
  -  define this to use the OS version. Otherwise, Apache will
  -  use its own.
   --
   
USE_*:
  
  
  
  1.197 +0 -1  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.196
  retrieving revision 1.197
  diff -u -r1.196 -r1.197
  --- conf.h1998/03/28 11:58:19 1.196
  +++ conf.h1998/03/28 16:53:18 1.197
  @@ -594,7 +594,6 @@
   #undef HAVE_CRYPT_H
   #undef HAVE_SYS_SELECT_H
   #define HAVE_SYS_RESOURCE_H 1
  -#undef HAVE_SNPRINTF
   #undef USE_FCNTL_SERIALIZED_ACCEPT
   #undef USE_FLOCK_SERIALIZED_ACCEPT
   #define USE_LONGJMP

cvs commit: apache-1.3/src/include conf.h

1998-03-28 Thread dgaudet 
dgaudet 98/03/28 13:58:40

  Modified:src  CHANGES
   src/ap   ap_snprintf.c
   src/include conf.h
  Log:
  ap_cvt and its ilk weren't threadsafe
  remove HAVE_CVT because we need threadsafe functions
  
  Revision  ChangesPath
  1.745 +4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.744
  retrieving revision 1.745
  diff -u -r1.744 -r1.745
  --- CHANGES   1998/03/28 21:33:40 1.744
  +++ CHANGES   1998/03/28 21:58:36 1.745
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3b6
   
  +  *) The floating point ap_snprintf code wasn't threadsafe.
  + Had to remove the HAVE_CVT macro in order to do threadsafe
  + calling of the ?cvt() floating point routines.  [Dean Gaudet]
  +
 *) PORT: Add the SCO_SV port. [Jim Jagielski] PR#1962
   
 *) PORT: IRIX needs the -n32 flag iff using the 'cc' compiler
  
  
  
  1.15  +18 -26apache-1.3/src/ap/ap_snprintf.c
  
  Index: ap_snprintf.c
  ===
  RCS file: /export/home/cvs/apache-1.3/src/ap/ap_snprintf.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ap_snprintf.c 1998/03/28 11:58:15 1.14
  +++ ap_snprintf.c 1998/03/28 21:58:38 1.15
  @@ -64,17 +64,9 @@
   #include stdlib.h
   #include math.h
   
  -#ifdef HAVE_CVT
  -
  -#define ap_ecvt ecvt
  -#define ap_fcvt fcvt
  -#define ap_gcvt gcvt
  -
  -#else
  -
   /*
* cvt.c - IEEE floating point formatting routines for FreeBSD
  - * from GNU libc-4.6.27
  + * from GNU libc-4.6.27.  Modified to be thread safe.
*/
   
   /*
  @@ -86,12 +78,12 @@
   
   #define  NDIG80
   
  -static char *ap_cvt(double arg, int ndigits, int *decpt, int *sign, int 
eflag)
  +/* buf must have at least NDIG bytes */
  +static char *ap_cvt(double arg, int ndigits, int *decpt, int *sign, int 
eflag, char *buf)
   {
   register int r2;
   double fi, fj;
   register char *p, *p1;
  -static char buf[NDIG];
   
   if (ndigits = NDIG - 1)
ndigits = NDIG - 2;
  @@ -160,14 +152,14 @@
   return (buf);
   }
   
  -static char *ap_ecvt(double arg, int ndigits, int *decpt, int *sign)
  +static char *ap_ecvt(double arg, int ndigits, int *decpt, int *sign, char 
*buf)
   {
  -return (ap_cvt(arg, ndigits, decpt, sign, 1));
  +return (ap_cvt(arg, ndigits, decpt, sign, 1, buf));
   }
   
  -static char *ap_fcvt(double arg, int ndigits, int *decpt, int *sign)
  +static char *ap_fcvt(double arg, int ndigits, int *decpt, int *sign, char 
*buf)
   {
  -return (ap_cvt(arg, ndigits, decpt, sign, 0));
  +return (ap_cvt(arg, ndigits, decpt, sign, 0, buf));
   }
   
   /*
  @@ -180,8 +172,9 @@
   int sign, decpt;
   register char *p1, *p2;
   register int i;
  +char buf1[NDIG];
   
  -p1 = ap_ecvt(number, ndigit, decpt, sign);
  +p1 = ap_ecvt(number, ndigit, decpt, sign, buf1);
   p2 = buf;
   if (sign)
*p2++ = '-';
  @@ -233,8 +226,6 @@
   return (buf);
   }
   
  -#endif /* HAVE_CVT */
  -
   typedef enum {
   NO = 0, YES = 1
   } boolean_e;
  @@ -394,18 +385,19 @@
* The sign is returned in the is_negative argument (and is not placed
* in buf).
*/
  -static char *
  - conv_fp(register char format, register double num,
  -boolean_e add_dp, int precision, bool_int *is_negative, char *buf, int *len)
  +static char *conv_fp(register char format, register double num,
  +boolean_e add_dp, int precision, bool_int *is_negative,
  +char *buf, int *len)
   {
   register char *s = buf;
   register char *p;
   int decimal_point;
  +char buf1[NDIG];
   
   if (format == 'f')
  - p = ap_fcvt(num, precision, decimal_point, is_negative);
  + p = ap_fcvt(num, precision, decimal_point, is_negative, buf1);
   else /* either e or E format */
  - p = ap_ecvt(num, precision + 1, decimal_point, is_negative);
  + p = ap_ecvt(num, precision + 1, decimal_point, is_negative, buf1);
   
   /*
* Check for Infinity and NaN
  @@ -493,9 +485,9 @@
   {
   register int mask = (1  nbits) - 1;
   register char *p = buf_end;
  -static char low_digits[] = 0123456789abcdef;
  -static char upper_digits[] = 0123456789ABCDEF;
  -register char *digits = (format == 'X') ? upper_digits : low_digits;
  +static const char low_digits[] = 0123456789abcdef;
  +static const char upper_digits[] = 0123456789ABCDEF;
  +register const char *digits = (format == 'X') ? upper_digits : 
low_digits;
   
   do {
*--p = digits[num  mask];
  
  
  
  1.198 +0 -1  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v

cvs commit: apache-1.3/src/include conf.h

1998-03-26 Thread dgaudet 
dgaudet 98/03/26 11:26:26

  Modified:src  CHANGES
   src/include conf.h
  Log:
  It seems foolish to define SIGURG SIGUSR1 especially when SIGUSR1 is used
  for graceful restarts.  Given that the only usage of SIGURG is now
  protected by a #ifdef we don't really need the definition.  ... similarly
  for BeOS, why define SIGBUS SIGSEGV?
  
  Revision  ChangesPath
  1.734 +3 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.733
  retrieving revision 1.734
  diff -u -r1.733 -r1.734
  --- CHANGES   1998/03/26 19:02:59 1.733
  +++ CHANGES   1998/03/26 19:26:23 1.734
  @@ -1,5 +1,8 @@
   Changes with Apache 1.3b6
   
  +  *) PORT: Clean up undefined signals on some platforms (SCO, BeOS).
  + [Dean Gaudet]
  +
 *) After a SIGHUP the listening sockets in the parent weren't
properly marked for closure on fork().
[Jürgen Keil [EMAIL PROTECTED]] PR#2000
  
  
  
  1.195 +0 -7  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.194
  retrieving revision 1.195
  diff -u -r1.194 -r1.195
  --- conf.h1998/03/17 19:51:48 1.194
  +++ conf.h1998/03/26 19:26:25 1.195
  @@ -391,13 +391,11 @@
   #undef NO_SETSID
   #define NEED_INITGROUPS
   #define NO_WRITEV
  -#define SIGURG SIGUSR1   /* but note, this signal will be sent 
to a process group if enabled (for OOB data). It is not currently enabled. */
   #include sys/time.h
   #define HAVE_SYSLOG 1
   
   #elif defined(SCO5)
   
  -#define SIGURG SIGUSR1
   #define HAVE_SYS_SELECT_H 1
   #define USE_FCNTL_SERIALIZED_ACCEPT
   #define HAVE_MMAP 1
  @@ -682,7 +680,6 @@
   #undef NO_SETSID
   #define HAVE_SHMGET 1
   #define USE_SHMGET_SCOREBOARD
  -#define SIGURG SIGUSR1
   #define USE_FCNTL_SERIALIZED_ACCEPT
   #define HAVE_SYSLOG 1
   
  @@ -718,10 +715,6 @@
   #define NO_WRITEV
   #define NO_KILLPG
   #define NEED_INITGROUPS
  -
  -/* BeOS doesn't have a couple signals... redefine to close ones */
  -#define SIGBUS SIGSEGV
  -#define SIGURG SIGPIPE
   
   #define isascii(c)   (!((c)  ~0177))

cvs commit: apache-1.3/src/include conf.h hide.h

1998-03-17 Thread coar 
coar98/03/17 05:08:56

  Modified:.STATUS
   src  CHANGES
   src/helpers UpdateHide
   src/include conf.h hide.h
  Log:
Make sure that include/hide.h is included always.  Dependencies
from make depend are now stable regardless of the rule's setting.
  
  Revision  ChangesPath
  1.195 +1 -4  apache-1.3/STATUS
  
  Index: STATUS
  ===
  RCS file: /export/home/cvs/apache-1.3/STATUS,v
  retrieving revision 1.194
  retrieving revision 1.195
  diff -u -r1.194 -r1.195
  --- STATUS1998/03/17 12:46:36 1.194
  +++ STATUS1998/03/17 13:08:49 1.195
  @@ -94,13 +94,10 @@
   * Marc's mod_proxy was not clearing the Proxy-Connection header
   * Dean's API_EXPORT and CORE_EXPORT cleanup for core functions
   * Ralf's new ApacheBench support program (src/support/ab.c)
  +* Ken's change HIDE default to yes, always include hide.h
   
   Available Patches:
   
  -* M.D.Parker's [PATCH] mod_status/1448: Status Information have version
  - [EMAIL PROTECTED]
  - Status: Dean +1, Martin +0 (duplicates /server-info?server),
  - Alexei -1 (shared lib concerns)
   
   Concepts:
   
  
  
  
  1.720 +7 -1  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.719
  retrieving revision 1.720
  diff -u -r1.719 -r1.720
  --- CHANGES   1998/03/17 12:46:38 1.719
  +++ CHANGES   1998/03/17 13:08:50 1.720
  @@ -1,5 +1,11 @@
   Changes with Apache 1.3b6
   
  +  *) The default for the HIDE rule is now yes to aid portability, and
  + include/hide.h is always included.  It doesn't do anything if the
  + rule is no but the dependencies don't change now regardless.
  + Previously, a make depend would result in different dependencies
  + according to how the rule was set.  [Ken Coar]
  +
 *) Add the new ApacheBench program ab to src/support/: This is derived
from the ZeusBench benchmarking program and can be used to determine the
response performance of an Apache installation. This version is
  @@ -173,7 +179,7 @@
at a different time from the core, the SERVER_VERSION and
SERVER_BUILT symbols have been abstracted through the new
API routines apapi_get_server_version() and apapi_get_server_built().
  - [Ken Coar]
  + [Ken Coar]  PR#1448
   
 *) WIN32: Preserve trailing slash in canonical path (and hence
   in PATH_INFO). [Paul Sutton, Ben Laurie]
  
  
  
  1.9   +1 -1  apache-1.3/src/helpers/UpdateHide
  
  Index: UpdateHide
  ===
  RCS file: /export/home/cvs/apache-1.3/src/helpers/UpdateHide,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- UpdateHide1998/03/17 08:20:48 1.8
  +++ UpdateHide1998/03/17 13:08:53 1.9
  @@ -74,7 +74,7 @@
   
   #   configuration
   $listbegin  = '\n#ifdef HIDE\n';
  -$listend= '\n#endif\n';
  +$listend= '\n#endif /* HIDE */\n';
   @excluded   = qw(
   main errno environ optarg
   dlclose dlerror dlopen dlsym
  
  
  
  1.192 +6 -2  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.191
  retrieving revision 1.192
  diff -u -r1.191 -r1.192
  --- conf.h1998/03/17 07:54:10 1.191
  +++ conf.h1998/03/17 13:08:54 1.192
  @@ -879,9 +879,13 @@
   #include regex.h
   #endif
   
  -#ifdef HIDE
  +/* We always include the name-concealer file, even if stealth-mode
  + * is off.  This keeps the dependencies the same regardless of the
  + * setting of the HIDE rule.  hide.h either does its thing or not
  + * internally depending on the rule, so it's safe to include under
  + * all circumstances.
  + */
   #include hide.h
  -#endif
   
   #ifdef HAVE_SYS_RESOURCE_H
   #include sys/resource.h
  
  
  
  1.14  +1 -1  apache-1.3/src/include/hide.h
  
  Index: hide.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/hide.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- hide.h1998/03/17 08:22:40 1.13
  +++ hide.h1998/03/17 13:08:55 1.14
  @@ -487,7 +487,7 @@
   /*  
__
*
*  DO NOT EDIT ANYTHING ABOVE THIS LINE - Any changes made here will be 
lost!
  - *  The section below is updated by running the script hide.pl 
  + *  The section above is updated by running the script Helpers/UpdateHide
*/
   
   #endif  /* !APACHE_HTTP_HIDE_H */

cvs commit: apache-1.3/src/include conf.h

1998-03-17 Thread dgaudet 
dgaudet 98/03/17 11:51:49

  Modified:src/include conf.h
  Log:
  notes about API_EXPORT and API_EXPORT_NONSTD
  
  Revision  ChangesPath
  1.194 +9 -0  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.193
  retrieving revision 1.194
  diff -u -r1.193 -r1.194
  --- conf.h1998/03/17 19:38:39 1.193
  +++ conf.h1998/03/17 19:51:48 1.194
  @@ -744,10 +744,19 @@
   #undef NEED_STRDUP
   #endif
   
  +/* stuff marked API_EXPORT is part of the API, and intended for use
  + * by modules
  + */
   #ifndef API_EXPORT
   #define API_EXPORT(type)type
   #endif
   
  +/* Stuff marked API_EXPORT_NONSTD is part of the API, and intended for
  + * use by modules.  The difference between API_EXPORT and
  + * API_EXPORT_NONSTD is that the latter is required for any functions
  + * which use varargs or are used via indirect function call.  This
  + * is to accomodate the two calling conventions in windows dlls.
  + */
   #ifndef API_EXPORT_NONSTD
   #define API_EXPORT_NONSTD(type)type
   #endif

cvs commit: apache-1.3/src/include conf.h

1998-03-03 Thread dgaudet 
dgaudet 98/03/02 17:22:11

  Modified:htdocs/manual new_features_1_3.html
   htdocs/manual/misc perf-tuning.html
   src  CHANGES Configure
   src/include conf.h
  Log:
  Fall back to USE_FCNTL_SERIALIZED_ACCEPT for Solaris.  It's foolish us
  wasting resources trying to solve what may end up being bugs in solaris.
  
  PR:   1779, 1854, 1904
  
  Revision  ChangesPath
  1.47  +1 -2  apache-1.3/htdocs/manual/new_features_1_3.html
  
  Index: new_features_1_3.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/new_features_1_3.html,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- new_features_1_3.html 1998/02/23 08:27:35 1.46
  +++ new_features_1_3.html 1998/03/03 01:21:55 1.47
  @@ -305,8 +305,7 @@
performed for each hit, now it is performed only once per second.
This should be noticeable on servers running with hundreds of
children and high loads.
  -LINew serialization choices improve performance on Linux, Solaris,
  - and IRIX.
  +LINew serialization choices improve performance on Linux, and IRIX.
   LICODEA HREF=mod/mod_log_config.htmlmod_log_config/A/CODE
can be compile-time configured to buffer writes.
   LIReplaced CODEstrncpy()/CODE with CODEap_cpystrn()/CODE, a
  
  
  
  1.9   +4 -2  apache-1.3/htdocs/manual/misc/perf-tuning.html
  
  Index: perf-tuning.html
  ===
  RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/perf-tuning.html,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- perf-tuning.html  1998/02/05 21:19:57 1.8
  +++ perf-tuning.html  1998/03/03 01:21:56 1.9
  @@ -371,8 +371,10 @@
   DTCODEUSE_PTHREAD_SERIALIZED_ACCEPT/CODE
   DD(1.3 or later) This method uses POSIX mutexes and should work on
   any architecture implementing the full POSIX threads specification,
  -however appears to only work on Solaris (2.5 or later).  This is the
  -default for Solaris 2.5 or later.
  +however appears to only work on Solaris (2.5 or later), and even then
  +only in certain configurations.  If you experiment with this you should
  +watch out for your server hanging and not responding.  Static content
  +only servers may work just fine.
   /DL
   
   PIf your system has another method of serialization which isn't in the
  
  
  
  1.678 +8 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.677
  retrieving revision 1.678
  diff -u -r1.677 -r1.678
  --- CHANGES   1998/03/02 10:57:57 1.677
  +++ CHANGES   1998/03/03 01:22:03 1.678
  @@ -1,5 +1,13 @@
   Changes with Apache 1.3b6
   
  +  *) USE_PTHREAD_SERIALIZED_ACCEPT has proven unreliable depending on
  + the rev of Solaris and what mixture of modules are in use.  So
  + it has been disabled, and Solaris is back to using
  + USE_FCNTL_SERIALIZED_ACCEPT.  Users may experiment with
  + USE_PTHREAD_SERIALIZED_ACCEPT at their own risk, it may speed
  + up static content only servers.  Or it may fail unpredictably.
  + [Dean Gaudet] PR#1779, 1854, 1904
  +
 *) mod_test_util_uri.c created which tests the logic in util_uri.c.
[Dean Gaudet]
   
  
  
  
  1.193 +0 -5  apache-1.3/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.192
  retrieving revision 1.193
  diff -u -r1.192 -r1.193
  --- Configure 1998/03/01 12:56:02 1.192
  +++ Configure 1998/03/03 01:22:06 1.193
  @@ -425,11 +425,6 @@
OS=Solaris $PLATOSVERS
CFLAGS=$CFLAGS -DSOLARIS2=$PLATOSVERS
LIBS=$LIBS -lsocket -lnsl
  - case $PLATOSVERS in
  - 2[56789]*)
  - LIBS=$LIBS -lpthread
  - ;;
  - esac
DBM_LIB=
case $PLATOSVERS in
2[01234]*)
  
  
  
  1.186 +2 -6  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.185
  retrieving revision 1.186
  diff -u -r1.185 -r1.186
  --- conf.h1998/02/28 15:39:32 1.185
  +++ conf.h1998/03/03 01:22:10 1.186
  @@ -138,13 +138,9 @@
   #undef NO_SETSID
   #define HAVE_SYS_RESOURCE_H
   #define bzero(a,b) memset(a,0,b)
  -#if SOLARIS2  250
  -#define USE_FCNTL_SERIALIZED_ACCEPT
  -#else
   #if !defined(USE_SYSVSEM_SERIALIZED_ACCEPT)  \
  -!defined(USE_FCNTL_SERIALIZED_ACCEPT)
  -#define USE_PTHREAD_SERIALIZED_ACCEPT
  -#endif
  +!defined(USE_PTHREAD_SERIALIZED_ACCEPT)
  +#define

cvs commit: apache-1.3/src/include conf.h

1998-02-22 Thread martin 
martin  98/02/22 13:14:54

  Modified:src/include conf.h
  Log:
  Update BS2000 configuration defines
  
  Revision  ChangesPath
  1.183 +2 -2  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.182
  retrieving revision 1.183
  diff -u -u -r1.182 -r1.183
  --- conf.h1998/02/21 01:42:36 1.182
  +++ conf.h1998/02/22 21:14:54 1.183
  @@ -466,12 +466,12 @@
   #define NET_SIZE_T size_t
   #define HAVE_SHMGET
   #define USE_SHMGET_SCOREBOARD
  -#ifdef _OSD_POSIX /* BS2000-POSIX mainframe does not have syslog and needs 
initgroups */
  +#ifdef _OSD_POSIX /* BS2000-POSIX mainframe needs initgroups */
   #define NEED_INITGROUPS
   #define NEED_HASHBANG_EMUL /* execve() doesn't start shell scripts by 
default */
  -#undef HAVE_SYSLOG
   #undef HAVE_SHMGET
   #undef USE_SHMGET_SCOREBOARD
  +#undef bzero
   #endif /*_OSD_POSIX*/
   
   #elif defined(UW)

cvs commit: apache-1.3/src/include conf.h

1998-02-18 Thread dgaudet 
dgaudet 98/02/18 12:52:55

  Modified:src  CHANGES
   src/include conf.h
  Log:
  Linux 2.0.x RLIMIT_DATA doesn't do what's expected, RLIMIT_AS does.  Deal
  with it.
  
  PR:   1816
  Submitted by: Enrik Berkhan [EMAIL PROTECTED]
  Reviewed by:  Dean Gaudet
  
  Revision  ChangesPath
  1.638 +4 -0  apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.637
  retrieving revision 1.638
  diff -u -r1.637 -r1.638
  --- CHANGES   1998/02/18 20:44:16 1.637
  +++ CHANGES   1998/02/18 20:52:51 1.638
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3b6
   
  +  *) Linux 2.0 and above implement RLIMIT_AS, RLIMIT_DATA has almost no
  + effect.  Work around it by using RLIMIT_AS for the RLimitMEM
  + directive.  [Enrik Berkhan [EMAIL PROTECTED]] PR#1816
  +
 *) mod_mime_magic error message should indicate the filename when
reads fail.  [M.D.Parker [EMAIL PROTECTED]] PR#1827
   
  
  
  
  1.181 +8 -0  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.180
  retrieving revision 1.181
  diff -u -r1.180 -r1.181
  --- conf.h1998/02/14 13:37:03 1.180
  +++ conf.h1998/02/18 20:52:55 1.181
  @@ -371,6 +371,14 @@
   #if !defined(__GLIBC__) || __GLIBC__  2 || (__GLIBC__ == 2  
__GLIBC_MINOR__  1)
   typedef int rlim_t;
   #endif
  +
  +/* Linux 2.0 and above implement the new posix RLIMIT_AS rather than the
  + * older BSD semantics (some would actually call this a bug, like me -djg).
  + */
  +#ifndef RLIMIT_VMEM
  +#define RLIMIT_VMEM RLIMIT_AS
  +#endif
  +
   /* flock is faster ... but hasn't been tested on 1.x systems */
   #define USE_FLOCK_SERIALIZED_ACCEPT

cvs commit: apache-1.3/src/include conf.h

1998-02-07 Thread dgaudet 
dgaudet 98/02/07 04:11:19

  Modified:src/include conf.h
  Log:
  Tweak to MiNT port.
  
  Submitted by: Jan Paul Schmidt [EMAIL PROTECTED]
  Reviewed by:  Dean Gaudet
  
  Revision  ChangesPath
  1.179 +1 -1  apache-1.3/src/include/conf.h
  
  Index: conf.h
  ===
  RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
  retrieving revision 1.178
  retrieving revision 1.179
  diff -u -r1.178 -r1.179
  --- conf.h1998/02/04 18:18:51 1.178
  +++ conf.h1998/02/07 12:11:18 1.179
  @@ -85,7 +85,7 @@
   #define NO_LONG_DOUBLE
   #define USE_FLOCK_SERIALIZED_ACCEPT
   #define _BSD_SOURCE
  -#define EAGAIN EACCESS
  +#define EAGAIN EWOULDBLOCK
   int initgroups (char *, int); 
   char *crypt (const char *pw, const char *salt);
   int gethostname (char *name, int namelen);