From: Wilfredo Sanchez Date: Sun, 8 Dec 2002 21:05:57 +0000 (+0000) Subject: 2.0 -> 2.1 X-Git-Tag: pre_ajp_proxy~2491 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c3569b1933f330e9478c0c87b1a6d37b79a3cd1;p=apache 2.0 -> 2.1 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97800 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/INSTALL b/INSTALL index 16472e98fa..7a17d3675b 100644 --- a/INSTALL +++ b/INSTALL @@ -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/ diff --git a/LAYOUT b/LAYOUT index dbeee7d68e..c5525d76ea 100644 --- a/LAYOUT +++ b/LAYOUT @@ -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 diff --git a/README b/README index c4c2108399..59217a37d9 100644 --- a/README +++ b/README @@ -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. diff --git a/README.platforms b/README.platforms index 155ef27811..d565fdd053 100644 --- a/README.platforms +++ b/README.platforms @@ -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 diff --git a/build/httpd_roll_release b/build/httpd_roll_release index 89102a5908..4eaf137491 100755 --- a/build/httpd_roll_release +++ b/build/httpd_roll_release @@ -18,7 +18,7 @@ USER=$3 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 @@ cd $START_DIR/$WORKING_DIR # 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 diff --git a/docs/STATUS b/docs/STATUS index 026104ed0c..83b4f0a147 100644 --- a/docs/STATUS +++ b/docs/STATUS @@ -1,5 +1,5 @@ -Apache HTTP Server 2.0 Documentation Status File. -Last modified: $Date: 2002/11/23 18:49:31 $ +Apache HTTP Server 2.1 Documentation Status File. +Last modified: $Date: 2002/12/08 21:05:55 $ If you are interested in helping accomplish some of the tasks on this list or otherwise improving the documentation, please join the diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in index 8e60215867..717e6545fe 100644 --- a/docs/conf/httpd-std.conf.in +++ b/docs/conf/httpd-std.conf.in @@ -3,7 +3,7 @@ # # This is the main Apache server configuration file. It contains the # configuration directives that give the server its instructions. -# See for detailed information about +# See 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 ); +# at ); # you will save yourself a lot of trouble. # # Do NOT add a slash at the end of the directory path. @@ -340,7 +340,7 @@ DocumentRoot "@exp_htdocsdir@" # 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 @@ HostnameLookups Off # 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 @@ HostnameLookups Off # 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 @@ ServerSignature On # IP addresses. This is indicated by the asterisks in the directives below. # # Please see the documentation at -# +# # for further details before you try to setup virtual hosts. # # You may use the command line option '-S' to verify your virtual host diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf index 0b5e8383a7..ce8dc0722f 100644 --- a/docs/conf/httpd-win.conf +++ b/docs/conf/httpd-win.conf @@ -3,7 +3,7 @@ # # This is the main Apache server configuration file. It contains the # configuration directives that give the server its instructions. -# See for detailed information about +# See 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 ); +# at ); # you will save yourself a lot of trouble. # # Do NOT add a slash at the end of the directory path. @@ -267,7 +267,7 @@ DocumentRoot "@@ServerRoot@@/htdocs" # 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 @@ HostnameLookups Off # 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 @@ HostnameLookups Off # 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 @@ BrowserMatch "^gnome-vfs" redirect-carefully # IP addresses. This is indicated by the asterisks in the directives below. # # Please see the documentation at -# +# # for further details before you try to setup virtual hosts. # # You may use the command line option '-S' to verify your virtual host diff --git a/docs/conf/ssl-std.conf b/docs/conf/ssl-std.conf index 4bc8083919..5135441f24 100644 --- a/docs/conf/ssl-std.conf +++ b/docs/conf/ssl-std.conf @@ -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 +# directives see # # For the moment, see for this info. # The documents are still being prepared from material donated by the diff --git a/docs/manual/faq/index.html b/docs/manual/faq/index.html index 0cf11788d0..a27fea7e56 100644 --- a/docs/manual/faq/index.html +++ b/docs/manual/faq/index.html @@ -21,8 +21,8 @@

