[packages/apache.git] / apache-mod_ssl-addon.patch

##                      _             _ 
##  _ __ ___   ___   __| |    ___ ___| |  mod_ssl
## | '_ ` _ \ / _ \ / _` |   / __/ __| |  Apache Interface to OpenSSL
## | | | | | | (_) | (_| |   \__ \__ \ |  www.modssl.org
## |_| |_| |_|\___/ \__,_|___|___/___/_|  ftp.modssl.org
##                      |_____|         
## ____________________________________________________________________________
##
## Annotated patch file: addon.patch
## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved. 
## Created on: 29-Jan-2001
##
## This file assembles changes to existing Apache source files
## between the original Apache and the patched variant. It can be
## automatically applied to a vanilla Apache source tree with the
## 'patch' tool to upgrade those files.  Each patch snippet is
## annotated with a short description.
##

+---------------------------------------------------------------------------
| Add an entry for mod_define.
+---------------------------------------------------------------------------
Index: src/Configuration.tmpl
--- src/Configuration.tmpl	1999/08/17 11:21:38	1.1.1.5
+++ src/Configuration.tmpl	2000/10/09 12:15:02	1.21
@@ -243,6 +298,11 @@
 
 AddModule modules/standard/mod_env.o
 
+## mod_define expands variables on arbitrary directive lines.
+## It requires Extended API (EAPI).
+
+# AddModule modules/extra/mod_define.o
+
 ##
 ## Request logging modules
 ##

+---------------------------------------------------------------------------
| Add more beautiful optic to the status page table..
+---------------------------------------------------------------------------
Index: src/modules/standard/mod_status.c
--- src/modules/standard/mod_status.c	2001/01/23 11:35:14	1.1.1.11
+++ src/modules/standard/mod_status.c	2001/01/23 11:48:08	1.8
@@ -478,12 +478,33 @@
 	    if (no_table_report)
 		ap_rputs("<p><hr><h2>Server Details</h2>\n\n", r);
 	    else
+#ifndef NO_PRETTYPRINT
+		ap_rputs("<p>\n\n<table bgcolor=\"#ffffff\" border=\"0\">"
+			"<tr bgcolor=000000>"
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Srv</b></font></td>"
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>PID</b></font></td>"
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Acc</b></font></td>"
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>M</b></font></td>"
+#ifndef NO_TIMES
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>CPU</b></font></td>"
+#endif
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>SS</b></font></td>"
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Req</b></font></td>"
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Conn</b></font></td>"
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Child</b></font></td>"
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Slot</b></font></td>"
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Host</b></font></td>"
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>VHost</b></font></td>"
+			"<td><font face=\"Arial,Helvetica\" color=\"#ffffff\"><b>Request</b></td>"
+			"</tr>\n", r);      
+#else /* NO_PRETTYPRINT */
 #ifdef NO_TIMES
 		/* Allow for OS/2 not having CPU stats */
 		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);
 #else
 		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);
 #endif
+#endif /* NO_PRETTYPRINT */
 	}
 
 	for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
@@ -601,14 +622,19 @@
 				vhost->server_hostname) : "(unavailable)");
 		    }
 		    else {		/* !no_table_report */
+#ifndef NO_PRETTYPRINT
+			ap_rprintf(r,"<tr bgcolor=\"#ffffff\">");
+#else
+			ap_rprintf(r,"<tr>");
+#endif
 			if (score_record.status == SERVER_DEAD)
 			    ap_rprintf(r,
-				"<tr><td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
+				"<td><b>%d-%d</b><td>-<td>%d/%lu/%lu",
 				i, (int) ps_record.generation,
 				(int) conn_lres, my_lres, lres);
 			else
 			    ap_rprintf(r,
-				"<tr><td><b>%d-%d</b><td>%d<td>%d/%lu/%lu",
+				"<td><b>%d-%d</b><td>%d<td>%d/%lu/%lu",
 				i, (int) ps_record.generation,
 				(int) ps_record.pid, (int) conn_lres,
 				my_lres, lres);
@@ -668,12 +694,23 @@
 			    ap_rprintf(r,
 			     "<td>?<td nowrap>?<td nowrap>..reading.. </tr>\n\n");
 			else
+#ifndef NO_PRETTYPRINT
+			    ap_rprintf(r,
+			     "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
+			     "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
+			     "<td nowrap><font face=\"Arial,Helvetica\" size=\"-1\">%s</font>"
+			     "</tr>\n\n",
+			     score_record.client,
+			     vhost ? vhost->server_hostname : "(unavailable)",
+			     ap_escape_html(r->pool, score_record.request));
+#else
 			    ap_rprintf(r,
 			     "<td>%s<td nowrap>%s<td nowrap>%s</tr>\n\n",
 			     ap_escape_html(r->pool, score_record.client),
 			     vhost ? ap_escape_html(r->pool, 
 				vhost->server_hostname) : "(unavailable)",
 			     ap_escape_html(r->pool, score_record.request));
+#endif
 		    }		/* no_table_report */
 		}			/* !short_report */
 	    }			/* if (<active child>) */

