You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dg...@hyperreal.org on 1998/06/06 22:48:55 UTC

cvs commit: apache-1.3/src/main http_main.c

dgaudet     98/06/06 13:48:55

  Modified:    src      CHANGES Configure
               src/main http_main.c
  Log:
  define WORKAROUND_SOLARIS_BUG for NCR systems as well.
  
  PR:		1973
  Submitted by:	Klaus Weber <kw...@chephren.germany.ncr.com>
  
  Revision  Changes    Path
  1.892     +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.891
  retrieving revision 1.892
  diff -u -r1.891 -r1.892
  --- CHANGES	1998/06/06 19:46:58	1.891
  +++ CHANGES	1998/06/06 20:48:51	1.892
  @@ -1,5 +1,9 @@
   Changes with Apache 1.3.1
   
  +  *) PORT: NCR MPRAS systems have the same bug with SIGHUP restart that
  +     Solaris systems experience.  So define WORKAROUND_SOLARIS_BUG.
  +     [Klaus Weber <kw...@chephren.germany.ncr.com>] PR#1973
  +
     *) Change "Options None" to "Options FollowSymLinks" in the 
        <Directory /> section of the default access.conf-dist
        (and -win even though it doesn't matter there).  This has better
  
  
  
  1.264     +6 -0      apache-1.3/src/Configure
  
  Index: Configure
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/Configure,v
  retrieving revision 1.263
  retrieving revision 1.264
  diff -u -r1.263 -r1.264
  --- Configure	1998/06/06 19:30:39	1.263
  +++ Configure	1998/06/06 20:48:52	1.264
  @@ -616,6 +616,12 @@
   	LIBS="$LIBS -lsocket -lnsl"
   	DEF_WANTHSREGEX=yes
   	;;
  +    i486-ncr-sysv4)
  +	OS='NCR MP/RAS'
  +	CFLAGS="$CFLAGS -DSVR4 -DMPRAS"
  +	LIBS="$LIBS -lsocket -lnsl -lc -L/usr/ucblib -lucb"
  +	DEF_WANTHSREGEX=yes
  +	;;
       *-sysv4*)
   	OS='SVR4'
   	CFLAGS="$CFLAGS -DSVR4"
  
  
  
  1.360     +5 -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.359
  retrieving revision 1.360
  diff -u -r1.359 -r1.360
  --- http_main.c	1998/06/06 19:30:47	1.359
  +++ http_main.c	1998/06/06 20:48:54	1.360
  @@ -2843,6 +2843,11 @@
   #define WORKAROUND_SOLARIS_BUG
   #endif
   
  +    /* PR#1973 NCR SVR4 systems appear to have the same problem */
  +#if defined (MPRAS)
  +#define WORKAROUND_SOLARIS_BUG
  +#endif
  +
   #ifndef WORKAROUND_SOLARIS_BUG
       s = ap_slack(s, AP_SLACK_HIGH);