The latest version of this FAQ is always available from the main Apache web site, at <http://httpd.apache.org/docs-2.0/faq/>. + href="http://httpd.apache.org/docs-2.1/faq/" + rel="Help">http://httpd.apache.org/docs-2.1/faq/>. In addition, you can view this FAQ all in one page for easy searching and printing. diff --git a/docs/manual/faq/support.html b/docs/manual/faq/support.html index 10c9881bf1..a7db4f2120 100644 --- a/docs/manual/faq/support.html +++ b/docs/manual/faq/support.html @@ -54,7 +54,7 @@

  • Check the FAQ! + href="http://httpd.apache.org/docs-2.1/faq/">FAQ!

    The latest version of the Apache Frequently-Asked diff --git a/docs/manual/glossary.html.en b/docs/manual/glossary.html.en index 36863c7f6b..9ccfbc8c55 100644 --- a/docs/manual/glossary.html.en +++ b/docs/manual/glossary.html.en @@ -300,7 +300,7 @@ called a Uniform Resource Identifier. URLs are usually made up of a scheme, like http or https, a hostname, and a path. A URL for this page is -http://httpd.apache.org/docs-2.0/glossary.html. +http://httpd.apache.org/docs-2.1/glossary.html.

    Uniform Resource Identifier (URI)
    A compact string of characters for identifying an abstract or physical resource. It is formally defined diff --git a/docs/manual/glossary.xml b/docs/manual/glossary.xml index 825ef36f2c..9e4c6263d5 100644 --- a/docs/manual/glossary.xml +++ b/docs/manual/glossary.xml @@ -339,7 +339,7 @@ called a Uniform Resource Identifier. URLs are usually made up of a scheme, like http or https, a hostname, and a path. A URL for this page is -http://httpd.apache.org/docs-2.0/glossary.html.
    +http://httpd.apache.org/docs-2.1/glossary.html.
    Uniform Resource Identifier (URI)
    A compact string of characters for diff --git a/docs/manual/install.html.de b/docs/manual/install.html.de index 57fdb4a222..d549822e81 100644 --- a/docs/manual/install.html.de +++ b/docs/manual/install.html.de @@ -25,15 +25,15 @@ Download $ lynx - http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz + http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz Auspacken - $ 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     @@ -173,11 +173,11 @@ können Sie die Distribution mit einem der folgenden Befehle (wiederum abhängig von Ihrer PGP Version) prüfen:

    -

    $ pgp httpd-2_0_NN.tar.gz.asc

    +

    $ pgp httpd-2_1_NN.tar.gz.asc

    oder

    -

    $ gpg --verify httpd-2_0_NN.tar.gz.asc

    +

    $ gpg --verify httpd-2_1_NN.tar.gz.asc

    Sie sollten eine Meldung wie

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

    - $ 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

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

    Werfen Sie auch einen Blick in das Apache-Handbuch unter docs/manual/. Die aktuellste Version dieses Handbuchs sowie eine komplette Referenz der verfügbaren Konfigurationsanweisungen finden - Sie unter http://httpd.apache.org/docs-2.0/.

    + Sie unter http://httpd.apache.org/docs-2.1/.

    top

    Testen

    Sie können nun Ihren Apache HTTP Server starten, indem Sie einfach

    diff --git a/docs/manual/install.html.en b/docs/manual/install.html.en index 8c148f59c0..506e869563 100644 --- a/docs/manual/install.html.en +++ b/docs/manual/install.html.en @@ -27,15 +27,15 @@ Download $ lynx - http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz + http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz Extract - $ 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     @@ -165,11 +165,11 @@ can check the distribution with one of the following commands (again, depending on your pgp version):

    -

    $ pgp httpd-2_0_NN.tar.gz.asc

    +

    $ pgp httpd-2_1_NN.tar.gz.asc

    or

    -

    $ gpg --verify httpd-2_0_NN.tar.gz.asc

    +

    $ gpg --verify httpd-2_1_NN.tar.gz.asc

    You should receive a message like

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

    - $ 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

    This will create a new directory under the current directory @@ -531,7 +531,7 @@ seperated by a colon.

    $ vi PREFIX/conf/httpd.conf

    -

    Have a look at the Apache manual under docs/manual/ or consult http://httpd.apache.org/docs-2.0/ for the most recent version of +

    Have a look at the Apache manual under docs/manual/ or consult http://httpd.apache.org/docs-2.1/ for the most recent version of this manual and a complete reference of available configuration directives.

    top

    Test

    diff --git a/docs/manual/install.html.ja.jis b/docs/manual/install.html.ja.jis index fa2b311a37..9d7034a84e 100644 --- a/docs/manual/install.html.ja.jis +++ b/docs/manual/install.html.ja.jis @@ -26,15 +26,15 @@ $B%@%&%s%m!<%I(B $ lynx - http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz + http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz $BE83+(B - $ 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     @@ -163,11 +163,11 @@ $B0J2<$N%3%^%s%I(B ($B$d$C$Q$j(B pgp $B$N%P!<%8%g%s$K0MB8(B) $B$N$I$l$+0l$D$G!"(B $BG[I[%U%!%$%k$r%A%'%C%/$9$k$3$H$,$G$-$^$9(B:

    -

    $ pgp httpd-2_0_NN.tar.gz.asc

    +

    $ pgp httpd-2_1_NN.tar.gz.asc

    $B$^$?$O!"(B

    -

    $ gpg --verify httpd-2_0_NN.tar.gz.asc

    +

    $ gpg --verify httpd-2_1_NN.tar.gz.asc

    $B$9$k$H!"$3$s$J%a%C%;!<%8$r @@ -187,8 +187,8 @@ $BC1$J$k05=L$N2r=|$H(B tar $B$NE83+$G$9(B:

    - $ 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

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

    $ vi PREFIX/conf/httpd.conf

    docs/manual/ $B$N(B Apache $B%^%K%e%"%k$r$6$C$H8+$F$/$@$5$$!#(B - $B$^$?$O!"(Bhttp://httpd.apache.org/docs-2.0/ + $B$^$?$O!"(Bhttp://httpd.apache.org/docs-2.1/ $B$K$"$k%^%K%e%"%k:G?7HG!"(B$B@_Dj%G%#%l%/%F%#%V(B$B$KEv$?$C$F$_$F$/$@$5$$!#(B

    top

    $B%F%9%H(B

    diff --git a/docs/manual/install.html.ko.euc-kr b/docs/manual/install.html.ko.euc-kr index 220ba83047..db0b0037ea 100644 --- a/docs/manual/install.html.ko.euc-kr +++ b/docs/manual/install.html.ko.euc-kr @@ -69,15 +69,15 @@ ´Ù¿î·Îµå $ lynx - http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz + http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz ¾ÐÃà Ç®±â - $ 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     @@ -220,12 +220,12 @@ ¹èÆ÷º»À» È®ÀÎÇÒ ¼ö ÀÖ´Ù:

    - $ pgp httpd-2_0_NN.tar.gz.asc + $ pgp httpd-2_1_NN.tar.gz.asc
    ȤÀº
    - $ gpg --verify httpd-2_0_NN.tar.gz.asc + $ gpg --verify httpd-2_1_NN.tar.gz.asc
    ´ÙÀ½°ú °°Àº ¸Þ¼¼Áö°¡ ³ª¿Í¾ß ÇÑ´Ù.

    @@ -247,8 +247,8 @@ ¾ÐÃà°ú tar¸¦ Ǫ´Â °ÍÀÌ´Ù:

    - $ 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

    ±×·¯¸é ÇöÀç µð·ºÅ丮 ¾Æ·¡¿¡ ¹èÆ÷º»ÀÇ ¼Ò½ºÄڵ带 ´ãÀº diff --git a/docs/manual/install.xml b/docs/manual/install.xml index 45ab74e854..e24a62e271 100644 --- a/docs/manual/install.xml +++ b/docs/manual/install.xml @@ -35,15 +35,15 @@ Download $ lynx - http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz + http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz Extract - $ 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     @@ -186,11 +186,11 @@ can check the distribution with one of the following commands (again, depending on your pgp version):

    -$ pgp httpd-2_0_NN.tar.gz.asc +$ pgp httpd-2_1_NN.tar.gz.asc

    or

    -$ gpg --verify httpd-2_0_NN.tar.gz.asc +$ gpg --verify httpd-2_1_NN.tar.gz.asc

    You should receive a message like

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

    - $ 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

    This will create a new directory under the current directory @@ -568,8 +568,8 @@ seperated by a colon.

    Have a look at the Apache manual under docs/manual/ or consult http://httpd.apache.org/docs-2.0/ for the most recent version of + href="http://httpd.apache.org/docs-2.1/" + >http://httpd.apache.org/docs-2.1/ for the most recent version of this manual and a complete reference of available configuration directives.

    diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de index 3c147c5a81..27097b22b8 100644 --- a/docs/manual/install.xml.de +++ b/docs/manual/install.xml.de @@ -35,15 +35,15 @@ Download $ lynx - http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz + http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz Auspacken - $ 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     @@ -193,11 +193,11 @@ können Sie die Distribution mit einem der folgenden Befehle (wiederum abhängig von Ihrer PGP Version) prüfen:

    - $ pgp httpd-2_0_NN.tar.gz.asc + $ pgp httpd-2_1_NN.tar.gz.asc

    oder

    - $ gpg --verify httpd-2_0_NN.tar.gz.asc + $ gpg --verify httpd-2_1_NN.tar.gz.asc

    Sie sollten eine Meldung wie

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

    - $ 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

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

    + Sie unter http://httpd.apache.org/docs-2.1/.

    Testen diff --git a/docs/manual/install.xml.ja b/docs/manual/install.xml.ja index 8587db3e70..28122b16e5 100644 --- a/docs/manual/install.xml.ja +++ b/docs/manual/install.xml.ja @@ -36,15 +36,15 @@ $B%@%&%s%m!<%I(B $ lynx - http://www.apache.org/dist/httpd/httpd-2_0_NN.tar.gz + http://www.apache.org/dist/httpd/httpd-2_1_NN.tar.gz $BE83+(B - $ 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     @@ -186,11 +186,11 @@ $B0J2<$N%3%^%s%I(B ($B$d$C$Q$j(B pgp $B$N%P!<%8%g%s$K0MB8(B) $B$N$I$l$+0l$D$G!"(B $BG[I[%U%!%$%k$r%A%'%C%/$9$k$3$H$,$G$-$^$9(B:

    -$ pgp httpd-2_0_NN.tar.gz.asc +$ pgp httpd-2_1_NN.tar.gz.asc

    $B$^$?$O!"(B

    -$ gpg --verify httpd-2_0_NN.tar.gz.asc +$ gpg --verify httpd-2_1_NN.tar.gz.asc

    $B$9$k$H!"$3$s$J%a%C%;!<%8$r @@ -212,8 +212,8 @@ $BC1$J$k05=L$N2r=|$H(B tar $B$NE83+$G$9(B:

    - $ 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

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

    docs/manual/ $B$N(B Apache $B%^%K%e%"%k$r$6$C$H8+$F$/$@$5$$!#(B $B$^$?$O!"(Bhttp://httpd.apache.org/docs-2.0/ + href="http://httpd.apache.org/docs-2.1/">http://httpd.apache.org/docs-2.1/ $B$K$"$k%^%K%e%"%k:G?7HG!"(B$B@_Dj%G%#%l%/%F%#%V(B$B$KEv$?$C$F$_$F$/$@$5$$!#(B

    diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en index f366ec23a7..d8b433249e 100644 --- a/docs/manual/mod/mod_info.html.en +++ b/docs/manual/mod/mod_info.html.en @@ -71,8 +71,8 @@ information displayed by the server-info handler

    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>'

    \ No newline at end of file diff --git a/docs/manual/mod/mod_info.html.ja.jis b/docs/manual/mod/mod_info.html.ja.jis index 5bb4915a75..e4e22a9283 100644 --- a/docs/manual/mod/mod_info.html.ja.jis +++ b/docs/manual/mod/mod_info.html.ja.jis @@ -68,8 +68,8 @@ SetHandler server-info

    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>'

    \ No newline at end of file diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml index bb3fce9391..b16ac25a41 100644 --- a/docs/manual/mod/mod_info.xml +++ b/docs/manual/mod/mod_info.xml @@ -75,8 +75,8 @@ information displayed by the server-info handler 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>'     diff --git a/docs/manual/mod/mod_info.xml.ja b/docs/manual/mod/mod_info.xml.ja index f11196c53c..4fa379de81 100644 --- a/docs/manual/mod/mod_info.xml.ja +++ b/docs/manual/mod/mod_info.xml.ja @@ -74,8 +74,8 @@ SetHandler server-info
    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>'     diff --git a/docs/manual/programs/suexec.html b/docs/manual/programs/suexec.html index 185e8dc1f8..d7440d9ccb 100644 --- a/docs/manual/programs/suexec.html +++ b/docs/manual/programs/suexec.html @@ -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) diff --git a/docs/manual/ssl/ssl_faq.html.en b/docs/manual/ssl/ssl_faq.html.en index 40214e09fe..5412b3037d 100644 --- a/docs/manual/ssl/ssl_faq.html.en +++ b/docs/manual/ssl/ssl_faq.html.en @@ -844,8 +844,8 @@ server" What's the reason?
    Answers in the User Manual's F.A.Q. List (this)
    -
    - http://httpd.apache.org/docs-2.0/ssl/ssl_faq.html
    +
    + http://httpd.apache.org/docs-2.1/ssl/ssl_faq.html
    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.
    diff --git a/docs/manual/ssl/ssl_faq.xml b/docs/manual/ssl/ssl_faq.xml index e2f531a789..82cc410c3c 100644 --- a/docs/manual/ssl/ssl_faq.xml +++ b/docs/manual/ssl/ssl_faq.xml @@ -874,8 +874,8 @@ server" What's the reason?
    Answers in the User Manual's F.A.Q. List (this)
    -
    - http://httpd.apache.org/docs-2.0/ssl/ssl_faq.html
    +
    + http://httpd.apache.org/docs-2.1/ssl/ssl_faq.html
    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.
    diff --git a/docs/manual/suexec.html.en b/docs/manual/suexec.html.en index 5284e798d3..a610d1bed5 100644 --- a/docs/manual/suexec.html.en +++ b/docs/manual/suexec.html.en @@ -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 Online + documentation, see the Apache Group's Online Documentation version.

    There are a few points of interest regarding diff --git a/docs/manual/suexec.html.ja.jis b/docs/manual/suexec.html.ja.jis index dcb8ad496c..a82faee9d3 100644 --- a/docs/manual/suexec.html.ja.jis +++ b/docs/manual/suexec.html.ja.jis @@ -486,7 +486,7 @@

    $BCm0U(B! $B$3$N>O$O40A4$G$O$"$j$^$;$s!#$3$N>O$N:G?72~D{HG$K$D$$$F$O!"(B - Apache $B%0%k!<%W$N(B + Apache $B%0%k!<%W$N(B $B%*%s%i%$%s%I%-%e%a%s%H(B$BHG$r;2>H$7$F$/$@$5$$!#(B

    diff --git a/docs/manual/suexec.xml b/docs/manual/suexec.xml index 0d61c5128c..a3f1c9d015 100644 --- a/docs/manual/suexec.xml +++ b/docs/manual/suexec.xml @@ -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 Online + href="http://httpd.apache.org/docs-2.1/suexec.html">Online Documentation version.

    There are a few points of interest regarding diff --git a/docs/manual/suexec.xml.ja b/docs/manual/suexec.xml.ja index 7d7fe35360..bd0ab3b2e5 100644 --- a/docs/manual/suexec.xml.ja +++ b/docs/manual/suexec.xml.ja @@ -506,7 +506,7 @@

    $BCm0U(B! $B$3$N>O$O40A4$G$O$"$j$^$;$s!#$3$N>O$N:G?72~D{HG$K$D$$$F$O!"(B - Apache $B%0%k!<%W$N(B + Apache $B%0%k!<%W$N(B $B%*%s%i%$%s%I%-%e%a%s%H(B$BHG$r;2>H$7$F$/$@$5$$!#(B

    diff --git a/modules/experimental/README b/modules/experimental/README index 447c16eeda..64824a6563 100644 --- a/modules/experimental/README +++ b/modules/experimental/README @@ -16,7 +16,7 @@ browse to that location, you will see a display of some of the tracing 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: diff --git a/modules/proxy/CHANGES b/modules/proxy/CHANGES index 73a9228d75..cca99a90ab 100644 --- a/modules/proxy/CHANGES +++ b/modules/proxy/CHANGES @@ -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. * ****************************************** diff --git a/modules/ssl/README b/modules/ssl/README index b24af26fe5..18aee8984c 100644 --- a/modules/ssl/README +++ b/modules/ssl/README @@ -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 @@ SYNOPSIS 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 @@ EXPERIMENTAL CODE 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 @@ INCOMPATIBILITIES 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 @@ MAJOR CHANGES 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. diff --git a/modules/ssl/ssl_expr_scan.c b/modules/ssl/ssl_expr_scan.c index 6bc54040c9..e14dccecf8 100644 --- a/modules/ssl/ssl_expr_scan.c +++ b/modules/ssl/ssl_expr_scan.c @@ -18,7 +18,7 @@ /* A lexical scanner generated by flex */ /* Scanner skeleton version: - * $Header: /home/striker/cvs2svn/dumps/httpd-2.0/../../httpd-2.0/modules/ssl/ssl_expr_scan.c,v 1.12 2002/09/30 23:45:58 rbb Exp $ + * $Header: /home/striker/cvs2svn/dumps/httpd-2.0/../../httpd-2.0/modules/ssl/ssl_expr_scan.c,v 1.13 2002/12/08 21:05:57 wsanchez Exp $ */ #define FLEX_SCANNER diff --git a/server/util.c b/server/util.c index b6044d6d7b..c028bf51c6 100644 --- a/server/util.c +++ b/server/util.c @@ -264,7 +264,7 @@ AP_DECLARE(int) ap_strcasecmp_match(const char *str, const char *exp) /* 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)