1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
## _ _
## _ __ ___ ___ __| | ___ ___| | mod_ssl
## | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
## | | | | | | (_) | (_| | \__ \__ \ | www.modssl.org
## |_| |_| |_|\___/ \__,_|___|___/___/_| ftp.modssl.org
## |_____|
## ____________________________________________________________________________
##
## Annotated patch file: addon.patch
## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
## Created on: 30-Oct-2004
##
## This file assembles changes to existing Apache source files
## between the original Apache and the patched variant. It can be
## automatically applied to a vanilla Apache source tree with the
## 'patch' tool to upgrade those files. Each patch snippet is
## annotated with a short description.
##
+---------------------------------------------------------------------------
| Add an entry for mod_define.
+---------------------------------------------------------------------------
Index: src/Configuration.tmpl
--- src/Configuration.tmpl 11 May 2004 18:28:09 -0000 1.1.1.8
+++ src/Configuration.tmpl 11 May 2004 18:32:15 -0000 1.24
@@ -258,6 +313,11 @@
AddModule modules/standard/mod_env.o
+## mod_define expands variables on arbitrary directive lines.
+## It requires Extended API (EAPI).
+
+# AddModule modules/extra/mod_define.o
+
##
## Request logging modules
##
+---------------------------------------------------------------------------
| Add more beautiful optic to the status page table..
+---------------------------------------------------------------------------
Index: src/modules/standard/mod_status.c
--- src/modules/standard/mod_status.c 11 May 2004 18:28:20 -0000 1.1.1.16
+++ src/modules/standard/mod_status.c 11 May 2004 18:32:16 -0000 1.13
@@ -441,12 +441,33 @@
if (no_table_report)
ap_rputs("<p><hr><h2>Server Details</h2>\n\n", r);
else
+#ifndef NO_PRETTYPRINT
+ ap_rputs("<p>\n\n<table bgcolor=\"#ffffff\" border=\"0\">"
+ "<tr bgcolor=000000>"
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Srv</b></font></td>"
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>PID</b></font></td>"
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Acc</b></font></td>"
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>M</b></font></td>"
+#ifndef NO_TIMES
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>CPU</b></font></td>"
+#endif
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>SS</b></font></td>"
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Req</b></font></td>"
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Conn</b></font></td>"
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Child</b></font></td>"
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Slot</b></font></td>"
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Host</b></font></td>"
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>VHost</b></font></td>"
+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Request</b></td>"
+ "</tr>\n", r);
+#else /* NO_PRETTYPRINT */
#ifdef NO_TIMES
/* Allow for OS/2 not having CPU stats */
ap_rputs("<p>\n\n<table border=0><tr><th>Srv<th>PID<th>Acc<th>M\n<th>SS<th>Req<th>Conn<th>Child<th>Slot<th>Client<th>VHost<th>Request</tr>\n\n", r);
#else
ap_rputs("<p>\n\n<table border=0><tr><th>Srv<th>PID<th>Acc<th>M<th>CPU\n<th>SS<th>Req<th>Conn<th>Child<th>Slot<th>Client<th>VHost<th>Request</tr>\n\n", r);
#endif
+#endif /* NO_PRETTYPRINT */
}
for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
@@ -574,6 +595,11 @@
vhost->server_hostname) : "(unavailable)");
}
else { /* !no_table_report */
+#ifndef NO_PRETTYPRINT
+ ap_rprintf(r,"<tr bgcolor=\"#ffffff\">");
+#else
+ ap_rprintf(r,"<tr>");
+#endif
if (score_record.status == SERVER_DEAD)
#ifdef TPF
if (kill(ps_record.pid, 0) == 0) {
@@ -586,12 +612,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) conn_lres, my_lres, lres);
else
ap_rprintf(r,
- "<tr><td><b>%d-%d</b><td>%d<td>%d/%lu/%lu",
+ "<td><b>%d-%d</b><td>%d<td>%d/%lu/%lu",
i, (int) ps_record.generation,
(int) ps_record.pid, (int) conn_lres,
my_lres, lres);
@@ -695,6 +732,12 @@
#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
+
} else {
if (!short_report) {
+---------------------------------------------------------------------------
| Add a hyperlink to the mod_define.html document.
+---------------------------------------------------------------------------
Index: htdocs/manual/mod/index.html.en
--- htdocs/manual/mod/index.html.en 11 May 2004 18:28:01 -0000 1.1.1.3
+++ htdocs/manual/mod/index.html.en 11 May 2004 18:32:14 -0000 1.4
@@ -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.en
--- htdocs/manual/mod/directives.html.en 11 May 2004 18:28:01 -0000 1.1.1.6
+++ htdocs/manual/mod/directives.html.en 11 May 2004 18:32:14 -0000 1.7
@@ -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>
|