+---------------------------------------------------------------------------
| Add a hyperlink to the mod_define.html document.
+---------------------------------------------------------------------------
Index: htdocs/manual/mod/index.html
--- htdocs/manual/mod/index.html	2001/01/23 11:35:19	1.1.1.4
+++ htdocs/manual/mod/index.html	2001/01/23 11:48:05	1.10
@@ -65,6 +65,8 @@
 <DT><A HREF="mod_cookies.html">mod_cookies</A> up to Apache 1.1.1
 <DD>Support for Netscape-like cookies.  Replaced in Apache 1.2 by
 mod_usertrack
+<DT><A HREF="mod_define.html">mod_define</A>
+<DD>Variable Definition for Arbitrary Directives
 <DT><A HREF="mod_digest.html">mod_digest</A> Apache 1.1 and up
 <DD>MD5 authentication
 <DT><A HREF="mod_dir.html">mod_dir</A>

+---------------------------------------------------------------------------
| Add a hyperlink for the Define directives.
+---------------------------------------------------------------------------
Index: htdocs/manual/mod/directives.html
--- htdocs/manual/mod/directives.html	2000/10/12 08:17:45	1.1.1.9
+++ htdocs/manual/mod/directives.html	2000/10/12 08:31:47	1.19
@@ -99,6 +99,7 @@
 <LI><A HREF="mod_autoindex.html#defaulticon">DefaultIcon</A>
 <LI><A HREF="mod_mime.html#defaultlanguage">DefaultLanguage</A>
 <LI><A HREF="core.html#defaulttype">DefaultType</A>
+<LI><A HREF="mod_define.html#define">Define</A>
 <LI><A HREF="mod_access.html#deny">Deny</A>
 <LI><A HREF="core.html#directory">&lt;Directory&gt;</A>
 <LI><A HREF="core.html#directorymatch">&lt;DirectoryMatch&gt;</A>
Commit	Line	Data
bac1ef07	1	## _ _
	2	## _ __ ___ ___ __\| \| ___ ___\| \| mod_ssl
	3	## \| '_ ` _ \ / _ \ / _` \| / __/ __\| \| Apache Interface to OpenSSL
	4	## \| \| \| \| \| \| (_) \| (_\| \| \__ \__ \ \| www.modssl.org
	5	## \|_\| \|_\| \|_\|\___/ \__,_\|___\|___/___/_\| ftp.modssl.org
	6	## \|_____\|
	7	## ____________________________________________________________________________
	8	##
	9	## Annotated patch file: addon.patch
	10	## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved.
	11	## Created on: 29-Jan-2001
	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	+---------------------------------------------------------------------------
	21	\| Add an entry for mod_define.
	22	+---------------------------------------------------------------------------
	23	Index: src/Configuration.tmpl
	24	--- src/Configuration.tmpl 1999/08/17 11:21:38 1.1.1.5
	25	+++ src/Configuration.tmpl 2000/10/09 12:15:02 1.21
	26	@@ -243,6 +298,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	##
	38
	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 2001/01/23 11:35:14 1.1.1.11
	44	+++ src/modules/standard/mod_status.c 2001/01/23 11:48:08 1.8
	45	@@ -478,12 +478,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	}
77
78	for (i = 0; i < HARD_SERVER_LIMIT; ++i) {
79	@@ -601,14 +622,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	@@ -668,12 +694,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>) */
125
126	+---------------------------------------------------------------------------
127	\| Add a hyperlink to the mod_define.html document.
128	+---------------------------------------------------------------------------
129	Index: htdocs/manual/mod/index.html
130	--- htdocs/manual/mod/index.html 2001/01/23 11:35:19 1.1.1.4
131	+++ htdocs/manual/mod/index.html 2001/01/23 11:48:05 1.10
132	@@ -65,6 +65,8 @@
133	<DT><A HREF="mod_cookies.html">mod_cookies</A> up to Apache 1.1.1
134	<DD>Support for Netscape-like cookies. Replaced in Apache 1.2 by
135	mod_usertrack
136	+<DT><A HREF="mod_define.html">mod_define</A>
137	+<DD>Variable Definition for Arbitrary Directives
138	<DT><A HREF="mod_digest.html">mod_digest</A> Apache 1.1 and up
139	<DD>MD5 authentication
140	<DT><A HREF="mod_dir.html">mod_dir</A>
141
142	+---------------------------------------------------------------------------
143	\| Add a hyperlink for the Define directives.
144	+---------------------------------------------------------------------------
145	Index: htdocs/manual/mod/directives.html
146	--- htdocs/manual/mod/directives.html 2000/10/12 08:17:45 1.1.1.9
147	+++ htdocs/manual/mod/directives.html 2000/10/12 08:31:47 1.19
148	@@ -99,6 +99,7 @@
149	<LI><A HREF="mod_autoindex.html#defaulticon">DefaultIcon</A>
150	<LI><A HREF="mod_mime.html#defaultlanguage">DefaultLanguage</A>
151	<LI><A HREF="core.html#defaulttype">DefaultType</A>
152	+<LI><A HREF="mod_define.html#define">Define</A>
153	<LI><A HREF="mod_access.html#deny">Deny</A>
154	<LI><A HREF="core.html#directory"><Directory></A>
155	<LI><A HREF="core.html#directorymatch"><DirectoryMatch></A>