dgaudet 97/04/27 00:52:20
Modified: htdocs/manual/mod core.html
src CHANGES Configuration.tmpl Configure conf.h
src/helpers GuessOS
Log:
Clean up Linux configuration by detecting 2.x linux and enabling HAVE_SHMGET,
and HAVE_SYS_RESOURCE_H. Don't touch Linux 1.x systems for fear of various
compatibility problems. Ditch that silly hack LINUX_TWEAK that I wish
I hadn't introduced.
Reviewed by: Paul S., Roy
Revision Changes Path
1.53 +7 -6 apache/htdocs/manual/mod/core.html
Index: core.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -C3 -r1.52 -r1.53
*** core.html 1997/04/25 20:49:04 1.52
--- core.html 1997/04/27 07:52:14 1.53
***************
*** 1133,1149 ****
Apache 1.2 and above:<p>
! Linux 2.x users should consider defining <code>Rules LINUX_TWEAK=yes</code>
! in the <code>Configuration</code> file which will cause the server to
! use shared memory instead of a scoreboard file. This is known to cause
! compilation problems with some distributions and kernels, so we have not
! enabled it by default. (Patches to conditionally determine the ability
! to set this option are quite welcome.)<p>
SVR4 users should consider adding <code>-DHAVE_SHMGET</code> to the
<code>EXTRA_CFLAGS</code> in your <code>Configuration</code>. This
is believed to work, but we were unable to test it in time for 1.2
release.<p>
<p><hr>
--- 1133,1150 ----
Apache 1.2 and above:<p>
! Linux 1.x users might be able to add <code>-DHAVE_SHMGET</code> to
! the <code>EXTRA_CFLAGS</code> in your <code>Configuration</code>. This
! might work with some 1.x installations, but won't work with all of
! them.<p>
SVR4 users should consider adding <code>-DHAVE_SHMGET</code> to the
<code>EXTRA_CFLAGS</code> in your <code>Configuration</code>. This
is believed to work, but we were unable to test it in time for 1.2
release.<p>
+
+ <strong>See Also</strong>:
+ <a href="../stopping.html">Stopping and Restarting Apache</a></p>
<p><hr>
1.254 +4 -4 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.253
retrieving revision 1.254
diff -C3 -r1.253 -r1.254
*** CHANGES 1997/04/27 07:45:02 1.253
--- CHANGES 1997/04/27 07:52:16 1.254
***************
*** 82,91 ****
<Directory> sections missing a trailing /.
[Ralf S. Engelschall]
! *) Back out the HAVE_SHMGET change for Linux because it's too late in
! the beta cycle to deal cleanly with compilation problems on the
! myriad of linux systems out there. Linux users should see
! Configuration.tmpl about defining "Rule LINUX_TWEAK=yes".
[Dean Gaudet] PR#336, PR#340
*) Redirect did not preserve ?query_strings when present in the client's
--- 82,91 ----
<Directory> sections missing a trailing /.
[Ralf S. Engelschall]
! *) Clean up Linux settings in conf.h by detecting 2.x versus 1.x. For
! 1.x the settings are those of pre-1.2b8. For 2.x we include
! HAVE_SHMGET (scoreboard in shared memory rather than file) and
! HAVE_SYS_RESOURCE_H (enable the RLimit commands).
[Dean Gaudet] PR#336, PR#340
*) Redirect did not preserve ?query_strings when present in the client's
1.60 +1 -9 apache/src/Configuration.tmpl
Index: Configuration.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
retrieving revision 1.59
retrieving revision 1.60
diff -C3 -r1.59 -r1.60
*** Configuration.tmpl 1997/04/25 22:02:44 1.59
--- Configuration.tmpl 1997/04/27 07:52:16 1.60
***************
*** 57,63 ****
# functions. The format is: Rule RULE=value
#
# At present, only the following RULES are known: WANTHSREGEX, SOCKS4,
! # STATUS, IRIXNIS, and LINUX_TWEAK.
#
# For all Rules, if set to "yes", then Configure knows we want that
# capability and does what is required to add it in. If set to "default"
--- 57,63 ----
# functions. The format is: Rule RULE=value
#
# At present, only the following RULES are known: WANTHSREGEX, SOCKS4,
! # STATUS, and IRIXNIS.
#
# For all Rules, if set to "yes", then Configure knows we want that
# capability and does what is required to add it in. If set to "default"
***************
*** 80,97 ****
# SGI IRIX. If you are, and you are using NIS, you should set this
# to 'yes'
#
- # LINUX_TWEAK:
- # Only takes effect if Configure determines that you are running a Linux
- # system. This enables two optimizations that work well on i386 linux 2.0
- # or later systems. They aren't enabled by default because of kernel and
- # library problems with various versions of linux. We'd rather release
- # something known stable and let you choose the optimizations yourself.
- #
Rule STATUS=yes
Rule SOCKS4=no
Rule IRIXNIS=no
- Rule LINUX_TWEAK=no
# The following rules should be set automatically by Configure. However, if
# they are not set by Configure (because we don't know the correct value for
--- 80,89 ----
1.93 +7 -6 apache/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.92
retrieving revision 1.93
diff -C3 -r1.92 -r1.93
*** Configure 1997/04/15 20:00:21 1.92
--- Configure 1997/04/27 07:52:16 1.93
***************
*** 133,139 ****
RULE_STATUS=`./helpers/CutRule STATUS $file`
RULE_SOCKS4=`./helpers/CutRule SOCKS4 $file`
RULE_IRIXNIS=`./helpers/CutRule IRIXNIS $file`
- RULE_LINUX_TWEAK=`./helpers/CutRule LINUX_TWEAK $file`
#
# Now we determine the OS/Platform automagically, thanks to
--- 133,138 ----
***************
*** 259,271 ****
CFLAGS="$CFLAGS -DIRIX"
fi
;;
! *-linux*)
DEF_WANTHSREGEX=yes
OS='Linux'
! CFLAGS="$CFLAGS -DLINUX"
! if [ "$RULE_LINUX_TWEAK" = "yes" ]; then
! CFLAGS="$CFLAGS -DLINUX_TWEAK"
! fi
;;
*-lynx-lynxos*)
OS='LynxOS'
--- 258,272 ----
CFLAGS="$CFLAGS -DIRIX"
fi
;;
! *-linux2)
DEF_WANTHSREGEX=yes
OS='Linux'
! CFLAGS="$CFLAGS -DLINUX=2"
! ;;
! *-linux1)
! DEF_WANTHSREGEX=yes
! OS='Linux'
! CFLAGS="$CFLAGS -DLINUX=1"
;;
*-lynx-lynxos*)
OS='LynxOS'
1.95 +4 -12 apache/src/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.94
retrieving revision 1.95
diff -C3 -r1.94 -r1.95
*** conf.h 1997/04/26 20:20:06 1.94
--- conf.h 1997/04/27 07:52:17 1.95
***************
*** 253,272 ****
#define NO_USE_SIGACTION
#elif defined(LINUX)
! #ifndef LINUX_TWEAK
! /* the old "stable" way ... it's unfortunate that by doing this we'll incur
! * bug reports from linux users that run multiple Apaches without setting
! * a different ScoreBoardFile for each of them.
! */
! /* #define HAVE_SHMGET */
! #define USE_FCNTL_SERIALIZED_ACCEPT
! #else
! /* this stuff works under 2.0 on i386, but we've had bug reports of it
! * causing compile-time problems on 1.x systems, and on 2.x alphas.
! */
#define HAVE_SHMGET
! /* #define USE_FCNTL_SERIALIZED_ACCEPT */
#endif
#undef HAVE_GMTOFF
#undef NO_KILLPG
#undef NO_SETSID
--- 253,264 ----
#define NO_USE_SIGACTION
#elif defined(LINUX)
! #if LINUX > 1
#define HAVE_SHMGET
! #define HAVE_SYS_RESOURCE_H
! typedef int rlim_t;
#endif
+ #define USE_FCNTL_SERIALIZED_ACCEPT
#undef HAVE_GMTOFF
#undef NO_KILLPG
#undef NO_SETSID
1.19 +6 -2 apache/src/helpers/GuessOS
Index: GuessOS
===================================================================
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.18
retrieving revision 1.19
diff -C3 -r1.18 -r1.19
*** GuessOS 1997/02/20 00:54:21 1.18
--- GuessOS 1997/04/27 07:52:19 1.19
***************
*** 90,97 ****
echo "${MACHINE}-sgi-irix64"; exit 0
;;
! Linux:*)
! echo "${MACHINE}-whatever-linux"; exit 0
;;
LynxOS:*)
--- 90,101 ----
echo "${MACHINE}-sgi-irix64"; exit 0
;;
! Linux:[2-9].*)
! echo "${MACHINE}-whatever-linux2"; exit 0
! ;;
!
! Linux:1.*)
! echo "${MACHINE}-whatever-linux1"; exit 0
;;
LynxOS:*)
