]> git.pld-linux.org Git - packages/apache1.git/blame - apache1-mod_ssl-addon.patch
projects / packages / apache1.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- obsolete and INSECURE
[packages/apache1.git] / apache1-mod_ssl-addon.patch
CommitLineData
5fa7631d 1## _ _
2## _ __ ___ ___ __| | ___ ___| | mod_ssl
3## | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
4## | | | | | | (_) | (_| | \__ \__ \ | www.modssl.org
5## |_| |_| |_|\___/ \__,_|___|___/___/_| ftp.modssl.org
6## |_____|
7## ____________________________________________________________________________
8##
a6148d70 9## Annotated patch file: addon.patch
5fa7631d 10## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
a4bf41f2 11## Created on: 18-Mar-2003
5fa7631d 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+---------------------------------------------------------------------------
a6148d70 21| Add an entry for mod_define.
5fa7631d 22+---------------------------------------------------------------------------
a6148d70 23Index: src/Configuration.tmpl
77cf3173
JB		 24--- src/Configuration.tmpl 28 Jan 2002 19:21:21 -0000 1.1.1.7
25+++ src/Configuration.tmpl 28 Jan 2002 19:40:56 -0000 1.23
a6148d70 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 ##
5fa7631d 38
39+---------------------------------------------------------------------------
a6148d70 40| Add more beautiful optic to the status page table..
5fa7631d 41+---------------------------------------------------------------------------
730eed55 42Index: htdocs/manual/mod/index.html.en
43--- htdocs/manual/mod/index.html.en 28 Jan 2002 19:21:43 -0000 1.1.1.2
44+++ htdocs/manual/mod/index.html.en 28 Jan 2002 19:40:56 -0000 1.3
45@@ -101,6 +101,10 @@
46 <dd>Support for Netscape-like cookies. Replaced in Apache 1.2
47 by mod_usertrack</dd>
48
49+ <dt><a href="mod_define.html">mod_define</a></dt>
50+
51+ <dd>Variable Definition for Arbitrary Directives</dd>
52+
53 <dt><a href="mod_digest.html">mod_digest</a> Apache 1.1 and
54 up</dt>
55
56
57+---------------------------------------------------------------------------
58| Add a hyperlink for the Define directives.
59+---------------------------------------------------------------------------
60Index: htdocs/manual/mod/directives.html.en
61--- htdocs/manual/mod/directives.html.en 4 Oct 2002 11:50:01 -0000 1.1.1.4
62+++ htdocs/manual/mod/directives.html.en 4 Oct 2002 11:54:56 -0000 1.5
63@@ -220,6 +220,8 @@
64
65 <li><a href="core.html#defaulttype">DefaultType</a></li>
66
67+ <li><a href="mod_define.html#define">Define</a>
68+
69 <li><a href="mod_access.html#deny">Deny</a></li>
70
71 <li><a href="core.html#directory">&lt;Directory&gt;</a></li>
72--- src/modules/standard/mod_status.c.orig 2003-02-03 18:13:29.000000000 +0100
73+++ src/modules/standard/mod_status.c 2003-07-19 11:42:32.000000000 +0200
a6148d70 74@@ -484,12 +484,33 @@
75 if (no_table_report)
76 ap_rputs("<p><hr><h2>Server Details</h2>\n\n", r);
77 else
78+#ifndef NO_PRETTYPRINT
79+ ap_rputs("<p>\n\n<table bgcolor=\"#ffffff\" border=\"0\">"
80+ "<tr bgcolor=000000>"
81+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Srv</b></font></td>"
82+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>PID</b></font></td>"
83+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Acc</b></font></td>"
84+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>M</b></font></td>"
85+#ifndef NO_TIMES
86+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>CPU</b></font></td>"
87+#endif
88+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>SS</b></font></td>"
89+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Req</b></font></td>"
90+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Conn</b></font></td>"
91+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Child</b></font></td>"
92+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Slot</b></font></td>"
93+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Host</b></font></td>"
94+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>VHost</b></font></td>"
95+ "<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Request</b></td>"
96+ "</tr>\n", r);
97+#else /* NO_PRETTYPRINT */
98 #ifdef NO_TIMES
99 /* Allow for OS/2 not having CPU stats */
100 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);
101 #else
102 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);
103 #endif
104+#endif /* NO_PRETTYPRINT */
105 }
5fa7631d 106
a6148d70 107 for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
730eed55 108@@ -618,18 +639,23 @@
a6148d70 109 }
110 else { /* !no_table_report */
730eed55 111 if (score_record.status == SERVER_DEAD)
a6148d70 112+#ifndef NO_PRETTYPRINT
730eed55 113+ ap_rprintf(r,"<tr bgcolor=\"#ffffff\">");
a6148d70 114+#else
730eed55 115+ ap_rprintf(r,"<tr>");
a6148d70 116+#endif
730eed55 117 #ifdef TPF
118 if (kill(ps_record.pid, 0) == 0) {
119 /* on TPF show PIDs of the living dead */
120 ap_rprintf(r,
121- "<tr><td><b>%d-%d</b><td>%d<td>%d/%lu/%lu",
122+ "<td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
123 i, (int) ps_record.generation,
124 (int) ps_record.pid,
125 (int) conn_lres, my_lres, lres);
126 } else
127 #endif /* TPF */
a6148d70 128 ap_rprintf(r,
129- "<tr><td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
130+ "<td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
131 i, (int) ps_record.generation,
132 (int) conn_lres, my_lres, lres);
133 else
730eed55 134@@ -694,12 +720,23 @@
a6148d70 135 ap_rprintf(r,
136 "<td>?<td nowrap>?<td nowrap>..reading.. </tr>\n\n");
137 else
138+#ifndef NO_PRETTYPRINT
139+ ap_rprintf(r,
140+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
141+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
142+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
143+ "</tr>\n\n",
144+ score_record.client,
145+ vhost ? vhost->server_hostname : "(unavailable)",
146+ ap_escape_html(r->pool, score_record.request));
147+#else
148 ap_rprintf(r,
149 "<td>%s<td nowrap>%s<td nowrap>%s</tr>\n\n",
150 ap_escape_html(r->pool, score_record.client),
151 vhost ? ap_escape_html(r->pool,
152 vhost->server_hostname) : "(unavailable)",
153 ap_escape_html(r->pool, score_record.request));
154+#endif
155 } /* no_table_report */
156 } /* !short_report */
157 } /* if (<active child>) */
The most widely used Web server on the Internet
This page took 0.077884 seconds and 4 git commands to generate.