From: Yann Ylavic <ylavic@apache.org>
Date: Sat, 28 Mar 2015 12:31:35 +0000 (+0000)
Subject: Fix ap_proxy_define_match_worker() proposal.
X-Git-Tag: 2.4.13~306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f5c984e992636d0ee7ea6b70eb5ef629543bb21;p=thirdparty%2Fapache%2Fhttpd.git

Fix ap_proxy_define_match_worker() proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1669756 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index bbe84d43dde..9852c050cb7 100644
--- a/STATUS
+++ b/STATUS
@@ -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.