chrisd | 2 Dec 07:25 2006
Picon

svn commit: r481509 - in /httpd/httpd/trunk: CHANGES modules/database/mod_dbd.c

Author: chrisd
Date: Fri Dec  1 22:25:07 2006
New Revision: 481509

URL: http://svn.apache.org/viewvc?view=rev&rev=481509
Log:
Stash DBD connections in request_config of initial request
only, or else sub-requests and internal redirections may cause
entire DBD pool to be stashed in a single HTTP request.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/database/mod_dbd.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?view=diff&rev=481509&r1=481508&r2=481509
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Dec  1 22:25:07 2006
 <at>  <at>  -2,6 +2,10  <at>  <at> 
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]

+  *) mod_dbd: Stash DBD connections in request_config of initial request
+     only, or else sub-requests and internal redirections may cause
+     entire DBD pool to be stashed in a single HTTP request.  [Chris Darroch]
+
   *) mod_cache: Correctly cache objects whose URL query string has been
      modified by mod_rewrite. PR 40805. [Ruediger Pluem]

(Continue reading)

rpluem | 3 Dec 21:51 2006
Picon

svn commit: r481886 - in /httpd/httpd/trunk: CHANGES modules/cache/cache_storage.c

Author: rpluem
Date: Sun Dec  3 12:51:13 2006
New Revision: 481886

URL: http://svn.apache.org/viewvc?view=rev&rev=481886
Log:
* Remove expired content from cache that cannot be revalidated.

PR: 30370

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/cache/cache_storage.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?view=diff&rev=481886&r1=481885&r2=481886
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Dec  3 12:51:13 2006
 <at>  <at>  -2,6 +2,9  <at>  <at> 
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]

+  *) mod_cache: Remove expired content from cache that cannot be revalidated.
+     PR 30370. [Ruediger Pluem]
+
   *) mod_dbd: Stash DBD connections in request_config of initial request
      only, or else sub-requests and internal redirections may cause
      entire DBD pool to be stashed in a single HTTP request.  [Chris Darroch]

(Continue reading)

rpluem | 3 Dec 22:24 2006
Picon

svn commit: r481901 - in /httpd/httpd/trunk: CHANGES modules/proxy/proxy_util.c

Author: rpluem
Date: Sun Dec  3 13:24:43 2006
New Revision: 481901

URL: http://svn.apache.org/viewvc?view=rev&rev=481901
Log:
* Ensure that at least scheme://hostname[:port] matches between worker and URL
  when trying to find the worker that fits best to the given URL.

PR: 40910

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/proxy/proxy_util.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?view=diff&rev=481901&r1=481900&r2=481901
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Dec  3 13:24:43 2006
 <at>  <at>  -2,6 +2,10  <at>  <at> 
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]

+  *) mod_proxy: Ensure that at least scheme://hostname[:port] matches between
+     worker and URL when searching for the best fitting worker for a given URL.
+     PR 40910. [Ruediger Pluem]
+
   *) mod_cache: Remove expired content from cache that cannot be revalidated.
      PR 30370. [Ruediger Pluem]
(Continue reading)

trawick | 4 Dec 15:22 2006
Picon

svn commit: r482184 - /httpd/httpd/branches/2.2.x/STATUS

Author: trawick
Date: Mon Dec  4 06:22:40 2006
New Revision: 482184

URL: http://svn.apache.org/viewvc?view=rev&rev=482184
Log:
logging-related patches

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=482184&r1=482183&r2=482184
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Dec  4 06:22:40 2006
 <at>  <at>  -189,7 +189,7  <at>  <at> 
         http://svn.apache.org/viewvc?view=rev&rev=452431
       2.2.x version of patch:
         Trunk version works
