Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1669756 - /httpd/httpd/branches/2.4.x/STATUS
Date: Sat, 28 Mar 2015 12:31:36 -0000
To: cvs@httpd.apache.org
From: ylavic@apache.org
Message-Id: <20150328123136.75A9FAC006E@hades.apache.org>

Author: ylavic
Date: Sat Mar 28 12:31:35 2015
New Revision: 1669756

URL: http://svn.apache.org/r1669756
Log:
Fix ap_proxy_define_match_worker() proposal.

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1669756&r1=1669755&r2=1669756&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Mar 28 12:31:35 2015
@@ -116,10 +116,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      in ap_proxy_get_worker(). Fixes the bug when regex workers were not
      matched and used for request. PR 43513.
      trunk patch: http://svn.apache.org/r1609680
+                  http://svn.apache.org/r1609688
                   http://svn.apache.org/r1641381
-     2.4.x patch: trunk works
-     +1: jkaluza, ylavic
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-ap_proxy_define_match_worker.patch
+     +1: ylavic
      -1: jim (does not cleanly apply)
+     ylavic: Merge patch provided (reusing new->real to avoid double de_socketfy() call).
+             Also added missing r1609688 to the patchset.
 
    * mod_buffer: Forward flushed input data immediately and avoid (unlikely)
                  access to freed memory.