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