-      +1: rpluem
+      +1: rpluem, trawick

     * mod_authnz_ldap: Add an AuthLDAPRemoteUserAttribute directive. If
       set, REMOTE_USER will be set to this attribute, rather than the
 <at>  <at>  -255,3 +255,12  <at>  <at> 
        Trunk version works (requires handling of CHANGES and ap_mmn.h
        conflict though)
      +1: jim
+
(Continue reading)

wrowe | 7 Dec 18:01 2006
Picon

svn commit: r483547 - /httpd/httpd/branches/2.2.x/STATUS

Author: wrowe
Date: Thu Dec  7 09:01:50 2006
New Revision: 483547

URL: http://svn.apache.org/viewvc?view=rev&rev=483547
Log:

  Mostly acks, a couple naks and a Q or two

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=483547&r1=483546&r2=483547
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Dec  7 09:01:50 2006
 <at>  <at>  -85,7 +85,7  <at>  <at> 
         http://svn.apache.org/viewvc?view=rev&revision=428029
       2.2.x version of patch:
         Trunk version works
-      +1: mturk
+      +1: mturk, wrowe

     * Bundled PCRE: backport r381783 from trunk
       Fix brokenness on certain platforms when building with -DDEBUG.
 <at>  <at>  -98,10 +98,13  <at>  <at> 
       jerenkrantz: I don't believe that's a valid reason to block this.
                    We're bundling PCRE for the duration of the 2.2.x series,
                    but we can re-evaluate for future major/minor revs.
(Continue reading)

wrowe | 7 Dec 18:09 2006
Picon

svn commit: r483553 - in /httpd/httpd/branches/2.2.x: Makefile.win server/mpm/winnt/mpm_winnt.h

Author: wrowe
Date: Thu Dec  7 09:09:37 2006
New Revision: 483553

URL: http://svn.apache.org/viewvc?view=rev&rev=483553
Log:
Fix two flaws that make parallel testing of Apache2 (.0, .2, .x) very difficult,
change the default dir for command-line make to \Apache22 on Windows, and change
the service name to Apache2.2 by default (this *matches* the windows installer.)

Resolves recent bug reports and confusion.

Modified:
    httpd/httpd/branches/2.2.x/Makefile.win
    httpd/httpd/branches/2.2.x/server/mpm/winnt/mpm_winnt.h

Modified: httpd/httpd/branches/2.2.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/Makefile.win?view=diff&rev=483553&r1=483552&r2=483553
==============================================================================
--- httpd/httpd/branches/2.2.x/Makefile.win (original)
+++ httpd/httpd/branches/2.2.x/Makefile.win Thu Dec  7 09:09:37 2006
 <at>  <at>  -13,7 +13,7  <at>  <at> 
 # The following install defaults may be customized;
 #
 #   Option      Default
-#   INSTDIR     \Apache2
+#   INSTDIR     \Apache22
 #   PORT        80
 #   SSLPORT     443
 #   SERVERNAME  localhost
(Continue reading)

wrowe | 7 Dec 18:11 2006
Picon

svn commit: r483555 - in /httpd/httpd/trunk: Makefile.win server/mpm/winnt/mpm_winnt.h

Author: wrowe
Date: Thu Dec  7 09:11:51 2006
New Revision: 483555

