##
## Annotated patch file: addon.patch
## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
-## Created on: 20-May-2001
+## Created on: 18-Jul-2003
##
## This file assembles changes to existing Apache source files
## between the original Apache and the patched variant. It can be
| Add an entry for mod_define.
+---------------------------------------------------------------------------
Index: src/Configuration.tmpl
---- src/Configuration.tmpl 1999/08/17 11:21:38 1.1.1.5
-+++ src/Configuration.tmpl 2000/10/09 12:15:02 1.21
-@@ -243,6 +298,11 @@
+--- src/Configuration.tmpl 28 Jan 2002 19:21:21 -0000 1.1.1.7
++++ src/Configuration.tmpl 28 Jan 2002 19:40:56 -0000 1.23
+@@ -258,6 +313,11 @@
AddModule modules/standard/mod_env.o
| Add more beautiful optic to the status page table..
+---------------------------------------------------------------------------
Index: src/modules/standard/mod_status.c
---- src/modules/standard/mod_status.c 2001/05/20 08:16:21 1.1.1.12
-+++ src/modules/standard/mod_status.c 2001/05/20 08:23:02 1.9
-@@ -482,12 +482,33 @@
+--- src/modules/standard/mod_status.c 18 Jul 2003 15:44:39 -0000 1.1.1.15
++++ src/modules/standard/mod_status.c 18 Jul 2003 15:56:59 -0000 1.12
+@@ -484,12 +484,33 @@
if (no_table_report)
ap_rputs("<p><hr><h2>Server Details</h2>\n\n", r);
else
}
for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
-@@ -605,14 +626,19 @@
+@@ -617,6 +638,11 @@
vhost->server_hostname) : "(unavailable)");
}
else { /* !no_table_report */
+ ap_rprintf(r,"<tr>");
+#endif
if (score_record.status == SERVER_DEAD)
+ #ifdef TPF
+ if (kill(ps_record.pid, 0) == 0) {
+@@ -629,12 +655,12 @@
+ } else
+ #endif /* TPF */
ap_rprintf(r,
- "<tr><td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
+ "<td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
i, (int) ps_record.generation,
(int) ps_record.pid, (int) conn_lres,
my_lres, lres);
-@@ -672,12 +698,23 @@
- ap_rprintf(r,
- "<td>?<td nowrap>?<td nowrap>..reading.. </tr>\n\n");
- else
-+#ifndef NO_PRETTYPRINT
-+ ap_rprintf(r,
-+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
-+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
-+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
-+ "</tr>\n\n",
-+ score_record.client,
-+ vhost ? vhost->server_hostname : "(unavailable)",
-+ ap_escape_html(r->pool, score_record.request));
-+#else
- ap_rprintf(r,
- "<td>%s<td nowrap>%s<td nowrap>%s</tr>\n\n",
- ap_escape_html(r->pool, score_record.client),
- vhost ? ap_escape_html(r->pool,
- vhost->server_hostname) : "(unavailable)",
- ap_escape_html(r->pool, score_record.request));
+@@ -737,6 +774,12 @@
+ </table>\n", r);
+ #endif
+ }
++
++#ifdef EAPI
++ ap_hook_use("ap::mod_status::display",
++ AP_HOOK_SIG4(void,ptr,int,int), AP_HOOK_ALL,
++ r, no_table_report, short_report);
+#endif
- } /* no_table_report */
- } /* !short_report */
- } /* if (<active child>) */
+
+ } else {
+
+---------------------------------------------------------------------------
| Add a hyperlink to the mod_define.html document.
+---------------------------------------------------------------------------
-Index: htdocs/manual/mod/index.html
---- htdocs/manual/mod/index.html 2001/01/23 11:35:19 1.1.1.4
-+++ htdocs/manual/mod/index.html 2001/01/23 11:48:05 1.10
-@@ -65,6 +65,8 @@
- <DT><A HREF="mod_cookies.html">mod_cookies</A> up to Apache 1.1.1
- <DD>Support for Netscape-like cookies. Replaced in Apache 1.2 by
- mod_usertrack
-+<DT><A HREF="mod_define.html">mod_define</A>
-+<DD>Variable Definition for Arbitrary Directives
- <DT><A HREF="mod_digest.html">mod_digest</A> Apache 1.1 and up
- <DD>MD5 authentication
- <DT><A HREF="mod_dir.html">mod_dir</A>
+Index: htdocs/manual/mod/index.html.en
+--- htdocs/manual/mod/index.html.en 28 Jan 2002 19:21:43 -0000 1.1.1.2
++++ htdocs/manual/mod/index.html.en 28 Jan 2002 19:40:56 -0000 1.3
+@@ -101,6 +101,10 @@
+ <dd>Support for Netscape-like cookies. Replaced in Apache 1.2
+ by mod_usertrack</dd>
+
++ <dt><a href="mod_define.html">mod_define</a></dt>
++
++ <dd>Variable Definition for Arbitrary Directives</dd>
++
+ <dt><a href="mod_digest.html">mod_digest</a> Apache 1.1 and
+ up</dt>
+
+---------------------------------------------------------------------------
| Add a hyperlink for the Define directives.
+---------------------------------------------------------------------------
-Index: htdocs/manual/mod/directives.html
---- htdocs/manual/mod/directives.html 2001/05/20 08:16:32 1.1.1.10
-+++ htdocs/manual/mod/directives.html 2001/05/20 08:23:01 1.20
-@@ -99,6 +99,7 @@
- <LI><A HREF="mod_autoindex.html#defaulticon">DefaultIcon</A>
- <LI><A HREF="mod_mime.html#defaultlanguage">DefaultLanguage</A>
- <LI><A HREF="core.html#defaulttype">DefaultType</A>
-+<LI><A HREF="mod_define.html#define">Define</A>
- <LI><A HREF="mod_access.html#deny">Deny</A>
- <LI><A HREF="core.html#directory"><Directory></A>
- <LI><A HREF="core.html#directorymatch"><DirectoryMatch></A>
+Index: htdocs/manual/mod/directives.html.en
+--- htdocs/manual/mod/directives.html.en 18 Jul 2003 15:44:16 -0000 1.1.1.5
++++ htdocs/manual/mod/directives.html.en 18 Jul 2003 15:56:57 -0000 1.6
+@@ -228,6 +228,8 @@
+
+ <li><a href="core.html#defaulttype">DefaultType</a></li>
+
++ <li><a href="mod_define.html#define">Define</a>
++
+ <li><a href="mod_access.html#deny">Deny</a></li>
+
+ <li><a href="core.html#directory"><Directory></a></li>
projects / packages / apache.git / blobdiff