rse 98/10/03 08:24:51
Modified: src CHANGES
src/modules/standard mod_status.c
Log:
Fallback from sysconf-based to plain HZ-based `ticks per second'
calculation in mod_status for all systems which don't have POSIX
sysconf() (like UTS 2.1) and not only for the NEXT platform.
Submitted by: Dave Dykstra <[EMAIL PROTECTED]>
Reviewed by: Ralf S. Engelschall
PR: 3055
Revision Changes Path
1.1095 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1094
retrieving revision 1.1095
diff -u -r1.1094 -r1.1095
--- CHANGES 1998/10/03 15:11:50 1.1094
+++ CHANGES 1998/10/03 15:24:48 1.1095
@@ -1,4 +1,9 @@
Changes with Apache 1.3.3
+
+ *) Fallback from sysconf-based to plain HZ-based `ticks per second'
+ calculation in mod_status for all systems which don't have POSIX
+ sysconf() (like UTS 2.1) and not only for the NEXT platform.
+ [Dave Dykstra <[EMAIL PROTECTED]>] PR#3055
*) Fix `require ...' directive parsing in mod_auth, mod_auth_dbm and
mod_auth_db by using ap_getword_white() (which uses ap_isspace())
instead of
1.99 +5 -3 apache-1.3/src/modules/standard/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- mod_status.c 1998/08/12 10:23:46 1.98
+++ mod_status.c 1998/10/03 15:24:51 1.99
@@ -240,10 +240,12 @@
unsigned long bcount = 0;
unsigned long kbcount = 0;
long req_time;
-#if defined(NEXT)
- float tick = HZ;
-#elif !defined(NO_TIMES)
+#ifndef NO_TIMES
+#ifdef _SC_CLK_TCK
float tick = sysconf(_SC_CLK_TCK);
+#else
+ float tick = HZ;
+#endif
#endif
int short_report = 0;
int no_table_report = 0;
