- new from 2.2 branch

[packages/apache.git] / apache-branch.patch

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)
@@ -33,15 +33,15 @@
 # PROP BASE Intermediate_Dir "Release"
 # PROP BASE Cmd_Line "NMAKE /f InstallBin.mak"
 # 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 "InstallBin.bsc"
 # PROP BASE Target_Dir ""
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir "Release"
 # PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache21" SHORT=R LONG=Release _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" SHORT=R LONG=Release _install"
 # 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 "Debug"
 # PROP BASE Cmd_Line "NMAKE /f InstallBin.mak"
 # 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 "InstallBin.bsc"
 # PROP BASE Target_Dir ""
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache21" SHORT=D LONG=Debug _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2" SHORT=D LONG=Debug _install"
 # PROP Rebuild_Opt ""
-# PROP Target_File "\Apache21\bin\httpd.exe"
+# PROP Target_File "\Apache2\bin\httpd.exe"
 # 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>
 
 #
@@ -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
 
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>
 
-# 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 @@
 #
 @@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:
-    #AddHandler send-as-is asis
-
-    # For server-parsed imagemap files:
-    #AddHandler imap-file map
-
     # For type maps (negotiated resources):
     #AddHandler type-map var
 
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="&lt;-" alt="&lt;-" src="./images/left.gif" /></a></div>
 <div id="path">