From: André Malo Date: Sun, 19 Jun 2005 07:43:27 +0000 (+0000) Subject: mod_version_for_2.0.x branch: X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9022af073a76c40c6b1b920e0e8d1a4797dfef4c;p=thirdparty%2Fapache%2Fhttpd.git mod_version_for_2.0.x branch: * Merge 190230 to 191323 from branches/2.0.x git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/mod_version_for_2.0.x@191327 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/build/bsd_makefile b/build/bsd_makefile index c3b8131101b..d4e81fe7036 100755 --- a/build/bsd_makefile +++ b/build/bsd_makefile @@ -1,6 +1,7 @@ #! /bin/sh # -# Copyright 2000-2004 The Apache Software Foundation +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/build-modules-c.awk b/build/build-modules-c.awk index 27ebbde1e6a..01d0908c438 100644 --- a/build/build-modules-c.awk +++ b/build/build-modules-c.awk @@ -1,4 +1,5 @@ -# Copyright 1999-2004 The Apache Software Foundation +# Copyright 1999-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/library.mk b/build/library.mk index 9747115f9e6..aa77dbf7f8d 100644 --- a/build/library.mk +++ b/build/library.mk @@ -1,4 +1,5 @@ -# Copyright 2000-2004 The Apache Software Foundation +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/ltlib.mk b/build/ltlib.mk index 5ab0750498b..51f5ad2cd13 100644 --- a/build/ltlib.mk +++ b/build/ltlib.mk @@ -1,4 +1,5 @@ -# Copyright 2000-2004 The Apache Software Foundation +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/make_exports.awk b/build/make_exports.awk index aa69b257ad2..2b1b1d4ea2c 100644 --- a/build/make_exports.awk +++ b/build/make_exports.awk @@ -1,4 +1,5 @@ -# Copyright 2001-2004 The Apache Software Foundation +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/make_nw_export.awk b/build/make_nw_export.awk index 4640ff696eb..ac7f97323ba 100644 --- a/build/make_nw_export.awk +++ b/build/make_nw_export.awk @@ -1,4 +1,5 @@ -# Copyright 2001-2004 The Apache Software Foundation +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/make_var_export.awk b/build/make_var_export.awk index be150d47109..374afa381ee 100644 --- a/build/make_var_export.awk +++ b/build/make_var_export.awk @@ -1,4 +1,5 @@ -# Copyright 2001-2004 The Apache Software Foundation +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/mkconfNW.awk b/build/mkconfNW.awk index 530c5eae6c9..2728ecaa38e 100644 --- a/build/mkconfNW.awk +++ b/build/mkconfNW.awk @@ -1,4 +1,5 @@ -# Copyright 2002-2004 The Apache Software Foundation +# Copyright 2002-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/nw_ver.awk b/build/nw_ver.awk index 942f7323600..00e0ef0b9dc 100644 --- a/build/nw_ver.awk +++ b/build/nw_ver.awk @@ -1,4 +1,5 @@ -# Copyright 2002-2004 The Apache Software Foundation +# Copyright 2002-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/program.mk b/build/program.mk index 19312c88d81..3d0b0204a6e 100644 --- a/build/program.mk +++ b/build/program.mk @@ -1,4 +1,5 @@ -# Copyright 2000-2004 The Apache Software Foundation +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/rpm/httpd.init b/build/rpm/httpd.init index 218b69d1b1c..38f2a92b529 100755 --- a/build/rpm/httpd.init +++ b/build/rpm/httpd.init @@ -1,6 +1,7 @@ #!/bin/bash # -# Copyright 2003-2004 The Apache Software Foundation +# Copyright 2003-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/special.mk b/build/special.mk index 924c2f3faa9..9157ff34e9d 100644 --- a/build/special.mk +++ b/build/special.mk @@ -1,4 +1,5 @@ -# Copyright 2000-2004 The Apache Software Foundation +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/sysv_makefile b/build/sysv_makefile index 4d2ddae2825..63530755f99 100755 --- a/build/sysv_makefile +++ b/build/sysv_makefile @@ -1,6 +1,7 @@ #! /bin/sh # -# Copyright 2000-2004 The Apache Software Foundation +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/win32/win32ver.awk b/build/win32/win32ver.awk index ce64693c60b..0e3e847e7d8 100644 --- a/build/win32/win32ver.awk +++ b/build/win32/win32ver.awk @@ -1,4 +1,5 @@ -# Copyright 2001-2004 The Apache Software Foundation +# Copyright 2001-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/buildconf b/buildconf index e6ee6b4ac69..0868723fdc6 100755 --- a/buildconf +++ b/buildconf @@ -1,6 +1,7 @@ #!/bin/sh # -# Copyright 2000-2004 The Apache Software Foundation +# Copyright 2000-2005 The Apache Software Foundation or its licensors, as +# applicable. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/docs/conf/httpd-std.conf.in b/docs/conf/httpd-std.conf.in index e68a76dad94..3d2cb2e7b35 100644 --- a/docs/conf/httpd-std.conf.in +++ b/docs/conf/httpd-std.conf.in @@ -349,7 +349,7 @@ DocumentRoot "@exp_htdocsdir@" # # AllowOverride controls what directives may be placed in .htaccess files. # It can be "All", "None", or any combination of the keywords: -# Options FileInfo AuthConfig Limit +# Options FileInfo AuthConfig Limit Indexes # AllowOverride None @@ -405,10 +405,10 @@ AccessFileName .htaccess # The following lines prevent .htaccess and .htpasswd files from being # viewed by Web clients. # - + Order allow,deny Deny from all - + # # TypesConfig describes where the mime.types file (or equivalent) is diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf index aee7dd346b9..a4405d6549c 100644 --- a/docs/conf/httpd-win.conf +++ b/docs/conf/httpd-win.conf @@ -331,10 +331,10 @@ AccessFileName .htaccess # The following lines prevent .htaccess and .htpasswd files from being # viewed by Web clients. # - + Order allow,deny Deny from all - + # # TypesConfig describes where the mime.types file (or equivalent) is diff --git a/docs/conf/ssl-std.conf.in b/docs/conf/ssl-std.conf.in index 748f60c6430..7547399ccef 100644 --- a/docs/conf/ssl-std.conf.in +++ b/docs/conf/ssl-std.conf.in @@ -200,9 +200,9 @@ SSLCertificateKeyFile @exp_sysconfdir@/ssl.key/server.key # This enables optimized SSL connection renegotiation handling when SSL # directives are used in per-directory context. #SSLOptions +FakeBasicAuth +ExportCertData +CompatEnvVars +StrictRequire - + SSLOptions +StdEnvVars - + SSLOptions +StdEnvVars diff --git a/docs/manual/install.html.de b/docs/manual/install.html.de index 757042f6a62..2a4c8e6ac18 100644 --- a/docs/manual/install.html.de +++ b/docs/manual/install.html.de @@ -25,9 +25,6 @@  ko  |  ru 

