]> 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
- updated eapi,addon,ipv6 patches
[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.
1c750197 11## Created on: 18-Jul-2003
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
52a866bb
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
e48af075 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
1c750197
JB		 43--- src/modules/standard/mod_status.c 18 Jul 2003 15:44:39 -0000 1.1.1.15
44+++ src/modules/standard/mod_status.c 18 Jul 2003 15:56:59 -0000 1.12
e48af075 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) {
1c750197 79@@ -617,6 +638,11 @@
e48af075 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)
1c750197
JB		 89 #ifdef TPF
90 if (kill(ps_record.pid, 0) == 0) {
91@@ -629,12 +655,12 @@
92 } else
93 #endif /* TPF */
e48af075 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
100 ap_rprintf(r,
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);
1c750197
JB		 106@@ -737,6 +774,12 @@
107 </table>\n", r);
108 #endif
109 }
110+
111+#ifdef EAPI
112+ ap_hook_use("ap::mod_status::display",
113+ AP_HOOK_SIG4(void,ptr,int,int), AP_HOOK_ALL,
114+ r, no_table_report, short_report);
e48af075 115+#endif
1c750197
JB		 116
117 } else {
118
bac1ef07 119
120+---------------------------------------------------------------------------
e48af075 121| Add a hyperlink to the mod_define.html document.
bac1ef07 122+---------------------------------------------------------------------------
e48af075 123Index: htdocs/manual/mod/index.html.en
52a866bb
JB		 124--- htdocs/manual/mod/index.html.en 28 Jan 2002 19:21:43 -0000 1.1.1.2
125+++ htdocs/manual/mod/index.html.en 28 Jan 2002 19:40:56 -0000 1.3
e48af075 126@@ -101,6 +101,10 @@
127 <dd>Support for Netscape-like cookies. Replaced in Apache 1.2
128 by mod_usertrack</dd>
c7f132e3 129
e48af075 130+ <dt><a href="mod_define.html">mod_define</a></dt>
131+
132+ <dd>Variable Definition for Arbitrary Directives</dd>
c7f132e3 133+
e48af075 134 <dt><a href="mod_digest.html">mod_digest</a> Apache 1.1 and
135 up</dt>
c7f132e3 136
bac1ef07 137
138+---------------------------------------------------------------------------
e48af075 139| Add a hyperlink for the Define directives.
bac1ef07 140+---------------------------------------------------------------------------
c7f132e3 141Index: htdocs/manual/mod/directives.html.en
1c750197
JB		 142--- htdocs/manual/mod/directives.html.en 18 Jul 2003 15:44:16 -0000 1.1.1.5
143+++ htdocs/manual/mod/directives.html.en 18 Jul 2003 15:56:57 -0000 1.6
144@@ -228,6 +228,8 @@
c7f132e3 145
e48af075 146 <li><a href="core.html#defaulttype">DefaultType</a></li>
c7f132e3 147
e48af075 148+ <li><a href="mod_define.html#define">Define</a>
149+
150 <li><a href="mod_access.html#deny">Deny</a></li>
c7f132e3 151
e48af075 152 <li><a href="core.html#directory">&lt;Directory&gt;</a></li>
The most widely used Web server on the Internet
This page took 0.086253 seconds and 4 git commands to generate.