URL: http://svn.apache.org/viewvc?view=rev&rev=483555
Log:
Similar change to r483553 to help developers work in parallel on win32, install
default command-line build to \Apache2x directory, and name service Apache2.x
(which means this doesn't need to change over and over as trunk becomes 2.5, 2.7 etc.)

Modified:
    httpd/httpd/trunk/Makefile.win
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.h

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?view=diff&rev=483555&r1=483554&r2=483555
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Thu Dec  7 09:11:51 2006
 <at>  <at>  -13,7 +13,7  <at>  <at> 
 # The following install defaults may be customized;
 #
 #   Option      Default
-#   INSTDIR     \Apache2
+#   INSTDIR     \Apache23
 #   PORT        80
 #   SSLPORT     443
 #   SERVERNAME  localhost
 <at>  <at>  -105,7 +105,7  <at>  <at> 
 !ENDIF
(Continue reading)

wrowe | 7 Dec 18:47 2006
Picon

svn commit: r483567 - /httpd/httpd/trunk/InstallBin.dsp

Author: wrowe
Date: Thu Dec  7 09:47:43 2006
New Revision: 483567

URL: http://svn.apache.org/viewvc?view=rev&rev=483567
Log:
Mirror r483555, for GUI environment.  Reason for the duplication is to make
enabling of the debugger much more trivial.

Modified:
    httpd/httpd/trunk/InstallBin.dsp

Modified: httpd/httpd/trunk/InstallBin.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/InstallBin.dsp?view=diff&rev=483567&r1=483566&r2=483567
==============================================================================
--- httpd/httpd/trunk/InstallBin.dsp (original)
+++ httpd/httpd/trunk/InstallBin.dsp Thu Dec  7 09:47:43 2006
 <at>  <at>  -33,15 +33,15  <at>  <at> 
 # PROP BASE Intermediate_Dir "Release"
 # PROP BASE Cmd_Line "NMAKE /f InstallBin.mak"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "\Apache2\bin\httpd.exe"
+# PROP BASE Target_File "\Apache2x\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="\Apache2" SHORT=R LONG=Release _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2x" SHORT=R LONG=Release _install"
(Continue reading)

wrowe | 7 Dec 18:49 2006
Picon

svn commit: r483568 - /httpd/httpd/branches/2.2.x/InstallBin.dsp

Author: wrowe
Date: Thu Dec  7 09:49:18 2006
New Revision: 483568

URL: http://svn.apache.org/viewvc?view=rev&rev=483568
Log:
Mirror r483553 for the GUI environment on win32.  Duplication is to assist users
in debugging the installed Apache server.

Modified:
    httpd/httpd/branches/2.2.x/InstallBin.dsp

Modified: httpd/httpd/branches/2.2.x/InstallBin.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/InstallBin.dsp?view=diff&rev=483568&r1=483567&r2=483568
==============================================================================
--- httpd/httpd/branches/2.2.x/InstallBin.dsp (original)
+++ httpd/httpd/branches/2.2.x/InstallBin.dsp Thu Dec  7 09:49:18 2006
 <at>  <at>  -33,15 +33,15  <at>  <at> 
 # PROP BASE Intermediate_Dir "Release"
 # PROP BASE Cmd_Line "NMAKE /f InstallBin.mak"
 # PROP BASE Rebuild_Opt "/a"
-# PROP BASE Target_File "\Apache2\bin\httpd.exe"
+# PROP BASE Target_File "\Apache22\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="\Apache2" SHORT=R LONG=Release _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache22" SHORT=R LONG=Release _install"
(Continue reading)

rpluem | 7 Dec 19:38 2006
Picon

svn commit: r483599 - /httpd/httpd/branches/2.2.x/STATUS

Author: rpluem
Date: Thu Dec  7 10:38:04 2006
New Revision: 483599

URL: http://svn.apache.org/viewvc?view=rev&rev=483599
Log:
* Add a comment

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=483599&r1=483598&r2=483599
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Dec  7 10:38:04 2006
 <at>  <at>  -152,6 +152,11  <at>  <at> 
       +1: rpluem, niq
       wrowe notes: I can't vote on this, nor can most; if you mean to propose
       backporting trunk/ to branches/2.2 for mod_deflate, I'd back that.
+      rpluem: I am slightly confused now. What do you propose exactly?
+              Take the existing mod_deflate.c from trunk and move it over
+              to branches/2.2? This would be exactly the same as applying my
+              patches as mod_deflate.c of branches/2.2 will be the same as
+              mod_deflate.c of the trunk (r483597) after applying the patches.

     * Allow htcacheclean and httxt2dbm to link apr/apr-util statically
       like the older support programs.

(Continue reading)


Gmane