]> git.pld-linux.org Git - packages/apache.git/blob - apache-mod_ssl-addon.patch
- updated to patch from mod_ssl-2.8.5-1.3.22.
[packages/apache.git] / apache-mod_ssl-addon.patch
1 ##                      _             _ 
2 ##  _ __ ___   ___   __| |    ___ ___| |  mod_ssl
3 ## | '_ ` _ \ / _ \ / _` |   / __/ __| |  Apache Interface to OpenSSL
4 ## | | | | | | (_) | (_| |   \__ \__ \ |  www.modssl.org
5 ## |_| |_| |_|\___/ \__,_|___|___/___/_|  ftp.modssl.org
6 ##                      |_____|         
7 ## ____________________________________________________________________________
8 ##
9 ## Annotated patch file: ssldoc.patch
10 ## Copyright (c) 1998-2001 Ralf S. Engelschall, All Rights Reserved. 
11 ## Created on: 16-Oct-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 ## This file contains all patches to the Apache source
20 ## tree which link the SSL documentation into the Apache
21 ## documents tree.
22 ##
23
24 +---------------------------------------------------------------------------
25 | Adjust the English frontdoor webpage where we now indicate that
26 | this is an SSL-aware Apache, give additional hyperlinks to mod_ssl and
27 | provide the three new "powered by Apache", "secured by mod_ssl" and
28 | "includes OpenSSL" buttons.
29 +---------------------------------------------------------------------------
30 Index: htdocs/index.html.en
31 --- htdocs/index.html.en        2001/05/20 08:16:29     1.1.1.3
32 +++ htdocs/index.html.en        2001/05/20 08:23:01     1.4
33 @@ -1,38 +1,87 @@
34 -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
35 -    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
36 -<html xmlns="http://www.w3.org/1999/xhtml">
37 -<head>
38 -<title>Test Page for Apache Installation</title>
39 -</head>
40 -<!-- Background white, links blue (unvisited), navy (visited), red
41 -(active) -->
42 -<body bgcolor="#FFFFFF" text="#000000" link="#0000FF"
43 -vlink="#000080" alink="#FF0000">
44 -<p>If you can see this, it means that the installation of the <a
45 -href="http://www.apache.org/foundation/preFAQ.html">Apache web
46 -server</a> software on this system was successful. You may now add
47 -content to this directory and replace this page.</p>
48 -
49 -<hr width="50%" size="8" />
50 -<h2 align="center">Seeing this instead of the website you
51 -expected?</h2>
52 -
53 -<p>This page is here because the site administrator has changed the
54 -configuration of this web server. Please <strong>contact the person
55 -responsible for maintaining this server with questions.</strong>
56 -The Apache Software Foundation, which wrote the web server software
57 -this site administrator is using, has nothing to do with
58 -maintaining this site and cannot help resolve configuration
59 -issues.</p>
60 -
61 -<hr width="50%" size="8" />
62 -<p>The Apache <a href="manual/">documentation</a> has been included
63 -with this distribution.</p>
64 -
65 -<p>You are free to use the image below on an Apache-powered web
66 -server. Thanks for using Apache!</p>
67 -
68 -<div align="center"><img src="apache_pb.gif" alt="" /></div>
69 -</body>
70 -</html>
71 -
72 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
73 +<HTML>
74 + <HEAD>
75 +  <TITLE>Test Page for the SSL/TLS-aware Apache Installation on Web Site</TITLE>
76 +  <STYLE TYPE="text/css">
77 +  H1 {
78 +      font-weight: bold;
79 +      font-size: 18pt;
80 +      line-height: 18pt;
81 +      font-family: arial,helvetica;
82 +      font-variant: normal;
83 +      font-style: normal;
84 +  }
85 +  BODY {
86 +      color: black;
87 +      background-color: white;
88 +      background-image: url(manual/images/feather.jpg);
89 +      background-repeat: no-repeat;
90 +  }
91 +  </STYLE>
92 + </HEAD>
93 +<!-- Background white, links blue (unvisited), navy (visited), red (active) -->
94 + <BODY
95 +  BGCOLOR="#FFFFFF"
96 +  TEXT="#000000"
97 +  LINK="#0000FF"
98 +  VLINK="#0000FF"
99 +  ALINK="#FF0000"
100 + >
101 +  <BLOCKQUOTE>
102 +  <BLOCKQUOTE>
103 +  <BR>
104 +  <H1>
105 +  Hey, it worked <I>!</I><BR>
106 +  The SSL/TLS-aware Apache webserver was<BR>
107 +  successfully installed on this website.
108 +  </H1>
109 +  <P>
110 +  If you can see this page, then the people who own this website have just
111 +  installed the <A HREF="http://www.apache.org/">Apache Web server</A>
112 +  software and the <A HREF="http://www.modssl.org/">Apache
113 +  Interface to OpenSSL (mod_ssl)</A> successfully.  They now have to add
114 +  content to this directory and replace this placeholder page, or else point
115 +  the server at their real content.
116 +  </P>
117 +  <BLOCKQUOTE>
118 +   <STRONG>ATTENTION!</STRONG><BR>
119 +   If you are seeing this page instead of the site you expected, please
120 +   <STRONG>contact the administrator of the site involved.</STRONG>
121 +   (Try sending mail to <SAMP>&lt;webmaster@<EM>domain</EM>&gt;</SAMP>.)
122 +   Although this site is
123 +   running the Apache software it almost certainly has no other connection
124 +   to the Apache Group, so please do not send mail about this site or its
125 +   contents to the Apache authors.  If you do, your message will be
126 +   <STRONG>ignored</STRONG>.
127 +  </BLOCKQUOTE>
128 +  <P>
129 +  The Apache online
130 +  <A
131 +   HREF="manual/index.html"
132 +  >documentation</A>
133 +  has been included with this distribution.<BR>
134 +  Especially also read the 
135 +  <A
136 +   HREF="manual/mod/mod_ssl/"
137 +  >mod_ssl User Manual</A>
138 +  carefully.
139 +  </P>
140 +  <P>
141 +  Your are allowed to use the images below on your SSL-aware Apache Web server.<BR>
142 +  Thanks for using Apache, mod_ssl and OpenSSL!
143 +  </P>
144 +  <P>
145 +  <DIV ALIGN="CENTER">
146 +   <A HREF="http://www.apache.org/"
147 +   ><IMG SRC="manual/images/apache_pb.gif" ALT="Apache Webserver" BORDER=0></A>
148 +   &nbsp;
149 +   <A HREF="http://www.modssl.org/"
150 +   ><IMG SRC="manual/images/mod_ssl_sb.gif" ALT="mod_ssl Interface" BORDER=0></A>
151 +   &nbsp;
152 +   <A HREF="http://www.openssl.org/"
153 +   ><IMG SRC="manual/images/openssl_ics.gif" ALT="OpenSSL Toolkit" BORDER=0></A>
154 +  </DIV>
155 +  </BLOCKQUOTE>
156 +  </BLOCKQUOTE>
157 + </BODY>
158 +</HTML>
159
160 +---------------------------------------------------------------------------
161 | Add a hyperlink to the mod_ssl document.
162 +---------------------------------------------------------------------------
163 Index: htdocs/manual/mod/index.html.en
164 --- htdocs/manual/mod/index.html.en     2001/10/16 11:46:59     1.1.1.1
165 +++ htdocs/manual/mod/index.html.en     2001/10/16 12:17:00     1.2
166 @@ -214,6 +218,11 @@
167  
168        <dt><a href="mod_speling.html">mod_speling</a> Apache 1.3 and
169        up</dt>
170 +
171 +      <dt><a href="mod_ssl/index.html">mod_ssl</a> Apache 1.3 with mod_ssl
172 +      applied</dt>
173 +      
174 +      <dd>Apache SSL interface to OpenSSL</dd>
175  
176        <dd>Automatically correct minor typos in URLs</dd>
177  
178
179 +---------------------------------------------------------------------------
180 | Add a hyperlink to the mod_ssl document.
181 +---------------------------------------------------------------------------
182 Index: htdocs/manual/mod/index-bytype.html.en
183 --- htdocs/manual/mod/index-bytype.html.en      2001/10/16 11:46:59     1.1.1.1
184 +++ htdocs/manual/mod/index-bytype.html.en      2001/10/16 12:17:00     1.2
185 @@ -254,6 +254,11 @@
186  
187        <dd>Experimental file caching, mapping files into memory to
188        improve performace</dd>
189 +
190 +      <dt><a href="mod_ssl/index.html">mod_ssl</a> Apache 1.3 with mod_ssl
191 +      applied</dt>
192 +      
193 +      <dd>Apache SSL interface to OpenSSL</dd>
194      </dl>
195  
196      <h2>Development</h2>
197
198 +---------------------------------------------------------------------------
199 | Add hyperlinks for all SSL directives which are
200 | documented inside the mod_ssl document.
201 +---------------------------------------------------------------------------
202 Index: htdocs/manual/mod/directives.html.en
203 --- htdocs/manual/mod/directives.html.en        2001/10/16 11:46:59     1.1.1.1
204 +++ htdocs/manual/mod/directives.html.en        2001/10/16 12:17:00     1.2
205 @@ -526,6 +528,28 @@
206        href="mod_setenvif.html#SetEnvIfNoCase">SetEnvIfNoCase</a></li>
207  
208        <li><a href="mod_mime.html#sethandler">SetHandler</a></li>
209 +
210 +      <li><a href="mod_ssl/ssl_reference.html#SSLPassPhraseDialog">SSLPassPhraseDialog</a>
211 +      <li><a href="mod_ssl/ssl_reference.html#SSLMutex">SSLMutex</a>
212 +      <li><a href="mod_ssl/ssl_reference.html#SSLRandomSeed">SSLRandomSeed</a>
213 +      <li><a href="mod_ssl/ssl_reference.html#SSLSessionCache">SSLSessionCache</a>
214 +      <li><a href="mod_ssl/ssl_reference.html#SSLSessionCacheTimeout">SSLSessionCacheTimeout</a>
215 +      <li><a href="mod_ssl/ssl_reference.html#SSLEngine">SSLEngine</a>
216 +      <li><a href="mod_ssl/ssl_reference.html#SSLProtocol">SSLProtocol</a>
217 +      <li><a href="mod_ssl/ssl_reference.html#SSLCipherSuite">SSLCipherSuite</a>
218 +      <li><a href="mod_ssl/ssl_reference.html#SSLCertificateFile">SSLCertificateFile</a>
219 +      <li><a href="mod_ssl/ssl_reference.html#SSLCertificateKeyFile">SSLCertificateKeyFile</a>
220 +      <li><a href="mod_ssl/ssl_reference.html#SSLCACertificatePath">SSLCACertificatePath</a>
221 +      <li><a href="mod_ssl/ssl_reference.html#SSLCACertificateFile">SSLCACertificateFile</a>
222 +      <li><a href="mod_ssl/ssl_reference.html#SSLCARevocationPath">SSLCARevocationPath</a>
223 +      <li><a href="mod_ssl/ssl_reference.html#SSLCARevocationFile">SSLCARevocationFile</a>
224 +      <li><a href="mod_ssl/ssl_reference.html#SSLVerifyClient">SSLVerifyClient</a>
225 +      <li><a href="mod_ssl/ssl_reference.html#SSLVerifyDepth">SSLVerifyDepth</a>
226 +      <li><a href="mod_ssl/ssl_reference.html#SSLLog">SSLLog</a>
227 +      <li><a href="mod_ssl/ssl_reference.html#SSLLogLevel">SSLLogLevel</a>
228 +      <li><a href="mod_ssl/ssl_reference.html#SSLOptions">SSLOptions</a>
229 +      <li><a href="mod_ssl/ssl_reference.html#SSLRequireSSL">SSLRequireSSL</a>
230 +      <li><a href="mod_ssl/ssl_reference.html#SSLRequire">SSLRequire</a>
231  
232        <li><a href="core.html#startservers">StartServers</a></li>
233  
This page took 0.042711 seconds and 3 git commands to generate.