You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2003/12/27 13:00:44 UTC
cvs commit: httpd-2.0/modules/generators mod_status.h mod_status.c
trawick 2003/12/27 04:00:44
Modified: . Tag: APACHE_2_0_BRANCH CHANGES Makefile.in STATUS
configure.in
modules/generators Tag: APACHE_2_0_BRANCH mod_status.c
Added: modules/generators Tag: APACHE_2_0_BRANCH mod_status.h
Log:
Add mod_status hook to allow modules to add to the mod_status
report.
Submitted by: Joe Orton
Reviewed by: trawick, ianh, jerenkrantz
Revision Changes Path
No revision
No revision
1.988.2.207 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.206
retrieving revision 1.988.2.207
diff -u -r1.988.2.206 -r1.988.2.207
--- CHANGES 27 Dec 2003 07:12:40 -0000 1.988.2.206
+++ CHANGES 27 Dec 2003 12:00:42 -0000 1.988.2.207
@@ -1,5 +1,8 @@
Changes with Apache 2.0.49
+ *) Add mod_status hook to allow modules to add to the mod_status
+ report. [Joe Orton]
+
*) Fix htdbm to generate comment fields in DBM files correctly.
[Justin Erenkrantz]
1.127.2.3 +1 -0 httpd-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.in,v
retrieving revision 1.127.2.2
retrieving revision 1.127.2.3
diff -u -r1.127.2.2 -r1.127.2.3
--- Makefile.in 25 Aug 2003 00:12:06 -0000 1.127.2.2
+++ Makefile.in 27 Dec 2003 12:00:42 -0000 1.127.2.3
@@ -174,6 +174,7 @@
@cp -p $(srcdir)/modules/dav/main/mod_dav.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/filters/mod_include.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/generators/mod_cgi.h $(DESTDIR)$(includedir)
+ @cp -p $(srcdir)/modules/generators/mod_status.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/loggers/mod_log_config.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/http/mod_core.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/proxy/mod_proxy.h $(DESTDIR)$(includedir)
1.751.2.610 +1 -8 httpd-2.0/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/STATUS,v
retrieving revision 1.751.2.609
retrieving revision 1.751.2.610
diff -u -r1.751.2.609 -r1.751.2.610
--- STATUS 27 Dec 2003 07:41:28 -0000 1.751.2.609
+++ STATUS 27 Dec 2003 12:00:42 -0000 1.751.2.610
@@ -336,13 +336,6 @@
jerenkrantz: Could we do this on other platforms, too?
+1: trawick, stoddard, jerenkrantz
- * mod_status hook
- configure.in r1.254
- Makefile.in r1.134
- modules/generators/mod_status.c r1.73
- modules/generators/mod_status.h r1.1,r1.2
- +1: trawick, ianh, jerenkrantz
-
CURRENT RELEASE NOTES:
* Backwards compatibility is expected of future Apache 2.0 releases,
1.232.2.12 +1 -1 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.232.2.11
retrieving revision 1.232.2.12
diff -u -r1.232.2.11 -r1.232.2.12
--- configure.in 29 Sep 2003 12:08:06 -0000 1.232.2.11
+++ configure.in 27 Dec 2003 12:00:42 -0000 1.232.2.12
@@ -135,7 +135,7 @@
APR_ADDTO(INCLUDES, [-I\$(srcdir) -I\$(top_builddir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_builddir)/include])
fi
-APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include])
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include -I\$(top_srcdir)/modules/generators])
echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}"
No revision
No revision
1.71.2.3 +17 -0 httpd-2.0/modules/generators/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.c,v
retrieving revision 1.71.2.2
retrieving revision 1.71.2.3
diff -u -r1.71.2.2 -r1.71.2.3
--- mod_status.c 14 Dec 2003 00:26:12 -0000 1.71.2.2
+++ mod_status.c 27 Dec 2003 12:00:43 -0000 1.71.2.3
@@ -107,6 +107,7 @@
#include <time.h>
#include "scoreboard.h"
#include "http_log.h"
+#include "mod_status.h"
#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -149,6 +150,12 @@
static pid_t child_pid;
#endif
+/* Implement 'ap_run_status_hook'. */
+AP_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(int,status_hook,
+ (request_rec *r, int flags),
+ (r, flags),
+ OK, DECLINED)
+
/*
* command-related code. This is here to prevent use of ExtendedStatus
* without status_module included.
@@ -821,6 +828,16 @@
"information you need to use the "
"<code>ExtendedStatus On</code> directive.\n", r);
}
+ }
+
+ {
+ /* Run extension hooks to insert extra content. */
+ int flags =
+ (short_report ? AP_STATUS_SHORT : 0) |
+ (no_table_report ? AP_STATUS_NOTABLE : 0) |
+ (ap_extended_status ? AP_STATUS_EXTENDED : 0);
+
+ ap_run_status_hook(r, flags);
}
if (!short_report) {
No revision
Index: mod_status.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.c,v
retrieving revision 1.71.2.2
retrieving revision 1.71.2.3
diff -u -r1.71.2.2 -r1.71.2.3
--- mod_status.c 14 Dec 2003 00:26:12 -0000 1.71.2.2
+++ mod_status.c 27 Dec 2003 12:00:43 -0000 1.71.2.3
@@ -107,6 +107,7 @@
#include <time.h>
#include "scoreboard.h"
#include "http_log.h"
+#include "mod_status.h"
#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -149,6 +150,12 @@
static pid_t child_pid;
#endif
+/* Implement 'ap_run_status_hook'. */
+AP_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(int,status_hook,
+ (request_rec *r, int flags),
+ (r, flags),
+ OK, DECLINED)
+
/*
* command-related code. This is here to prevent use of ExtendedStatus
* without status_module included.
@@ -821,6 +828,16 @@
"information you need to use the "
"<code>ExtendedStatus On</code> directive.\n", r);
}
+ }
+
+ {
+ /* Run extension hooks to insert extra content. */
+ int flags =
+ (short_report ? AP_STATUS_SHORT : 0) |
+ (no_table_report ? AP_STATUS_NOTABLE : 0) |
+ (ap_extended_status ? AP_STATUS_EXTENDED : 0);
+
+ ap_run_status_hook(r, flags);
}
if (!short_report) {
No revision
Index: mod_status.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.c,v
retrieving revision 1.71.2.2
retrieving revision 1.71.2.3
diff -u -r1.71.2.2 -r1.71.2.3
--- mod_status.c 14 Dec 2003 00:26:12 -0000 1.71.2.2
+++ mod_status.c 27 Dec 2003 12:00:43 -0000 1.71.2.3
@@ -107,6 +107,7 @@
#include <time.h>
#include "scoreboard.h"
#include "http_log.h"
+#include "mod_status.h"
#if APR_HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -149,6 +150,12 @@
static pid_t child_pid;
#endif
+/* Implement 'ap_run_status_hook'. */
+AP_IMPLEMENT_OPTIONAL_HOOK_RUN_ALL(int,status_hook,
+ (request_rec *r, int flags),
+ (r, flags),
+ OK, DECLINED)
+
/*
* command-related code. This is here to prevent use of ExtendedStatus
* without status_module included.
@@ -821,6 +828,16 @@
"information you need to use the "
"<code>ExtendedStatus On</code> directive.\n", r);
}
+ }
+
+ {
+ /* Run extension hooks to insert extra content. */
+ int flags =
+ (short_report ? AP_STATUS_SHORT : 0) |
+ (no_table_report ? AP_STATUS_NOTABLE : 0) |
+ (ap_extended_status ? AP_STATUS_EXTENDED : 0);
+
+ ap_run_status_hook(r, flags);
}
if (!short_report) {
1.2.2.1 +0 -0 httpd-2.0/modules/generators/mod_status.h
Index: mod_status.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_status.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1