[PATCH] 2.0->2.1

Wilfredo Sanchez Fri, 06 Dec 2002 23:30:23 -0800

This patch changes a lot of 2.0 references to 2.1. It doesn't get them all. Not all should change, anyway. In particular, most references in "Apache 2.0" in the docs are unchanged, because that requires a more careful review than the changes I've made here.

Before I commit this, will this annoy anyone? I.e. does someone have a method planned for this? Otherwise, we can start with this and move from there.

mod_dav has a lot of "DAV module for Apache 2.0". I didn't touch these. I think it should read "DAV module for Apache HTTPD". Not hard to infer that since it's in the 2.1 source tree that it's for 2.1.

We may want to deprecate the use of "Apache" as referring to HTTPD anyway, as it can only get increasingly confusing as "Apache" is associated more and more projects over time. I'd guess we're already past the point where the typical user in our various communities thinks "we server" first when they hear "Apache".

Also the version string in AB is still "2.0.blah". Maybe should become "2.1.0-dev", but I suppose that should wait until it needs to change. So long as it doesn't become "2.0.blah+1-dev", since branched along with the rest of httpd.

-wsv

Index: INSTALL
===================================================================
RCS file: /home/cvs/httpd-2.0/INSTALL,v
retrieving revision 1.18
diff -w -u -d -r1.18 INSTALL
--- INSTALL 26 Nov 2001 22:46:32 -0000 1.18
+++ INSTALL 7 Dec 2002 07:14:59 -0000
@@ -5,7 +5,7 @@
------------------

For complete installation documentation, see [ht]docs/manual/install.html or
- http://httpd.apache.org/docs-2.0/install.html
+ http://httpd.apache.org/docs-2.1/install.html

$ ./configure --prefix=PREFIX
$ make
@@ -40,7 +40,7 @@
--enable-rewrite=shared \
--enable-speling=shared

- The easiest way to find all of the configuration flags for Apache 2.0
+ The easiest way to find all of the configuration flags for Apache 2.1
is to run ./configure --help.

@@ -48,14 +48,14 @@
---------------------

For complete documentation, see [ht]docs/manual/platform/windows.html or
- http://httpd.apache.org/docs-2.0/platform/windows.html.
+ http://httpd.apache.org/docs-2.1/platform/windows.html.

The Apache/Win32 binaries are primarily distributed as a Windows Installer
package (.msi), and may be available as a .zip file as well. These packages
- are named apache-2.0.xx-win32-x86.msi and apache-2.0.xx-win32-x86.zip.
+ are named apache-2.1.xx-win32-x86.msi and apache-2.1.xx-win32-x86.zip.
Please choose the .msi package if at all possible.

