]> git.pld-linux.org Git - packages/apache.git/blame - apache-mod_ssl-addon.patch
projects / packages / apache.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- removed %%lang(en)
[packages/apache.git] / apache-mod_ssl-addon.patch
CommitLineData
bac1ef07 1## _ _
2## _ __ ___ ___ __| | ___ ___| | mod_ssl
3## | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
4## | | | | | | (_) | (_| | \__ \__ \ | www.modssl.org
5## |_| |_| |_|\___/ \__,_|___|___/___/_| ftp.modssl.org
6## |_____|
7## ____________________________________________________________________________
8##
e48af075 9## Annotated patch file: addon.patch
bac1ef07 10## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
e48af075 11## Created on: 01-Feb-2002
bac1ef07 12##
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.
18##
19
20+---------------------------------------------------------------------------
e48af075 21| Add an entry for mod_define.
bac1ef07 22+---------------------------------------------------------------------------
e48af075 23Index: 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
26@@ -258,6 +313,11 @@
27
28 AddModule modules/standard/mod_env.o
29
30+## mod_define expands variables on arbitrary directive lines.
31+## It requires Extended API (EAPI).
32+
33+# AddModule modules/extra/mod_define.o
34+
35 ##
36 ## Request logging modules
37 ##
bac1ef07 38
39+---------------------------------------------------------------------------
e48af075 40| Add more beautiful optic to the status page table..
bac1ef07 41+---------------------------------------------------------------------------
e48af075 42Index: 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
45@@ -484,12 +484,33 @@
46 if (no_table_report)
47 ap_rputs("<p><hr><h2>Server Details</h2>\n\n", r);
48 else
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>"
56+#ifndef NO_TIMES
57+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>CPU</b></font></td>"
58+#endif
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>"
67+ "</tr>\n", r);
68+#else /* NO_PRETTYPRINT */
69 #ifdef NO_TIMES
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);
72 #else
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);
74 #endif
75+#endif /* NO_PRETTYPRINT */
76 }
bac1ef07 77
e48af075 78 for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
79@@ -607,14 +628,19 @@
80 vhost->server_hostname) : "(unavailable)");
81 }
82 else { /* !no_table_report */
83+#ifndef NO_PRETTYPRINT
84+ ap_rprintf(r,"<tr bgcolor=\"#ffffff\">");
85+#else
86+ ap_rprintf(r,"<tr>");
87+#endif
88 if (score_record.status == SERVER_DEAD)
89 ap_rprintf(r,
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);
94 else
95 ap_rprintf(r,
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,
100 my_lres, lres);
101@@ -674,12 +700,23 @@
102 ap_rprintf(r,
103 "<td>?<td nowrap>?<td nowrap>..reading.. </tr>\n\n");
104 else
105+#ifndef NO_PRETTYPRINT
106+ ap_rprintf(r,
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>"
110+ "</tr>\n\n",
111+ score_record.client,
112+ vhost ? vhost->server_hostname : "(unavailable)",
113+ ap_escape_html(r->pool, score_record.request));
114+#else
115 ap_rprintf(r,
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));
121+#endif
122 } /* no_table_report */
123 } /* !short_report */
124 } /* if (<active child>) */
bac1ef07 125
126+---------------------------------------------------------------------------
e48af075 127| Add a hyperlink to the mod_define.html document.
bac1ef07 128+---------------------------------------------------------------------------
e48af075 129Index: 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
132@@ -101,6 +101,10 @@
133 <dd>Support for Netscape-like cookies. Replaced in Apache 1.2
134 by mod_usertrack</dd>
c7f132e3 135
e48af075 136+ <dt><a href="mod_define.html">mod_define</a></dt>
137+
138+ <dd>Variable Definition for Arbitrary Directives</dd>
c7f132e3 139+
e48af075 140 <dt><a href="mod_digest.html">mod_digest</a> Apache 1.1 and
141 up</dt>
c7f132e3 142
bac1ef07 143
144+---------------------------------------------------------------------------
e48af075 145| Add a hyperlink for the Define directives.
bac1ef07 146+---------------------------------------------------------------------------
c7f132e3 147Index: htdocs/manual/mod/directives.html.en
e48af075 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
150@@ -214,6 +214,8 @@
c7f132e3 151
e48af075 152 <li><a href="core.html#defaulttype">DefaultType</a></li>
c7f132e3 153
e48af075 154+ <li><a href="mod_define.html#define">Define</a>
155+
156 <li><a href="mod_access.html#deny">Deny</a></li>
c7f132e3 157
e48af075 158 <li><a href="core.html#directory">&lt;Directory&gt;</a></li>
The most widely used Web server on the Internet
This page took 0.178051 seconds and 4 git commands to generate.