-
Diese Übersetzung ist möglicherweise - nicht mehr aktuell. Bitte prüfen Sie die englische Version auf - die neuesten Änderungen.

Dieses Dokument umfaßt nur die Kompilierung und Installation des Apache auf Unix und Unix-ähnlichen Systemen. Für die @@ -368,14 +365,15 @@ seit Version 2.0.41 -- frühere Versionen enthielten noch inkompatible Änderungen).

-

Wenn Sie den Quellcode von Ihrer letzten Installation aufgehoben haben, - ist ein Upgrade sogar noch einfacher. Die Datei config.nice im - Wurzelverzeichnis des alten Quelltextbaums enthält den genauen - configure-Befehl, der verwendet wurde, um den Quellcode - zu konfigurieren. Um jetzt von einer Version auf die nächste zu - aktualisieren, kopieren Sie einfach die config.nice in das - Verzeichnis der neuen Version, passen sie bei Bedarf an, und - führen Sie sie aus:

+

Um auf eine neue Unterversion zu aktualisieren, suchen Sie zunächst + die Datei config.nice im build-Verzeichnis + Ihrer Serverinstallation oder im Wurzelverzeichnis des Quelltextbaums + der alten Installation. Die Datei enthält den genauen + configure-Befehl, der verwendet wurde, um den + Quellcode zu konfigurieren. Um jetzt von einer Version auf die + nächste zu aktualisieren, kopieren Sie einfach die + config.nice in das Verzeichnis der neuen Version, + passen sie bei Bedarf an, und führen Sie sie aus:

$ ./config.nice
diff --git a/docs/manual/install.xml.de b/docs/manual/install.xml.de index 372c54a2f87..9aec9da9dfa 100644 --- a/docs/manual/install.xml.de +++ b/docs/manual/install.xml.de @@ -1,7 +1,7 @@ - + + +