- If you have unpacked a source distribution (named httpd-2.0-xx.zip, without
+ If you have unpacked a source distribution (named httpd-2.1-xx.zip, without
any -win32-x86 notation) you must compile the package yourself, see the links
mentioned above. Unless you intended to do this, please look again for the
binary package from http://www.apache.org/dist/httpd/binaries/win32/ and
@@ -85,7 +85,7 @@
comp.infosystems.www.servers.unix or
comp.infosystems.www.servers.ms-windows.

- Thanks for using the Apache HTTP Server, version 2.0.
+ Thanks for using the Apache HTTP Server, version 2.1.

The Apache Software Foundation
http://www.apache.org/
Index: LAYOUT
===================================================================
RCS file: /home/cvs/httpd-2.0/LAYOUT,v
retrieving revision 1.1
diff -w -u -d -r1.1 LAYOUT
--- LAYOUT 30 May 2002 18:17:16 -0000 1.1
+++ LAYOUT 7 Dec 2002 07:15:00 -0000
@@ -1,7 +1,7 @@
-The httpd-2.0 Source Tree LAYOUT
+The httpd-2.1 Source Tree LAYOUT
--------------------------------

-./ .................... Top-Level httpd-2.0 Root Directory
+./ .................... Top-Level httpd-2.1 Root Directory

ABOUT_APACHE .......... Overview of the Apache HTTP Server
LAYOUT ................ This file describing the source tree
Index: README
===================================================================
RCS file: /home/cvs/httpd-2.0/README,v
retrieving revision 1.12
diff -w -u -d -r1.12 README
--- README 23 Apr 2002 12:18:35 -0000 1.12
+++ README 7 Dec 2002 07:15:00 -0000
@@ -24,7 +24,7 @@
The documentation available as of the date of this release is
included in HTML format in the docs/manual/ directory. The most
up-to-date documentation can be found at
- http://httpd.apache.org/docs-2.0/.
+ http://httpd.apache.org/docs-2.1/.

Installation
------------
@@ -86,5 +86,5 @@
University of Cambridge, England. The original software is available from
ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/

- Apache 2.0 relies heavily on the use of autoconf and libtool to provide
+ Apache 2 relies heavily on the use of autoconf and libtool to provide
a build environment.
Index: README.platforms
===================================================================
RCS file: /home/cvs/httpd-2.0/README.platforms,v
retrieving revision 1.6
diff -w -u -d -r1.6 README.platforms
--- README.platforms 24 Nov 2002 20:29:55 -0000 1.6
+++ README.platforms 7 Dec 2002 07:15:00 -0000
@@ -6,12 +6,12 @@

================
Darwin (OS X):
- Apache 2.0 relies heavily on the use of autoconf and libtool to
+ Apache 2 relies heavily on the use of autoconf and libtool to
provide a build environment. Darwin provides these tools as part
of the Developers Tools package. Under Darwin, however, GNUlibtool
is installed as 'glibtool' to avoid conflicting with the Darwin
- 'libtool' program. Apache 2.0 knows about this so that's not
- a problem.
+ 'libtool' program. Apache 2 knows about this so that's not a
+ problem.

As of OS X 10.2 (Jaguar), the bundled versions work perfectly. Partly
this is due to the fact that /bin/sh is now 'bash' and not 'zsh' as
Index: build/httpd_roll_release
===================================================================
RCS file: /home/cvs/httpd-2.0/build/httpd_roll_release,v
retrieving revision 1.15
diff -w -u -d -r1.15 httpd_roll_release
--- build/httpd_roll_release 18 Sep 2002 11:53:31 -0000 1.15
+++ build/httpd_roll_release 7 Dec 2002 07:15:00 -0000
@@ -18,7 +18,7 @@

REPO="httpd-2.0"
WORKING_DIR=`echo "$REPO" | sed -e 's/[\-\.]/./g'`
-WORKING_TAG=`echo "$TAG" | sed -e 's/APACHE_2_0_/./'`
+WORKING_TAG=`echo "$TAG" | sed -e 's/APACHE_2_1_/./'`
WORKING_DIR="$WORKING_DIR$WORKING_TAG"

START_DIR=`echo "$PWD"`
@@ -37,12 +37,12 @@
# Make sure the master site's FAQ is up-to-date. It doesn't hurt to do this
# all the time. :-)
echo "REMEMBER TO UPDATE THE SITE'S FAQ!!"
-#(cd /www/httpd.apache.org/docs-2.0/faq/; cvs update)
+#(cd /www/httpd.apache.org/docs-2.1/faq/; cvs update)

# Now update the FAQ in the tarball via a download from the master site.
# The FAQ contains SSI tags too complex for the expand.pl script to handle.
rm -f docs/manual/faq/*.html
-links -source http://httpd.apache.org/docs-2.0/faq/index.html?ONEPAGE \
+links -source http://httpd.apache.org/docs-2.1/faq/index.html?ONEPAGE \
> docs/manual/faq/index.html

# Create the configure scripts
Index: docs/STATUS
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/STATUS,v
retrieving revision 1.54
diff -w -u -d -r1.54 STATUS
--- docs/STATUS 23 Nov 2002 18:49:31 -0000 1.54
+++ docs/STATUS 7 Dec 2002 07:15:01 -0000
@@ -1,4 +1,4 @@
-Apache HTTP Server 2.0 Documentation Status File.
+Apache HTTP Server 2.1 Documentation Status File.
Last modified: $Date: 2002/11/23 18:49:31 $

If you are interested in helping accomplish some of the tasks on this
Index: docs/conf/httpd-std.conf.in
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-std.conf.in,v
retrieving revision 1.29
diff -w -u -d -r1.29 httpd-std.conf.in
--- docs/conf/httpd-std.conf.in 2 Dec 2002 19:42:13 -0000 1.29
+++ docs/conf/httpd-std.conf.in 7 Dec 2002 07:15:04 -0000
@@ -3,7 +3,7 @@
#
# This is the main Apache server configuration file. It contains the
# configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs-2.0/> for detailed information about
+# See <URL:http://httpd.apache.org/docs-2.1/> for detailed information about
# the directives.
#
# Do NOT simply read the instructions in here without understanding
@@ -42,7 +42,7 @@
#
# NOTE! If you intend to place this on an NFS (or otherwise network)
# mounted filesystem then please read the LockFile documentation (available
-# at <URL:http://httpd.apache.org/docs-2.0/mod/mpm_common.html#lockfile>);
+# at <URL:http://httpd.apache.org/docs-2.1/mod/mpm_common.html#lockfile>);
# you will save yourself a lot of trouble.
#
# Do NOT add a slash at the end of the directory path.
@@ -340,7 +340,7 @@
# doesn't give it to you.
#
# The Options directive is both complicated and important. Please see
- # http://httpd.apache.org/docs-2.0/mod/core.html#options
+ # http://httpd.apache.org/docs-2.1/mod/core.html#options
# for more information.
#
Options Indexes FollowSymLinks
@@ -458,7 +458,7 @@
# The default is on; turn this off if you serve from NFS-mounted
# filesystems. On some systems, turning it off (regardless of
# filesystem) can improve performance; for details, please see
-# http://httpd.apache.org/docs-2.0/mod/core.html#enablemmap
+# http://httpd.apache.org/docs-2.1/mod/core.html#enablemmap
#
#EnableMMAP off

@@ -467,7 +467,7 @@
# used to deliver files (assuming that the OS supports it).
# The default is on; turn this off if you serve from NFS-mounted
# filesystems. Please see
-# http://httpd.apache.org/docs-2.0/mod/core.html#enablesendfile
+# http://httpd.apache.org/docs-2.1/mod/core.html#enablesendfile
#
#EnableSendfile off

@@ -1068,7 +1068,7 @@
# IP addresses. This is indicated by the asterisks in the directives below.
#
# Please see the documentation at
-# <URL:http://httpd.apache.org/docs-2.0/vhosts/>
+# <URL:http://httpd.apache.org/docs-2.1/vhosts/>
# for further details before you try to setup virtual hosts.
#
# You may use the command line option '-S' to verify your virtual host
Index: docs/conf/httpd-win.conf
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/conf/httpd-win.conf,v
retrieving revision 1.76
diff -w -u -d -r1.76 httpd-win.conf
--- docs/conf/httpd-win.conf 2 Dec 2002 19:42:13 -0000 1.76
+++ docs/conf/httpd-win.conf 7 Dec 2002 07:15:06 -0000
@@ -3,7 +3,7 @@
#
# This is the main Apache server configuration file. It contains the
# configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs-2.0/> for detailed information about
+# See <URL:http://httpd.apache.org/docs-2.1/> for detailed information about
# the directives.
#
# Do NOT simply read the instructions in here without understanding
@@ -49,7 +49,7 @@
#
# NOTE! If you intend to place this on an NFS (or otherwise network)
# mounted filesystem then please read the LockFile documentation (available
-# at <URL:http://httpd.apache.org/docs-2.0/mod/mpm_common.html#lockfile>);
+# at <URL:http://httpd.apache.org/docs-2.1/mod/mpm_common.html#lockfile>);
# you will save yourself a lot of trouble.
#
# Do NOT add a slash at the end of the directory path.
@@ -267,7 +267,7 @@
# doesn't give it to you.
#
# The Options directive is both complicated and important. Please see
-# http://httpd.apache.org/docs-2.0/mod/core.html#options
+# http://httpd.apache.org/docs-2.1/mod/core.html#options
# for more information.
#
Options Indexes FollowSymLinks
@@ -384,7 +384,7 @@
# The default is on; turn this off if you serve from NFS-mounted
# filesystems. On some systems, turning it off (regardless of
# filesystem) can improve performance; for details, please see
-# http://httpd.apache.org/docs-2.0/mod/core.html#enablemmap
+# http://httpd.apache.org/docs-2.1/mod/core.html#enablemmap
#
#EnableMMAP off

@@ -393,7 +393,7 @@
# used to deliver files (assuming that the OS supports it).
# The default is on; turn this off if you serve from NFS-mounted
# filesystems. Please see
-# http://httpd.apache.org/docs-2.0/mod/core.html#enablesendfile
+# http://httpd.apache.org/docs-2.1/mod/core.html#enablesendfile
#
#EnableSendfile off

@@ -967,7 +967,7 @@
# IP addresses. This is indicated by the asterisks in the directives below.
#
# Please see the documentation at
-# <URL:http://httpd.apache.org/docs-2.0/vhosts/>
+# <URL:http://httpd.apache.org/docs-2.1/vhosts/>
# for further details before you try to setup virtual hosts.
#
# You may use the command line option '-S' to verify your virtual host
Index: docs/conf/ssl-std.conf
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/conf/ssl-std.conf,v
retrieving revision 1.11
diff -w -u -d -r1.11 ssl-std.conf
--- docs/conf/ssl-std.conf 20 Nov 2002 22:30:56 -0000 1.11
+++ docs/conf/ssl-std.conf 7 Dec 2002 07:15:07 -0000
@@ -2,7 +2,7 @@
# This is the Apache server configuration file providing SSL support.
# It contains the configuration directives to instruct the server how to
# serve pages over an https connection. For detailing information about these
-# directives see <URL:http://httpd.apache.org/docs-2.0/mod/mod_ssl.html>
+# directives see <URL:http://httpd.apache.org/docs-2.1/mod/mod_ssl.html>
#
# For the moment, see <URL:http://www.modssl.org/docs/> for this info.
# The documents are still being prepared from material donated by the
Index: docs/manual/glossary.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/glossary.html.en,v
retrieving revision 1.5
diff -w -u -d -r1.5 glossary.html.en
--- docs/manual/glossary.html.en 5 Dec 2002 15:18:32 -0000 1.5
+++ docs/manual/glossary.html.en 7 Dec 2002 07:15:10 -0000
@@ -300,7 +300,7 @@
Identifier</a>. URLs are usually made up of a scheme, like
<code>http</code> or <code>https</code>, a hostname, and a path. A
URL for this page is
-<code>http://httpd.apache.org/docs-2.0/glossary.html</code>.</dd>
+<code>http://httpd.apache.org/docs-2.1/glossary.html</code>.</dd>

<dt><a name="uniformresourceidentifier">Uniform Resource Identifier</a> <a name="URI">(URI)</a></dt> <dd>A compact string of characters for
identifying an abstract or physical resource. It is formally defined
Index: docs/manual/glossary.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/glossary.xml,v
retrieving revision 1.3
diff -w -u -d -r1.3 glossary.xml
--- docs/manual/glossary.xml 29 Sep 2002 00:20:15 -0000 1.3
+++ docs/manual/glossary.xml 7 Dec 2002 07:15:11 -0000
@@ -339,7 +339,7 @@
Identifier</a>. URLs are usually made up of a scheme, like
<code>http</code> or <code>https</code>, a hostname, and a path. A
URL for this page is
-<code>http://httpd.apache.org/docs-2.0/glossary.html</code>.</dd>
+<code>http://httpd.apache.org/docs-2.1/glossary.html</code>.</dd>

<dt><a name="uniformresourceidentifier">Uniform Resource Identifier</a> <a
name="URI">(URI)</a></dt> <dd>A compact string of characters for
Index: docs/manual/install.html.de
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/install.html.de,v
retrieving revision 1.8
diff -w -u -d -r1.8 install.html.de
--- docs/manual/install.html.de 5 Dec 2002 14:51:26 -0000 1.8
+++ docs/manual/install.html.de 7 Dec 2002 07:15:24 -0000
@@ -25,15 +25,15 @@
<td><a href="#download">Download</a></td>

<td><code>$ lynx
- http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz</code>
+ http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz</code>
</td>
</tr>

<tr>
<td><a href="#extract">Auspacken</a></td>

- <td><code>$ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar</code> </td>
+ <td><code>$ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar</code> </td>
</tr>

<tr>
@@ -173,11 +173,11 @@
k�nnen Sie die Distribution mit einem der folgenden Befehle
(wiederum abh�ngig von Ihrer PGP Version) pr�fen:

- <div class="example"><code>$ pgp httpd-2_0_NN.tar.gz.asc</code></div>
+ <div class="example"><code>$ pgp httpd-2_1_NN.tar.gz.asc</code></div>

oder

- <div class="example"><code>$ gpg --verify httpd-2_0_NN.tar.gz.asc</code></div>
+ <div class="example"><code>$ gpg --verify httpd-2_1_NN.tar.gz.asc</code></div>

Sie sollten eine Meldung wie

@@ -199,8 +199,8 @@
aus einem simplen Dekomprimieren und danach "Ent-tarren":

<div class="example"><code>
- $ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar
+ $ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar
</code></div>

Dies erstellt unterhalb des aktuellen Verzeichnisses ein neues
@@ -563,7 +563,7 @@

Werfen Sie auch einen Blick in das Apache-Handbuch unter <a href="./">docs/manual/</a>. Die aktuellste Version dieses Handbuchs
sowie eine komplette Referenz der verf�gbaren <a href="mod/directives.html">Konfigurationsanweisungen</a> finden
- Sie unter <a href="http://httpd.apache.org/docs-2.0/";>http://httpd.apache.org/docs- 2.0/</a>.
+ Sie unter <a href="http://httpd.apache.org/docs-2.1/";>http://httpd.apache.org/docs- 2.1/</a>.
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="test" id="test">Testen</a></h2>

Sie k�nnen nun Ihren Apache HTTP Server <a href="invoking.html">starten</a>, indem Sie einfach
Index: docs/manual/install.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/install.html.en,v
retrieving revision 1.57
diff -w -u -d -r1.57 install.html.en
--- docs/manual/install.html.en 5 Dec 2002 15:18:32 -0000 1.57
+++ docs/manual/install.html.en 7 Dec 2002 07:15:26 -0000
@@ -27,15 +27,15 @@
<td><a href="#download">Download</a></td>

<td><code>$ lynx
- http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz</code>
+ http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz</code>
</td>
</tr>

<tr>
<td><a href="#extract">Extract</a></td>

- <td><code>$ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar</code> </td>
+ <td><code>$ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar</code> </td>
</tr>

<tr>
@@ -165,11 +165,11 @@
can check the distribution with one of the following commands
(again, depending on your pgp version):

-<div class="example"><code>$ pgp httpd-2_0_NN.tar.gz.asc</code></div>
+<div class="example"><code>$ pgp httpd-2_1_NN.tar.gz.asc</code></div>

or

-<div class="example"><code>$ gpg --verify httpd-2_0_NN.tar.gz.asc</code></div>
+<div class="example"><code>$ gpg --verify httpd-2_1_NN.tar.gz.asc</code></div>

You should receive a message like

@@ -188,8 +188,8 @@
simple matter of uncompressing, and then untarring:

<div class="example"><code>
- $ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar
+ $ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar
</code></div>

This will create a new directory under the current directory
@@ -531,7 +531,7 @@

<div class="example"><code>$ vi PREFIX/conf/httpd.conf</code></div>

- Have a look at the Apache manual under <a href="./">docs/manual/</a> or consult <a href="http://httpd.apache.org/docs-2.0/";>http://httpd.apache.org/docs- 2.0/</a> for the most recent version of
+ Have a look at the Apache manual under <a href="./">docs/manual/</a> or consult <a href="http://httpd.apache.org/docs-2.1/";>http://httpd.apache.org/docs- 2.1/</a> for the most recent version of
this manual and a complete reference of available <a href="mod/directives.html">configuration directives</a>.
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="test" id="test">Test</a></h2>

Index: docs/manual/install.html.ja.jis
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/install.html.ja.jis,v
retrieving revision 1.8
diff -w -u -d -r1.8 install.html.ja.jis
--- docs/manual/install.html.ja.jis 7 Nov 2002 07:30:32 -0000 1.8
+++ docs/manual/install.html.ja.jis 7 Dec 2002 07:15:29 -0000
@@ -26,15 +26,15 @@
<td><a href="#download">%@%&%s%m!<%I</a></td>

<td><code>$ lynx
- http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz</code>
+ http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz</code>
</td>
</tr>

<tr>
<td><a href="#extract">E83+</a></td>

- <td><code>$ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar</code> </td>
+ <td><code>$ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar</code> </td>
</tr>

<tr>
@@ -163,11 +163,11 @@
0J2<$N%3%^%s%I ($d$C$Q$j pgp $N%P!<%8%g%s$K0MB8) $N$I$l$+0l$D$G!"
G[I[%U%!%$%k$r%A%'%C%/$9$k$3$H$,$G$-$^$9:

-<div class="example"><code>$ pgp httpd-2_0_NN.tar.gz.asc</code></div>
+<div class="example"><code>$ pgp httpd-2_1_NN.tar.gz.asc</code></div>

$^$?$O!"

-<div class="example"><code>$ gpg --verify httpd-2_0_NN.tar.gz.asc</code></div>
+<div class="example"><code>$ gpg --verify httpd-2_1_NN.tar.gz.asc</code></div>

$9$k$H!"$3$s$J%a%C%;!<%8$r<u$1$k$O$:$G$9!#

@@ -187,8 +187,8 @@
C1$J$k05=L$N2r=|$H tar $NE83+$G$9:

<div class="example"><code>
- $ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar
+ $ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar
</code></div>

G[I[MQ$N%=!<%9%3!<%I$,$"$k8=:_$$$k%G%#%l%/%H%j$N2<$K!"
@@ -542,7 +542,7 @@
<div class="example"><code>$ vi PREFIX/conf/httpd.conf</code></div>

<a href="./">docs/manual/</a> $N Apache %^%K%e%"%k$r$6$C$H8+$F$/$@$5$$!#
- $^$?$O!"<a href="http://httpd.apache.org/docs-2.0/";>http://httpd.apache.org/docs- 2.0/</a>
+ $^$?$O!"<a href="http://httpd.apache.org/docs-2.1/";>http://httpd.apache.org/docs- 2.1/</a>
$K$"$k%^%K%e%"%k:G?7HG!"<a href="mod/directives.html">@_Dj%G%#%l%/%F%#%V</a>$KEv$?$C$F$_$F$/ $@$5$$!#
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div><div class="section"><h2><a name="test" id="test">%F%9%H</a></h2>

Index: docs/manual/install.html.ko.euc-kr
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/install.html.ko.euc-kr,v
retrieving revision 1.1
diff -w -u -d -r1.1 install.html.ko.euc-kr
--- docs/manual/install.html.ko.euc-kr 11 Jun 2002 00:21:38 -0000 1.1
+++ docs/manual/install.html.ko.euc-kr 7 Dec 2002 07:15:30 -0000
@@ -69,15 +69,15 @@
<td><a href="#download">�ٿ�ε�</a></td>

<td><code>$ lynx
- http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz</code>
+ http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz</code>
</td>
</tr>

<tr>
<td><a href="#extract">�� Ǯ��</a></td>

- <td><code>$ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar</code> </td>
+ <td><code>$ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar</code> </td>
</tr>

<tr>
@@ -220,12 +220,12 @@
�� Ȯ�� ִ�:

<blockquote>
- <code>$ pgp httpd-2_0_NN.tar.gz.asc</code>
+ <code>$ pgp httpd-2_1_NN.tar.gz.asc</code>
</blockquote>
Ȥ��

<blockquote>
- <code>$ gpg --verify httpd-2_0_NN.tar.gz.asc</code>
+ <code>$ gpg --verify httpd-2_1_NN.tar.gz.asc</code>
</blockquote>
�� ޼�� ;� �Ѵ�. 
 
@@ -247,8 +247,8 @@
�� tar�� Ǫ�� ̴�:

<blockquote>
- <code>$ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar</code>
+ <code>$ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar</code>
</blockquote>

�׷�� 丮 �Ʒ�� ҽ��ڵ带 ��
Index: docs/manual/install.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/install.xml,v
retrieving revision 1.11
diff -w -u -d -r1.11 install.xml
--- docs/manual/install.xml 5 Nov 2002 18:09:07 -0000 1.11
+++ docs/manual/install.xml 7 Dec 2002 07:15:32 -0000
@@ -35,15 +35,15 @@
<td><a href="#download">Download</a></td>

<td><code>$ lynx
- http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz</code>
+ http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz</code>
</td>
</tr>

<tr>
<td><a href="#extract">Extract</a></td>

- <td><code>$ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar</code> </td>
+ <td><code>$ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar</code> </td>
</tr>

<tr>
@@ -186,11 +186,11 @@
can check the distribution with one of the following commands
(again, depending on your pgp version):

-<example>$ pgp httpd-2_0_NN.tar.gz.asc</example>
+<example>$ pgp httpd-2_1_NN.tar.gz.asc</example>

or

-<example>$ gpg --verify httpd-2_0_NN.tar.gz.asc</example>
+<example>$ gpg --verify httpd-2_1_NN.tar.gz.asc</example>

You should receive a message like

@@ -211,8 +211,8 @@
simple matter of uncompressing, and then untarring:

<example>
- $ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar
+ $ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar
</example>

This will create a new directory under the current directory
@@ -568,8 +568,8 @@

Have a look at the Apache manual under <a
href="./">docs/manual/</a> or consult <a
- href="http://httpd.apache.org/docs-2.0/";
- >http://httpd.apache.org/docs-2.0/</a> for the most recent version of
+ href="http://httpd.apache.org/docs-2.1/";
+ >http://httpd.apache.org/docs-2.1/</a> for the most recent version of
this manual and a complete reference of available <a
href="mod/directives.html">configuration directives</a>.
</section>
Index: docs/manual/install.xml.de
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/install.xml.de,v
retrieving revision 1.8
diff -w -u -d -r1.8 install.xml.de
--- docs/manual/install.xml.de 4 Dec 2002 20:06:51 -0000 1.8
+++ docs/manual/install.xml.de 7 Dec 2002 07:15:34 -0000
@@ -35,15 +35,15 @@
<td><a href="#download">Download</a></td>

<td><code>$ lynx
- http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz</code>
+ http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz</code>
</td>
</tr>

<tr>
<td><a href="#extract">Auspacken</a></td>

- <td><code>$ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar</code> </td>
+ <td><code>$ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar</code> </td>
</tr>

<tr>
@@ -193,11 +193,11 @@
können Sie die Distribution mit einem der folgenden Befehle
(wiederum abhängig von Ihrer PGP Version) prüfen:

- <example>$ pgp httpd-2_0_NN.tar.gz.asc</example>
+ <example>$ pgp httpd-2_1_NN.tar.gz.asc</example>

oder

- <example>$ gpg --verify httpd-2_0_NN.tar.gz.asc</example>
+ <example>$ gpg --verify httpd-2_1_NN.tar.gz.asc</example>

Sie sollten eine Meldung wie

@@ -221,8 +221,8 @@
aus einem simplen Dekomprimieren und danach "Ent-tarren":

<example>
- $ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar
+ $ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar
</example>

Dies erstellt unterhalb des aktuellen Verzeichnisses ein neues
@@ -598,8 +598,8 @@
href="./">docs/manual/</a>. Die aktuellste Version dieses Handbuchs
sowie eine komplette Referenz der verfügbaren <a
href="mod/directives.html">Konfigurationsanweisungen</a> finden
- Sie unter <a href="http://httpd.apache.org/docs-2.0/";
- >http://httpd.apache.org/docs-2.0/</a>.
+ Sie unter <a href="http://httpd.apache.org/docs-2.1/";
+ >http://httpd.apache.org/docs-2.1/</a>.
</section>

<section id="test"><title>Testen</title>
Index: docs/manual/install.xml.ja
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/install.xml.ja,v
retrieving revision 1.4
diff -w -u -d -r1.4 install.xml.ja
--- docs/manual/install.xml.ja 7 Nov 2002 07:28:38 -0000 1.4
+++ docs/manual/install.xml.ja 7 Dec 2002 07:15:36 -0000
@@ -36,15 +36,15 @@
<td><a href="#download">%@%&%s%m!<%I</a></td>

<td><code>$ lynx
- http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz</code>
+ http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz</code>
</td>
</tr>

<tr>
<td><a href="#extract">E83+</a></td>

- <td><code>$ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar</code> </td>
+ <td><code>$ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar</code> </td>
</tr>

<tr>
@@ -186,11 +186,11 @@
0J2<$N%3%^%s%I ($d$C$Q$j pgp $N%P!<%8%g%s$K0MB8) $N$I$l$+0l$D$G!"
G[I[%U%!%$%k$r%A%'%C%/$9$k$3$H$,$G$-$^$9:

-<example>$ pgp httpd-2_0_NN.tar.gz.asc</example>
+<example>$ pgp httpd-2_1_NN.tar.gz.asc</example>

$^$?$O!"

-<example>$ gpg --verify httpd-2_0_NN.tar.gz.asc</example>
+<example>$ gpg --verify httpd-2_1_NN.tar.gz.asc</example>

$9$k$H!"$3$s$J%a%C%;!<%8$r<u$1$k$O$:$G$9!#

@@ -212,8 +212,8 @@
C1$J$k05=L$N2r=|$H tar $NE83+$G$9:

<example>
- $ gzip -d httpd-2_0_NN.tar.gz 
- $ tar xvf httpd-2_0_NN.tar
+ $ gzip -d httpd-2_1_NN.tar.gz 
+ $ tar xvf httpd-2_1_NN.tar
</example>

G[I[MQ$N%=!<%9%3!<%I$,$"$k8=:_$$$k%G%#%l%/%H%j$N2<$K!"
@@ -580,7 +580,7 @@

<a href="./">docs/manual/</a> $N Apache %^%K%e%"%k$r$6$C$H8+$F$/$@$5$$!#
$^$?$O!"<a
- href="http://httpd.apache.org/docs-2.0/";>http://httpd.apache.org/docs- 2.0/</a>
+ href="http://httpd.apache.org/docs-2.1/";>http://httpd.apache.org/docs- 2.1/</a>
$K$"$k%^%K%e%"%k:G?7HG!"<a
href="mod/directives.html">@_Dj%G%#%l%/%F%#%V</a>$KEv$?$C$F$_$F$/ $@$5$$!#
</section>
Index: docs/manual/suexec.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/suexec.html.en,v
retrieving revision 1.38
diff -w -u -d -r1.38 suexec.html.en
--- docs/manual/suexec.html.en 5 Dec 2002 15:18:32 -0000 1.38
+++ docs/manual/suexec.html.en 7 Dec 2002 07:15:38 -0000
@@ -488,7 +488,7 @@

NOTE! This section may not be
complete. For the latest revision of this section of the
- documentation, see the Apache Group's <a href="http://httpd.apache.org/docs-2.0/suexec.html";>Online
+ documentation, see the Apache Group's <a href="http://httpd.apache.org/docs-2.1/suexec.html";>Online
Documentation</a> version.

There are a few points of interest regarding
Index: docs/manual/suexec.html.ja.jis
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/suexec.html.ja.jis,v
retrieving revision 1.5
diff -w -u -d -r1.5 suexec.html.ja.jis
--- docs/manual/suexec.html.ja.jis 10 Oct 2002 14:30:06 -0000 1.5
+++ docs/manual/suexec.html.ja.jis 7 Dec 2002 07:15:39 -0000
@@ -486,7 +486,7 @@

Cm0U!
$3$N>O$O40A4$G$O$"$j$^$;$s!#$3$N>O$N:G?72~D{HG$K$D$$$F$O!"
- Apache %0%k!<%W$N<a href="http://httpd.apache.org/docs-2.0/suexec.html";>
+ Apache %0%k!<%W$N<a href="http://httpd.apache.org/docs-2.1/suexec.html";>
%*%s%i%$%s%I%-%e%a%s%H</a>HG$r;2>H$7$F$/$@$5$$!#


Index: docs/manual/suexec.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/suexec.xml,v
retrieving revision 1.3
diff -w -u -d -r1.3 suexec.xml
--- docs/manual/suexec.xml 5 Sep 2002 23:18:19 -0000 1.3
+++ docs/manual/suexec.xml 7 Dec 2002 07:15:41 -0000
@@ -507,7 +507,7 @@
NOTE! This section may not be
complete. For the latest revision of this section of the
documentation, see the Apache Group's <a
- href="http://httpd.apache.org/docs-2.0/suexec.html";>Online
+ href="http://httpd.apache.org/docs-2.1/suexec.html";>Online
Documentation</a> version.

There are a few points of interest regarding
Index: docs/manual/suexec.xml.ja
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/suexec.xml.ja,v
retrieving revision 1.1
diff -w -u -d -r1.1 suexec.xml.ja
--- docs/manual/suexec.xml.ja 30 Sep 2002 08:12:22 -0000 1.1
+++ docs/manual/suexec.xml.ja 7 Dec 2002 07:15:43 -0000
@@ -506,7 +506,7 @@

Cm0U!
$3$N>O$O40A4$G$O$"$j$^$;$s!#$3$N>O$N:G?72~D{HG$K$D$$$F$O!"
- Apache %0%k!<%W$N<a href="http://httpd.apache.org/docs-2.0/suexec.html";>
+ Apache %0%k!<%W$N<a href="http://httpd.apache.org/docs-2.1/suexec.html";>
%*%s%i%$%s%I%-%e%a%s%H</a>HG$r;2>H$7$F$/$@$5$$!#


Index: docs/manual/faq/index.html
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/faq/index.html,v
retrieving revision 1.3
diff -w -u -d -r1.3 index.html
--- docs/manual/faq/index.html 25 Jul 2002 21:46:39 -0000 1.3
+++ docs/manual/faq/index.html 7 Dec 2002 07:15:43 -0000
@@ -21,8 +21,8 @@

The latest version of this FAQ is always available from the
main Apache web site, at <<a
- href="http://httpd.apache.org/docs-2.0/faq/";
- rel="Help"><samp>http://httpd.apache.org/docs-2.0/faq/</samp></a>>.
+ href="http://httpd.apache.org/docs-2.1/faq/";
+ rel="Help"><samp>http://httpd.apache.org/docs-2.1/faq/</samp></a>>.
 In addition, you can view this FAQ
<a href="./?ONEPAGE">all in one page</a> for easy searching and
printing.
Index: docs/manual/faq/support.html
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/faq/support.html,v
retrieving revision 1.8
diff -w -u -d -r1.8 support.html
--- docs/manual/faq/support.html 16 Sep 2002 17:21:59 -0000 1.8
+++ docs/manual/faq/support.html 7 Dec 2002 07:15:44 -0000
@@ -54,7 +54,7 @@

<li>
Check the <a
- href="http://httpd.apache.org/docs-2.0/faq/";>FAQ</a>!
+ href="http://httpd.apache.org/docs-2.1/faq/";>FAQ</a>!

The latest version of the Apache Frequently-Asked
Index: docs/manual/mod/mod_info.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_info.html.en,v
retrieving revision 1.20
diff -w -u -d -r1.20 mod_info.html.en
--- docs/manual/mod/mod_info.html.en 5 Dec 2002 15:18:35 -0000 1.20
+++ docs/manual/mod/mod_info.html.en 7 Dec 2002 07:15:45 -0000
@@ -71,8 +71,8 @@
<div class="example"><code>
AddModuleInfo mod_deflate.c 'See <a \ 

- href="http://www.apache.org/docs-2.0/mod/mod_deflate.html">\ 
- http://www.apache.org/docs-2.0/mod/mod_deflate.html</a>'
+ href="http://www.apache.org/docs-2.1/mod/mod_deflate.html">\ 
+ http://www.apache.org/docs-2.1/mod/mod_deflate.html</a>'

</code></div>
</div></div><div id="footer">Maintained by the <a href="http://httpd.apache.org/docs-project/";>Apache HTTP Server Documentation Project</a><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></div></body></html>
Index: docs/manual/mod/mod_info.html.ja.jis
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_info.html.ja.jis,v
retrieving revision 1.3
diff -w -u -d -r1.3 mod_info.html.ja.jis
--- docs/manual/mod/mod_info.html.ja.jis 10 Oct 2002 14:30:07 -0000 1.3
+++ docs/manual/mod/mod_info.html.ja.jis 7 Dec 2002 07:15:46 -0000
@@ -68,8 +68,8 @@
<div class="example"><code>
AddModuleInfo mod_authn_file.c 'See <a \ 

- href="http://www.apache.org/docs-2.0/mod/mod_authn_file.html">\ 
- http://www.apache.org/docs-2.0/mod/mod_authn_file.html</a>'
+ href="http://www.apache.org/docs-2.1/mod/mod_authn_file.html">\ 
+ http://www.apache.org/docs-2.1/mod/mod_authn_file.html</a>'

</code></div>
</div></div><div id="footer">Maintained by the <a href="http://httpd.apache.org/docs-project/";>Apache HTTP Server Documentation Project</a><a href="../mod/">%b%8%e!<%k</a> | <a href="../mod/directives.html">%G%#%l%/%F%#%V</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">MQ8l</a> | <a href="../sitemap.html">%5%$%H%^%C%W</a></div></body></html>
Index: docs/manual/mod/mod_info.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_info.xml,v
retrieving revision 1.11
diff -w -u -d -r1.11 mod_info.xml
--- docs/manual/mod/mod_info.xml 2 Dec 2002 21:58:34 -0000 1.11
+++ docs/manual/mod/mod_info.xml 7 Dec 2002 07:15:46 -0000
@@ -75,8 +75,8 @@
<example>
AddModuleInfo mod_deflate.c 'See <a \ 
<indent>
- href="http://www.apache.org/docs-2.0/mod/mod_deflate.html">\ 
- http://www.apache.org/docs-2.0/mod/mod_deflate.html</a>'
+ href="http://www.apache.org/docs-2.1/mod/mod_deflate.html">\ 
+ http://www.apache.org/docs-2.1/mod/mod_deflate.html</a>'
</indent>
</example>
</usage>
Index: docs/manual/mod/mod_info.xml.ja
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/mod/mod_info.xml.ja,v
retrieving revision 1.2
diff -w -u -d -r1.2 mod_info.xml.ja
--- docs/manual/mod/mod_info.xml.ja 10 Oct 2002 13:03:44 -0000 1.2
+++ docs/manual/mod/mod_info.xml.ja 7 Dec 2002 07:15:46 -0000
@@ -74,8 +74,8 @@
<example>
AddModuleInfo mod_authn_file.c 'See <a \ 
<indent>
- href="http://www.apache.org/docs-2.0/mod/mod_authn_file.html">\ 
- http://www.apache.org/docs-2.0/mod/mod_authn_file.html</a>'
+ href="http://www.apache.org/docs-2.1/mod/mod_authn_file.html">\ 
+ http://www.apache.org/docs-2.1/mod/mod_authn_file.html</a>'
</indent>
</example>
</usage>
Index: docs/manual/programs/suexec.html
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/programs/suexec.html,v
retrieving revision 1.3
diff -w -u -d -r1.3 suexec.html
--- docs/manual/programs/suexec.html 22 Sep 2001 19:38:35 -0000 1.3
+++ docs/manual/programs/suexec.html 7 Dec 2002 07:15:46 -0000
@@ -28,7 +28,7 @@
ically to switch the user when an external program has to be
run under a different user. For more information about
suEXEC see the document `Apache suEXEC Support' under
- http://httpd.apache.org/docs-2.0/suexec.html .
+ http://httpd.apache.org/docs-2.1/suexec.html .

SEE ALSO
httpd(8)
Index: docs/manual/ssl/ssl_faq.html.en
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/ssl/ssl_faq.html.en,v
retrieving revision 1.6
diff -w -u -d -r1.6 ssl_faq.html.en
--- docs/manual/ssl/ssl_faq.html.en 5 Dec 2002 15:18:39 -0000 1.6
+++ docs/manual/ssl/ssl_faq.html.en 7 Dec 2002 07:15:51 -0000
@@ -844,8 +844,8 @@

<dl>
<dt>Answers in the User Manual's F.A.Q. List (this)</dt>
- <dd><a href="http://httpd.apache.org/docs-2.0/ssl/ssl_faq.html";>
- http://httpd.apache.org/docs-2.0/ssl/ssl_faq.html</a> 
+ <dd><a href="http://httpd.apache.org/docs-2.1/ssl/ssl_faq.html";>
+ http://httpd.apache.org/docs-2.1/ssl/ssl_faq.html</a> 
First look inside the F.A.Q. (this text), perhaps your problem is such
popular that it was already answered a lot of times in the past.
</dd>
Index: docs/manual/ssl/ssl_faq.xml
===================================================================
RCS file: /home/cvs/httpd-2.0/docs/manual/ssl/ssl_faq.xml,v
retrieving revision 1.5
diff -w -u -d -r1.5 ssl_faq.xml
--- docs/manual/ssl/ssl_faq.xml 20 Nov 2002 03:12:35 -0000 1.5
+++ docs/manual/ssl/ssl_faq.xml 7 Dec 2002 07:15:54 -0000
@@ -874,8 +874,8 @@

<dl>
<dt>Answers in the User Manual's F.A.Q. List (this)</dt>
- <dd><a href="http://httpd.apache.org/docs-2.0/ssl/ssl_faq.html";>
- http://httpd.apache.org/docs-2.0/ssl/ssl_faq.html</a> 
+ <dd><a href="http://httpd.apache.org/docs-2.1/ssl/ssl_faq.html";>
+ http://httpd.apache.org/docs-2.1/ssl/ssl_faq.html</a> 
First look inside the F.A.Q. (this text), perhaps your problem is such
popular that it was already answered a lot of times in the past.
</dd>
Index: modules/experimental/README
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/experimental/README,v
retrieving revision 1.3
diff -w -u -d -r1.3 README
--- modules/experimental/README 12 Apr 2002 11:20:47 -0000 1.3
+++ modules/experimental/README 7 Dec 2002 07:15:56 -0000
@@ -16,7 +16,7 @@
the example module did as the various callbacks were made.

To include the example module in your server add --enable-example to the
-other ./configure arguments executed from the httpd-2.0 directory. After
+other ./configure arguments executed from the httpd-2.1 directory. After
that run 'make'.

To add another module of your own:
Index: modules/proxy/CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/proxy/CHANGES,v
retrieving revision 1.15
diff -w -u -d -r1.15 CHANGES
--- modules/proxy/CHANGES 27 Mar 2002 12:55:35 -0000 1.15
+++ modules/proxy/CHANGES 7 Dec 2002 07:15:57 -0000
@@ -1,9 +1,9 @@
******************************************
* PLEASE NOTE: Now that development for *
* mod_proxy has been folded back into *
-* the httpd-2.0 tree, this file has *
+* the httpd-2.1 tree, this file has *
* been depreciated. Proxy changes should *
-* be noted in httpd-2.0's CHANGES file. *
+* be noted in httpd-2.1's CHANGES file. *
* This file exists for historical *
* purposes. *
******************************************
Index: modules/ssl/README
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/README,v
retrieving revision 1.38
diff -w -u -d -r1.38 README
--- modules/ssl/README 30 May 2002 19:19:20 -0000 1.38
+++ modules/ssl/README 7 Dec 2002 07:15:57 -0000
@@ -1,6 +1,6 @@
SYNOPSIS

- This Apache module provides strong cryptography for the Apache 2.0 webserver
+ This Apache module provides strong cryptography for the Apache 2 webserver
via the Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS
v1) protocols by the help of the SSL/TLS implementation library OpenSSL which
is based on SSLeay from Eric A. Young and Tim J. Hudson.
@@ -13,7 +13,7 @@

SOURCES

- See the top-level LAYOUT file in httpd-2.0 for file descriptions.
+ See the top-level LAYOUT file in httpd-2.1 for file descriptions.

The source files are written in clean ANSI C and pass the ``gcc -O -g
-ggdb3 -Wall -Wshadow -Wpointer-arith -Wcast-align -Wmissing-prototypes
@@ -87,7 +87,7 @@
INCOMPATIBILITIES

The following intentional incompatibilities exist between mod_ssl 2.x
- from Apache 1.3 and this mod_ssl version for Apache 2.0:
+ from Apache 1.3 and this mod_ssl version for Apache 2:

o The complete EAPI-based SSL_VENDOR stuff was removed.
o The complete EAPI-based SSL_COMPAT stuff was removed.
@@ -95,10 +95,10 @@

MAJOR CHANGES

- For a complete history of changes for Apache 2.0 mod_ssl, see the
- CHANGES file in the top-level httpd-2.0 directory. The following
+ For a complete history of changes for Apache 2 mod_ssl, see the
+ CHANGES file in the top-level httpd-2.1 directory. The following
is a condensed summary of the major changes were made between
- mod_ssl 2.x from Apache 1.3 and this mod_ssl version for Apache 2.0:
+ mod_ssl 2.x from Apache 1.3 and this mod_ssl version for Apache 2:

o The DBM based session cache is now based on APR's DBM API only.
o The shared memory based session cache is now based on APR's APIs.
@@ -126,4 +126,4 @@

TODO

- See the top-level STATUS file in httpd-2.0 for current efforts and goals.
+ See the top-level STATUS file in httpd-2.1 for current efforts and goals.
Index: modules/ssl/ssl_expr_scan.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_expr_scan.c,v
retrieving revision 1.12
diff -w -u -d -r1.12 ssl_expr_scan.c
--- modules/ssl/ssl_expr_scan.c 30 Sep 2002 23:45:58 -0000 1.12
+++ modules/ssl/ssl_expr_scan.c 7 Dec 2002 07:16:01 -0000
@@ -18,7 +18,7 @@
/* A lexical scanner generated by flex */

/* Scanner skeleton version:
- * $Header: /home/cvs/httpd-2.0/modules/ssl/ssl_expr_scan.c,v 1.12 2002/09/30 23:45:58 rbb Exp $
+ * $Header: /home/cvs/httpd-2.1/modules/ssl/ssl_expr_scan.c,v 1.12 2002/09/30 23:45:58 rbb Exp $
*/

#define FLEX_SCANNER
Index: server/util.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util.c,v
retrieving revision 1.133
diff -w -u -d -r1.133 util.c
--- server/util.c 1 Nov 2002 18:01:27 -0000 1.133
+++ server/util.c 7 Dec 2002 07:16:06 -0000
@@ -264,7 +264,7 @@

/* We actually compare the canonical root to this root, (but we don't
* waste time checking the case), since every use of this function in
- * httpd-2.0 tests if the path is 'proper', meaning we've already passed
+ * httpd-2.1 tests if the path is 'proper', meaning we've already passed
* it through apr_filepath_merge, or we haven't.
*/
AP_DECLARE(int) ap_os_is_path_absolute(apr_pool_t *p, const char *dir)

[PATCH] 2.0->2.1

Reply via email to