SOURCES: apache-branch.patch - rediff without missing files
glen
glen at pld-linux.org
Sun Dec 25 00:25:20 CET 2005
Author: glen Date: Sat Dec 24 23:25:20 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- rediff without missing files
---- Files affected:
SOURCES:
apache-branch.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/apache-branch.patch
diff -u SOURCES/apache-branch.patch:1.1 SOURCES/apache-branch.patch:1.2
--- SOURCES/apache-branch.patch:1.1 Thu Dec 22 00:29:10 2005
+++ SOURCES/apache-branch.patch Sun Dec 25 00:25:14 2005
@@ -1,17 +1,165 @@
-Index: os/win32/BaseAddr.ref
-===================================================================
---- os/win32/BaseAddr.ref (.../tags/2.2.0) (wersja 358411)
-+++ os/win32/BaseAddr.ref (.../branches/2.2.x) (wersja 358411)
-@@ -71,3 +71,5 @@
- mod_bucketeer.so 0x6FA60000 0x00010000
- mod_dumpio.so 0x6FA50000 0x00010000
- mod_echo.so 0x6FA40000 0x00010000
-+mod_authn_dbd.so 0x6FA30000 0x00010000
-+mod_dbd.so 0x6FA20000 0x00010000
-Index: InstallBin.dsp
-===================================================================
---- InstallBin.dsp (.../tags/2.2.0) (wersja 358411)
-+++ InstallBin.dsp (.../branches/2.2.x) (wersja 358411)
+diff -ur httpd-2.2.0/Apache.dsw httpd-2.2.0-branch/Apache.dsw
+--- httpd-2.2.0/Apache.dsw 2005-10-09 17:31:40.000000000 +0300
++++ httpd-2.2.0-branch/Apache.dsw 2005-12-22 04:02:47.000000000 +0200
+@@ -81,6 +81,9 @@
+ Project_Dep_Name mod_authn_anon
+ End Project Dependency
+ Begin Project Dependency
++ Project_Dep_Name mod_authn_dbd
++ End Project Dependency
++ Begin Project Dependency
+ Project_Dep_Name mod_authn_dbm
+ End Project Dependency
+ Begin Project Dependency
+@@ -126,6 +129,9 @@
+ Project_Dep_Name mod_dav_fs
+ End Project Dependency
+ Begin Project Dependency
++ Project_Dep_Name mod_dbd
++ End Project Dependency
++ Begin Project Dependency
+ Project_Dep_Name mod_dir
+ End Project Dependency
+ Begin Project Dependency
+@@ -747,6 +753,33 @@
+
+ ###############################################################################
+
++Project: "mod_authn_dbd"=.\modules\aaa\mod_authn_dbd.dsp - Package Owner=<4>
++
++Package=<5>
++{{{
++}}}
++
++Package=<4>
++{{{
++ Begin Project Dependency
++ Project_Dep_Name libapr
++ End Project Dependency
++ Begin Project Dependency
++ Project_Dep_Name libaprutil
++ End Project Dependency
++ Begin Project Dependency
++ Project_Dep_Name libhttpd
++ End Project Dependency
++ Begin Project Dependency
++ Project_Dep_Name mod_auth_basic
++ End Project Dependency
++ Begin Project Dependency
++ Project_Dep_Name mod_dbd
++ End Project Dependency
++}}}
++
++###############################################################################
++
+ Project: "mod_authn_dbm"=.\modules\aaa\mod_authn_dbm.dsp - Package Owner=<4>
+
+ Package=<5>
+@@ -1110,6 +1143,27 @@
+
+ ###############################################################################
+
++Project: "mod_dbd"=.\modules\database\mod_dbd.dsp - Package Owner=<4>
++
++Package=<5>
++{{{
++}}}
++
++Package=<4>
++{{{
++ Begin Project Dependency
++ Project_Dep_Name libapr
++ End Project Dependency
++ Begin Project Dependency
++ Project_Dep_Name libaprutil
++ End Project Dependency
++ Begin Project Dependency
++ Project_Dep_Name libhttpd
++ End Project Dependency
++}}}
++
++###############################################################################
++
+ Project: "mod_deflate"=.\modules\filters\mod_deflate.dsp - Package Owner=<4>
+
+ Package=<5>
+diff -ur httpd-2.2.0/BuildBin.dsp httpd-2.2.0-branch/BuildBin.dsp
+--- httpd-2.2.0/BuildBin.dsp 2005-04-09 09:07:58.000000000 +0300
++++ httpd-2.2.0-branch/BuildBin.dsp 2005-12-22 04:02:47.000000000 +0200
+@@ -33,15 +33,15 @@
+ # PROP BASE Intermediate_Dir ""
+ # PROP BASE Cmd_Line "NMAKE /f makefile.win"
+ # PROP BASE Rebuild_Opt "/a"
+-# PROP BASE Target_File "\Apache21\bin\httpd.exe"
++# PROP BASE Target_File "\Apache2\bin\httpd.exe"
+ # PROP BASE Bsc_Name ".\Browse\BuildBin.bsc"
+ # PROP BASE Target_Dir ""
+ # PROP Use_Debug_Libraries 0
+ # PROP Output_Dir ""
+ # PROP Intermediate_Dir ""
+-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache21" LONG=Release _tryssl _tryzlib _dummy"
++# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Release _tryssl _tryzlib _dummy"
+ # PROP Rebuild_Opt ""
+-# PROP Target_File "\Apache21\bin\httpd.exe"
++# PROP Target_File "\Apache2\bin\httpd.exe"
+ # PROP Bsc_Name ".\Browse\httpd.bsc"
+ # PROP Target_Dir ""
+
+@@ -52,15 +52,15 @@
+ # PROP BASE Intermediate_Dir ""
+ # PROP BASE Cmd_Line "NMAKE /f makefile.win"
+ # PROP BASE Rebuild_Opt "/a"
+-# PROP BASE Target_File "\Apache21\bin\httpd.exe"
++# PROP BASE Target_File "\Apache2\bin\httpd.exe"
+ # PROP BASE Bsc_Name ".\Browse\BuildBin.bsc"
+ # PROP BASE Target_Dir ""
+ # PROP Use_Debug_Libraries 1
+ # PROP Output_Dir ""
+ # PROP Intermediate_Dir ""
+-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache21" LONG=Debug _tryssl _tryzlib _dummy"
++# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" LONG=Debug _tryssl _tryzlib _dummy"
+ # PROP Rebuild_Opt ""
+-# PROP Target_File "\Apache21\bin\httpd.exe"
++# PROP Target_File "\Apache2\bin\httpd.exe"
+ # PROP Bsc_Name ".\Browse\httpd.bsc"
+ # PROP Target_Dir ""
+
+diff -ur httpd-2.2.0/CHANGES httpd-2.2.0-branch/CHANGES
+--- httpd-2.2.0/CHANGES 2005-11-29 10:00:39.000000000 +0200
++++ httpd-2.2.0-branch/CHANGES 2005-12-22 04:02:47.000000000 +0200
+@@ -1,4 +1,29 @@
+ -*- coding: utf-8 -*-
++Changes with Apache 2.2.1
++
++ *) Chunk filter: Fix chunk filter to create correct chunks in the case that
++ a flush bucket is surrounded by data buckets. [Ruediger Pluem]
++
++ *) SECURITY: CVE-2005-3352 (cve.mitre.org)
++ mod_imagemap: Escape untrusted referer header before outputting
++ in HTML to avoid potential cross-site scripting. Change also
++ made to ap_escape_html so we escape quotes. Reported by JPCERT.
++ [Mark Cox]
++
++ *) Fix syntax error in httpd.h with strict compilers. PR 38740.
++ [Per Olausson <pao darkheim.freeserve.co.uk>]
++
++ *) Preserve the Content-Length header for a proxied HEAD response.
++ PR 18757. [Greg Ames]
++
++ *) Fix recursive ErrorDocument handling. PR 36090.
++ [Chris Darroch <chrisd pearsoncmg.com>]
++
++ *) Don't hang on error return from post_read_request. PR37790 [Nick Kew]
++
++ *) Fix off-by-one error in proxy_balancer. PR37753
++ [Kazuhiro Osawa <ko yappo ne jp>]
++
+ Changes with Apache 2.2.0
+
+ *) mod_negotiation: Minor performance tweak by reusing already calculated
+diff -ur httpd-2.2.0/InstallBin.dsp httpd-2.2.0-branch/InstallBin.dsp
+--- httpd-2.2.0/InstallBin.dsp 2005-04-09 09:07:58.000000000 +0300
++++ httpd-2.2.0-branch/InstallBin.dsp 2005-12-22 04:02:45.000000000 +0200
@@ -33,15 +33,15 @@
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Cmd_Line "NMAKE /f InstallBin.mak"
@@ -50,191 +198,522 @@
# PROP Bsc_Name ""
# PROP Target_Dir ""
-Index: docs/conf/httpd-win.conf
-===================================================================
---- docs/conf/httpd-win.conf (.../tags/2.2.0) (wersja 358411)
-+++ docs/conf/httpd-win.conf (.../branches/2.2.x) (wersja 358411)
-@@ -161,6 +161,7 @@
- AllowOverride None
- Order deny,allow
- Deny from all
-+ Satisfy all
- </Directory>
+diff -ur httpd-2.2.0/LAYOUT httpd-2.2.0-branch/LAYOUT
+--- httpd-2.2.0/LAYOUT 2005-11-29 10:00:39.000000000 +0200
++++ httpd-2.2.0-branch/LAYOUT 2005-12-22 04:02:47.000000000 +0200
+@@ -163,11 +163,7 @@
- #
-@@ -391,12 +392,6 @@
- #
- #AddHandler cgi-script .cgi
+ experimental/ ...........
-- # For files that include their own HTTP headers:
-- #AddHandler send-as-is asis
+- leader/ .................
-
-- # For server-parsed imagemap files:
-- #AddHandler imap-file map
+- perchild/ ...............
-
- # For type maps (negotiated resources):
- #AddHandler type-map var
+- threadpool/ .............
++ event/ .................
-Index: docs/conf/extra/httpd-mpm.conf.in
-===================================================================
---- docs/conf/extra/httpd-mpm.conf.in (.../tags/2.2.0) (wersja 358411)
-+++ docs/conf/extra/httpd-mpm.conf.in (.../branches/2.2.x) (wersja 358411)
-@@ -57,14 +57,6 @@
- MaxRequestsPerChild 0
- </IfModule>
+ mpmt_os2/ ...............
--# WinNT MPM
--# ThreadsPerChild: constant number of worker threads in the server process
--# MaxRequestsPerChild: maximum number of requests a server process serves
--<IfModule mpm_winnt_module>
-- ThreadsPerChild 250
-- MaxRequestsPerChild 0
--</IfModule>
--
- # BeOS MPM
- # StartThreads: how many threads do we initially spawn?
- # MaxClients: max number of threads we can have (1 thread == 1 client)
-Index: docs/conf/httpd.conf.in
-===================================================================
---- docs/conf/httpd.conf.in (.../tags/2.2.0) (wersja 358411)
-+++ docs/conf/httpd.conf.in (.../branches/2.2.x) (wersja 358411)
-@@ -53,7 +53,6 @@
+diff -ur httpd-2.2.0/Makefile.win httpd-2.2.0-branch/Makefile.win
+--- httpd-2.2.0/Makefile.win 2005-09-21 18:14:35.000000000 +0300
++++ httpd-2.2.0-branch/Makefile.win 2005-12-22 04:02:47.000000000 +0200
+@@ -19,7 +19,7 @@
#
- @@LoadModule@@
-
--<IfModule !mpm_winnt_module>
- <IfModule !mpm_netware_module>
+ # For example;
#
- # If you wish httpd to run as a different user or group, you must run
-@@ -66,7 +65,6 @@
- User daemon
- Group daemon
- </IfModule>
--</IfModule>
-
- # 'Main' server configuration
+-# nmake /f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr
++# nmake -f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr
#
-@@ -173,6 +171,7 @@
- <FilesMatch "^\.ht">
- Order allow,deny
- Deny from all
-+ Satisfy All
- </FilesMatch>
+ # Be aware that certain awk's will not accept backslahed names,
+ # so the server root should be given in forward slashes (quoted),
+@@ -33,10 +33,10 @@
- #
-@@ -316,12 +315,6 @@
- #
- #AddHandler cgi-script .cgi
+ !IF !EXIST("srclib\apr") || !EXIST("srclib\apr-util") || !EXIST("srclib\apr-iconv")
+ !MESSAGE Please check out or download and unpack the Apache Portability Runtime
+-!MESSAGE sources (apr, apr-iconv and apr-util) into your $(INSTDIR)\srclib dir.
++!MESSAGE sources (apr, apr-iconv and apr-util) into your srclib dir.
+ !MESSAGE Apache cannot build without these libraries!
+ !MESSAGE
+-!ERROR Need $(INSTDIR)\srclib\ apr, apr-iconv and apr-util
++!ERROR Need srclib\ apr, apr-iconv and apr-util
+ !ENDIF
-- # For files that include their own HTTP headers:
-- #AddHandler send-as-is asis
--
-- # For server-parsed imagemap files:
-- #AddHandler imap-file map
--
- # For type maps (negotiated resources):
- #AddHandler type-map var
+ # Note; _tryssl: is only used by the msvc developer studio environment to 'fix up'
+@@ -119,18 +119,18 @@
+ !MESSAGE SERVERNAME = $(SERVERNAME)
+ !MESSAGE PORT = $(PORT)
+ !MESSAGE
+-!MESSAGE To change these options use 'nmake /f Makefile.win [option=value]'
+-!MESSAGE Example: nmake /f Makefile.win PORT=8080
++!MESSAGE To change these options use 'nmake -f Makefile.win [option=value]'
++!MESSAGE Example: nmake -f Makefile.win PORT=8080
+ !MESSAGE
+ !MESSAGE
+ !ENDIF
-Index: docs/docroot/apache_pb2_ani.gif
-===================================================================
-Nie moşna wyświetlić: plik binarny.
-svn:mime-type = image/gif
-Index: docs/docroot/apache_pb2.png
-===================================================================
-Nie moşna wyświetlić: plik binarny.
-svn:mime-type = image/png
-Index: docs/docroot/apache_pb2.gif
-===================================================================
-Nie moşna wyświetlić: plik binarny.
-svn:mime-type = image/gif
-Index: docs/docroot/apache_pb22_ani.gif
-===================================================================
-Nie moşna wyświetlić: plik binarny.
-svn:mime-type = image/gif
-
-Zmiany atrybutĂłw dla: docs/docroot/apache_pb22_ani.gif
-___________________________________________________________________
-Nazwa: svn:mime-type
- + image/gif
-
-Index: docs/docroot/apache_pb22.png
-===================================================================
-Nie moşna wyświetlić: plik binarny.
-svn:mime-type = image/png
-
-Zmiany atrybutĂłw dla: docs/docroot/apache_pb22.png
-___________________________________________________________________
-Nazwa: svn:mime-type
- + image/png
-
-Index: docs/docroot/apache_pb22.gif
-===================================================================
-Nie moşna wyświetlić: plik binarny.
-svn:mime-type = image/gif
-
-Zmiany atrybutĂłw dla: docs/docroot/apache_pb22.gif
-___________________________________________________________________
-Nazwa: svn:mime-type
- + image/gif
-
-Index: docs/manual/stopping.html.ja.euc-jp
-===================================================================
---- docs/manual/stopping.html.ja.euc-jp (.../tags/2.2.0) (wersja 358411)
-+++ docs/manual/stopping.html.ja.euc-jp (.../branches/2.2.x) (wersja 358411)
-@@ -16,7 +16,7 @@
- <img alt="" src="./images/feather.gif" /></div>
- <div class="up"><a href="./"><img title="<-" alt="<-" src="./images/left.gif" /></a></div>
- <div id="path">
--<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP ĽľĄźĽĐ</a> > <a href="http://httpd.apache.org/docs-project/">ĽÉĽĽĺĽáĽóĽĆĄźĽˇĽçĽó</a> > <a href="./">ĽĐĄźĽ¸ĽçĽó 2.2</a></div><div id="page-content"><div id="preamble"><h1>Ääťß¤ČşĆľŻĆ°</h1>
-+<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP ĽľĄźĽĐ</a> > <a href="http://httpd.apache.org/docs/">ĽÉĽĽĺĽáĽóĽĆĄźĽˇĽçĽó</a> > <a href="./">ĽĐĄźĽ¸ĽçĽó 2.2</a></div><div id="page-content"><div id="preamble"><h1>Ääťß¤ČşĆľŻĆ°</h1>
- <div class="toplang">
- <p><span>Available Languages: </span><a href="./de/stopping.html" hreflang="de" rel="alternate" title="Deutsch"> de </a> |
- <a href="./en/stopping.html" hreflang="en" rel="alternate" title="English"> en </a> |
-Index: docs/manual/invoking.html.ko.euc-kr
-===================================================================
---- docs/manual/invoking.html.ko.euc-kr (.../tags/2.2.0) (wersja 358411)
-+++ docs/manual/invoking.html.ko.euc-kr (.../branches/2.2.x) (wersja 358411)
+ !IFNDEF MAKEOPT
+ # Only default the behavior if MAKEOPT= is omitted
+-!IF "$(MAKE)" == "NMAKE"
++!IFDEF _NMAKE_VER
+ # Microsoft NMake options
+ MAKEOPT=-nologo
+-!ELSEIF "($MAKE)" == "make"
++!ELSEIF "$(MAKE)" == "make"
+ # Borland make options? Not really supported (yet)
+ MAKEOPT=-s -N
+ !ENDIF
+@@ -178,14 +178,14 @@
+ $(MAKE) $(MAKEOPT) -f apriconv.mak CFG="apriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f libapriconv.mak CFG="libapriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ !IF "$(CTARGET)" == "CLEAN"
+- $(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \
++ $(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
+ BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=.
+ !ELSE
+ cd ccs
+- $(MAKE) /nologo /f Makefile.win all \
++ $(MAKE) $(MAKEOPT) -f Makefile.win all \
+ BUILD_MODE=$(LONG) BIND_MODE=shared
+ cd ..\ces
+- $(MAKE) /nologo /f Makefile.win all \
++ $(MAKE) $(MAKEOPT) -f Makefile.win all \
+ BUILD_MODE=$(LONG) BIND_MODE=shared
+ cd ..
+ !ENDIF
+@@ -216,6 +216,7 @@
+ $(MAKE) $(MAKEOPT) -f mod_auth_basic.mak CFG="mod_auth_basic - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_auth_digest.mak CFG="mod_auth_digest - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_authn_anon.mak CFG="mod_authn_anon - Win32 $(LONG)" RECURSE=0 $(CTARGET)
++ $(MAKE) $(MAKEOPT) -f mod_authn_dbd.mak CFG="mod_authn_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_authn_dbm.mak CFG="mod_authn_dbm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_authn_default.mak CFG="mod_authn_default - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_authn_file.mak CFG="mod_authn_file - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+@@ -235,6 +236,9 @@
+ $(MAKE) $(MAKEOPT) -f mod_mem_cache.mak CFG="mod_mem_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_disk_cache.mak CFG="mod_disk_cache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..
++ cd modules\database
++ $(MAKE) $(MAKEOPT) -f mod_dbd.mak CFG="mod_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
++ cd ..\..
+ cd modules\dav\main
+ $(MAKE) $(MAKEOPT) -f mod_dav.mak CFG="mod_dav - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..\..
+@@ -246,9 +250,9 @@
+ $(MAKE) $(MAKEOPT) -f mod_dumpio.mak CFG="mod_dumpio - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..
+ cd modules\experimental
+- $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..
+ cd modules\filters
++ $(MAKE) $(MAKEOPT) -f mod_charset_lite.mak CFG="mod_charset_lite - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ !IF EXIST("srclib\zlib")
+ $(MAKE) $(MAKEOPT) -f mod_deflate.mak CFG="mod_deflate - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ !ENDIF
+@@ -356,7 +360,7 @@
+ "BuildBin - Win32 $(LONG)" $(CTARGET)
+ !IF "$(CTARGET)" == "/CLEAN"
+ @cd srclib\apr-iconv
+- @$(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \
++ @$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \
+ BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=.
+ @cd ..\..
+ !ENDIF
+@@ -382,6 +386,7 @@
+ copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) "$(inst_so)" <.y
+ copy modules\aaa\$(LONG)\mod_auth_digest.$(src_so) "$(inst_so)" <.y
+ copy modules\aaa\$(LONG)\mod_authn_anon.$(src_so) "$(inst_so)" <.y
++ copy modules\aaa\$(LONG)\mod_authn_dbd.$(src_so) "$(inst_so)" <.y
+ copy modules\aaa\$(LONG)\mod_authn_dbm.$(src_so) "$(inst_so)" <.y
+ copy modules\aaa\$(LONG)\mod_authn_default.$(src_so) "$(inst_so)" <.y
+ copy modules\aaa\$(LONG)\mod_authn_file.$(src_so) "$(inst_so)" <.y
+@@ -396,11 +401,12 @@
+ copy modules\cache\$(LONG)\mod_file_cache.$(src_so) "$(inst_so)" <.y
+ copy modules\cache\$(LONG)\mod_mem_cache.$(src_so) "$(inst_so)" <.y
+ copy modules\cache\$(LONG)\mod_disk_cache.$(src_so) "$(inst_so)" <.y
++ copy modules\database\$(LONG)\mod_dbd.$(src_so) "$(inst_so)" <.y
+ copy modules\dav\fs\$(LONG)\mod_dav_fs.$(src_so) "$(inst_so)" <.y
+ copy modules\dav\main\$(LONG)\mod_dav.$(src_so) "$(inst_so)" <.y
+ copy modules\debug\$(LONG)\mod_bucketeer.$(src_so) "$(inst_so)" <.y
+ copy modules\debug\$(LONG)\mod_dumpio.$(src_so) "$(inst_so)" <.y
+- copy modules\experimental\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
++ copy modules\filters\$(LONG)\mod_charset_lite.$(src_so) "$(inst_so)" <.y
+ !IF EXIST("srclib\zlib")
+ copy modules\filters\$(LONG)\mod_deflate.$(src_so) "$(inst_so)" <.y
+ !IF EXIST("srclib\zlib\zlib1.$(src_dll)")
+diff -ur httpd-2.2.0/README httpd-2.2.0-branch/README
+--- httpd-2.2.0/README 2005-11-29 10:00:39.000000000 +0200
++++ httpd-2.2.0-branch/README 2005-12-22 04:02:47.000000000 +0200
+@@ -16,15 +16,15 @@
+ ------------------
+
+ Details of the latest version can be found on the Apache HTTP
+- server project page under http://httpd.apache.org/.
++ server project page under <http://httpd.apache.org/>.
+
+ Documentation
+ -------------
+
+ 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.2/.
++ up-to-date documentation for the 2.2.x releases can be found at
++ <http://httpd.apache.org/docs-2.2/>.
+
+ Installation
+ ------------
+@@ -43,28 +43,28 @@
+ o If you want to be informed about new code releases, bug fixes,
+ security fixes, general news and information about the Apache server
+ subscribe to the apache-announce mailing list as described under
+- http://httpd.apache.org/lists.html#http-announce
++ <http://httpd.apache.org/lists.html#http-announce>
+
+ o If you want freely available support for running Apache please join the
+ Apache user community by subscribing to Users Mailing List at
+- http://httpd.apache.org/userslist.html or one of the following USENET
+- newsgroups:
+- comp.infosystems.www.servers.unix
+- comp.infosystems.www.servers.ms-windows
++ <http://httpd.apache.org/userslist.html> or one of the following
++ USENET newsgroups:
++ comp.infosystems.www.servers.unix
++ comp.infosystems.www.servers.ms-windows
+ Also available at:
+- http://groups.google.com/groups?group=comp.infosystems.www.servers
++ <http://groups.google.com/groups?group=comp.infosystems.www.servers>
+
+ o If you want commercial support for running Apache please contact
+ one of the companies and contractors which are listed at
+- http://www.apache.org/info/support.cgi
++ <http://www.apache.org/info/support.cgi>
+
+ o If you have a concrete bug report for Apache please go to the
+ Apache Group Bug Database and submit your report:
+- http://httpd.apache.org/bug_report.html
++ <http://httpd.apache.org/bug_report.html>
+
+ o If you want to participate in actively developing Apache please
+ subscribe to the `dev at httpd.apache.org' mailing list as described at
+- http://www.apache.org/lists.html#http-dev
++ <http://httpd.apache.org/lists.html#http-dev>
+
+ Acknowledgments
+ ----------------
+diff -ur httpd-2.2.0/docs/conf/extra/httpd-mpm.conf.in httpd-2.2.0-branch/docs/conf/extra/httpd-mpm.conf.in
+--- httpd-2.2.0/docs/conf/extra/httpd-mpm.conf.in 2005-11-20 06:44:18.000000000 +0200
++++ httpd-2.2.0-branch/docs/conf/extra/httpd-mpm.conf.in 2005-12-22 04:02:45.000000000 +0200
+@@ -57,14 +57,6 @@
+ MaxRequestsPerChild 0
+ </IfModule>
+
+-# WinNT MPM
+-# ThreadsPerChild: constant number of worker threads in the server process
+-# MaxRequestsPerChild: maximum number of requests a server process serves
+-<IfModule mpm_winnt_module>
+- ThreadsPerChild 250
+- MaxRequestsPerChild 0
+-</IfModule>
+-
+ # BeOS MPM
+ # StartThreads: how many threads do we initially spawn?
+ # MaxClients: max number of threads we can have (1 thread == 1 client)
+diff -ur httpd-2.2.0/docs/conf/httpd-win.conf httpd-2.2.0-branch/docs/conf/httpd-win.conf
+--- httpd-2.2.0/docs/conf/httpd-win.conf 2005-11-13 19:17:31.000000000 +0200
++++ httpd-2.2.0-branch/docs/conf/httpd-win.conf 2005-12-22 04:02:45.000000000 +0200
+@@ -161,6 +161,7 @@
+ AllowOverride None
+ Order deny,allow
+ Deny from all
++ Satisfy all
+ </Directory>
+
+ #
+@@ -391,12 +392,6 @@
+ #
+ #AddHandler cgi-script .cgi
+
+- # For files that include their own HTTP headers:
+- #AddHandler send-as-is asis
+-
+- # For server-parsed imagemap files:
+- #AddHandler imap-file map
+-
+ # For type maps (negotiated resources):
+ #AddHandler type-map var
+
+diff -ur httpd-2.2.0/docs/conf/httpd.conf.in httpd-2.2.0-branch/docs/conf/httpd.conf.in
+--- httpd-2.2.0/docs/conf/httpd.conf.in 2005-11-13 19:17:31.000000000 +0200
++++ httpd-2.2.0-branch/docs/conf/httpd.conf.in 2005-12-22 04:02:45.000000000 +0200
+@@ -53,7 +53,6 @@
+ #
+ @@LoadModule@@
+
+-<IfModule !mpm_winnt_module>
+ <IfModule !mpm_netware_module>
+ #
+ # If you wish httpd to run as a different user or group, you must run
+@@ -66,7 +65,6 @@
+ User daemon
+ Group daemon
+ </IfModule>
+-</IfModule>
+
+ # 'Main' server configuration
+ #
+@@ -173,6 +171,7 @@
+ <FilesMatch "^\.ht">
+ Order allow,deny
+ Deny from all
++ Satisfy All
+ </FilesMatch>
+
+ #
+@@ -316,12 +315,6 @@
+ #
+ #AddHandler cgi-script .cgi
+
+- # For files that include their own HTTP headers:
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/apache-branch.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list