]> 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
rel 15; builds
[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
fce257bb
JB		 10## Copyright (c) 1998-2007 Ralf S. Engelschall, All Rights Reserved.
11## Created on: 12-Sep-2007
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
0f67ba48
JB		 24--- src/Configuration.tmpl 11 May 2004 18:28:09 -0000 1.1.1.8
25+++ src/Configuration.tmpl 11 May 2004 18:32:15 -0000 1.24
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+---------------------------------------------------------------------------
7802c33e 42Index: src/modules/standard/mod_status.c
fce257bb
JB		 43--- src/modules/standard/mod_status.c 10 Sep 2007 20:30:37 -0000 1.1.1.18
44+++ src/modules/standard/mod_status.c 12 Sep 2007 05:32:20 -0000
bff29bab 45@@ -442,12 +442,33 @@
a6148d70 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 }
5fa7631d 77
a6148d70 78 for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
fce257bb 79@@ -576,6 +597,11 @@
7802c33e 80 vhost->server_hostname) : "(unavailable)");
a6148d70 81 }
82 else { /* !no_table_report */
83+#ifndef NO_PRETTYPRINT
7802c33e 84+ ap_rprintf(r,"<tr bgcolor=\"#ffffff\">");
a6148d70 85+#else
7802c33e 86+ ap_rprintf(r,"<tr>");
a6148d70 87+#endif
7802c33e 88 if (score_record.status == SERVER_DEAD)
730eed55 89 #ifdef TPF
90 if (kill(ps_record.pid, 0) == 0) {
fce257bb 91@@ -588,12 +614,12 @@
730eed55 92 } else
93 #endif /* TPF */
a6148d70 94 ap_rprintf(r,
95- "<tr><td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
96+ "<td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
97 i, (int) ps_record.generation,
98 (int) conn_lres, my_lres, lres);
99 else
a6148d70 100 ap_rprintf(r,
7802c33e
JB		 101- "<tr><td><b>%d-%d</b><td>%d<td>%d/%lu/%lu",
102+ "<td><b>%d-%d</b><td>%d<td>%d/%lu/%lu",
103 i, (int) ps_record.generation,
104 (int) ps_record.pid, (int) conn_lres,
105 my_lres, lres);
fce257bb
JB		 106@@ -653,6 +679,16 @@
107 ap_rprintf(r,
108 "<td>?<td nowrap>?<td nowrap>..reading.. </tr>\n\n");
109 else
110+#ifndef NO_PRETTYPRINT
111+ ap_rprintf(r,
112+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
113+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
114+ "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
115+ "</tr>\n\n",
116+ score_record.client,
117+ vhost ? vhost->server_hostname : "(unavailable)",
118+ ap_escape_html(r->pool, score_record.request));
119+#else
120 ap_rprintf(r,
121 "<td>%s<td nowrap>%s<td nowrap>%s</tr>\n\n",
122 ap_escape_html(r->pool, score_record.client),
123@@ -660,6 +696,7 @@
124 vhost->server_hostname) : "(unavailable)",
125 ap_escape_html(r->pool,
126 ap_escape_logitem(r->pool, score_record.request)));
a6148d70 127+#endif
fce257bb
JB		 128 } /* no_table_report */
129 } /* !short_report */
130 } /* if (<active child>) */
7802c33e
JB		 131
132+---------------------------------------------------------------------------
133| Add a hyperlink to the mod_define.html document.
134+---------------------------------------------------------------------------
135Index: htdocs/manual/mod/index.html.en
bff29bab 136--- htdocs/manual/mod/index.html.en 7 May 2006 18:10:42 -0000 1.1.1.4
137+++ htdocs/manual/mod/index.html.en 7 May 2006 18:12:44 -0000 1.5
138@@ -106,6 +106,10 @@
7802c33e
JB		 139 <dd>Support for Netscape-like cookies. Replaced in Apache 1.2
140 by mod_usertrack</dd>
141
142+ <dt><a href="mod_define.html">mod_define</a></dt>
143+
144+ <dd>Variable Definition for Arbitrary Directives</dd>
145+
146 <dt><a href="mod_digest.html">mod_digest</a> Apache 1.1 and
147 up</dt>
148
149
150+---------------------------------------------------------------------------
151| Add a hyperlink for the Define directives.
152+---------------------------------------------------------------------------
153Index: htdocs/manual/mod/directives.html.en
bff29bab 154--- htdocs/manual/mod/directives.html.en 7 May 2006 18:10:41 -0000 1.1.1.8
155+++ htdocs/manual/mod/directives.html.en 7 May 2006 18:12:44 -0000 1.9
156@@ -233,6 +233,8 @@
7802c33e
JB		 157
158 <li><a href="core.html#defaulttype">DefaultType</a></li>
159
160+ <li><a href="mod_define.html#define">Define</a>
161+
162 <li><a href="mod_access.html#deny">Deny</a></li>
163
164 <li><a href="core.html#directory">&lt;Directory&gt;</a></li>
The most widely used Web server on the Internet
This page took 0.130587 seconds and 4 git commands to generate.