Changeset 1259 for trunk/server/common/patches/httpd-2.2.x-sni.patch

Timestamp:

Jul 9, 2009, 3:48:21 PM (16 years ago)

Author:

mitchb

Message:

Reintegrate branches/fc11-dev (r1121:1258) to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• server/common/patches/httpd-2.2.x-sni.patch (modified) (2 diffs)

trunk/server/common/patches/httpd-2.2.x-sni.patch

@@ -971 +971 @@
 Index: httpd-2.2.11/docs/manual/mod/mod_ssl.html.en
 ===================================================================
---- httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        (revision 768863)
-+++ httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        (working copy)
+--- httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        2008-08-20 19:02:48.000000000 -0400
++++ httpd-2.2.11/docs/manual/mod/mod_ssl.html.en        2009-06-03 05:33:23.000000000 -0400
 @@ -75,6 +75,7 @@ to provide the cryptography engine.</p>
  <li><img alt="" src="../images/down.gif" /> <a href="#sslrequiressl">SSLRequireSSL</a></li>
@@ -1026 +1026 @@
 +<p class="apache">Copyright 2009 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
  <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
- </body></html>
+-</body></html>
+\ No newline at end of file
++</body></html>