2 ## _ __ ___ ___ __| | ___ ___| | mod_ssl
3 ## | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
4 ## | | | | | | (_) | (_| | \__ \__ \ | www.modssl.org
5 ## |_| |_| |_|\___/ \__,_|___|___/___/_| ftp.modssl.org
7 ## ____________________________________________________________________________
9 ## Annotated patch file: addon.patch
10 ## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
11 ## Created on: 01-Feb-2002
13 ## This file assembles changes to existing Apache source files
14 ## between the original Apache and the patched variant. It can be
15 ## automatically applied to a vanilla Apache source tree with the
16 ## 'patch' tool to upgrade those files. Each patch snippet is
17 ## annotated with a short description.
20 +---------------------------------------------------------------------------
21 | Add an entry for mod_define.
22 +---------------------------------------------------------------------------
23 Index: src/Configuration.tmpl
24 --- src/Configuration.tmpl 2002/01/28 19:21:21 1.1.1.7
25 +++ src/Configuration.tmpl 2002/01/28 19:40:56 1.23
28 AddModule modules/standard/mod_env.o
30 +## mod_define expands variables on arbitrary directive lines.
31 +## It requires Extended API (EAPI).
33 +# AddModule modules/extra/mod_define.o
36 ## Request logging modules
39 +---------------------------------------------------------------------------
40 | Add more beautiful optic to the status page table..
41 +---------------------------------------------------------------------------
42 Index: src/modules/standard/mod_status.c
43 --- src/modules/standard/mod_status.c 2002/01/28 19:21:28 1.1.1.13
44 +++ src/modules/standard/mod_status.c 2002/01/28 19:40:57 1.10
47 ap_rputs("<p><hr><h2>Server Details</h2>\n\n", r);
49 +#ifndef NO_PRETTYPRINT
50 + ap_rputs("<p>\n\n<table bgcolor=\"#ffffff\" border=\"0\">"
51 + "<tr bgcolor=000000>"
52 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Srv</b></font></td>"
53 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>PID</b></font></td>"
54 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Acc</b></font></td>"
55 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>M</b></font></td>"
57 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>CPU</b></font></td>"
59 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>SS</b></font></td>"
60 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Req</b></font></td>"
61 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Conn</b></font></td>"
62 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Child</b></font></td>"
63 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Slot</b></font></td>"
64 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Host</b></font></td>"
65 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>VHost</b></font></td>"
66 + "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Request</b></td>"
68 +#else /* NO_PRETTYPRINT */
70 /* Allow for OS/2 not having CPU stats */
71 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);
73 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);
75 +#endif /* NO_PRETTYPRINT */
78 for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
80 vhost->server_hostname) : "(unavailable)");
82 else { /* !no_table_report */
83 +#ifndef NO_PRETTYPRINT
84 + ap_rprintf(r,"<tr bgcolor=\"#ffffff\">");
86 + ap_rprintf(r,"<tr>");
88 if (score_record.status == SERVER_DEAD)
90 - "<tr><td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
91 + "<td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
92 i, (int) ps_record.generation,
93 (int) conn_lres, my_lres, lres);
96 - "<tr><td><b>%d-%d</b><td>%d<td>%d/%lu/%lu",
97 + "<td><b>%d-%d</b><td>%d<td>%d/%lu/%lu",
98 i, (int) ps_record.generation,
99 (int) ps_record.pid, (int) conn_lres,
101 @@ -674,12 +700,23 @@
103 "<td>?<td nowrap>?<td nowrap>..reading.. </tr>\n\n");
105 +#ifndef NO_PRETTYPRINT
107 + "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
108 + "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
109 + "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
111 + score_record.client,
112 + vhost ? vhost->server_hostname : "(unavailable)",
113 + ap_escape_html(r->pool, score_record.request));
116 "<td>%s<td nowrap>%s<td nowrap>%s</tr>\n\n",
117 ap_escape_html(r->pool, score_record.client),
118 vhost ? ap_escape_html(r->pool,
119 vhost->server_hostname) : "(unavailable)",
120 ap_escape_html(r->pool, score_record.request));
122 } /* no_table_report */
123 } /* !short_report */
124 } /* if (<active child>) */
126 +---------------------------------------------------------------------------
127 | Add a hyperlink to the mod_define.html document.
128 +---------------------------------------------------------------------------
129 Index: htdocs/manual/mod/index.html.en
130 --- htdocs/manual/mod/index.html.en 2002/01/28 19:21:43 1.1.1.2
131 +++ htdocs/manual/mod/index.html.en 2002/01/28 19:40:56 1.3
133 <dd>Support for Netscape-like cookies. Replaced in Apache 1.2
134 by mod_usertrack</dd>
136 + <dt><a href="mod_define.html">mod_define</a></dt>
138 + <dd>Variable Definition for Arbitrary Directives</dd>
140 <dt><a href="mod_digest.html">mod_digest</a> Apache 1.1 and
144 +---------------------------------------------------------------------------
145 | Add a hyperlink for the Define directives.
146 +---------------------------------------------------------------------------
147 Index: htdocs/manual/mod/directives.html.en
148 --- htdocs/manual/mod/directives.html.en 2002/01/28 19:21:43 1.1.1.2
149 +++ htdocs/manual/mod/directives.html.en 2002/01/28 19:40:56 1.3
152 <li><a href="core.html#defaulttype">DefaultType</a></li>
154 + <li><a href="mod_define.html#define">Define</a>
156 <li><a href="mod_access.html#deny">Deny</a></li>
158 <li><a href="core.html#directory"><Directory></a></li>