From: Jim Jagielski <jim@apache.org>
Date: Tue, 7 Nov 2006 13:29:57 +0000 (+0000)
Subject: Merge r440160 from trunk:
X-Git-Tag: 2.2.4~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50d9361c08de43fb1bd1408d5e754f7259dd2ce7;p=thirdparty%2Fapache%2Fhttpd.git

Merge r440160 from trunk:

* Extract stickysession information correctly in the case that it is given
  as parameter like in the following example:

  www.someplace.com/somewhere/?jsessionid=gggfgdufdfoef.server&parameter=value

  So far we were only able to handle stickysession information encoded in the
  following form:

  www.someplace.com/somewhere/;jsessionid=gggfgdufdfoef.server?parameter=value

PR: 40400

Submitted by: rpluem
Reviewed by: jim


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

diff --git a/CHANGES b/CHANGES
index 28b8ce21860..e6acc658350 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.4
 
+  *) mod_proxy_balancer: Extract stickysession routing information contained as
+     parameter in the URL correctly. PR 40400.
+     [Ruediger Pluem, Tomokazu Harada <harada sysrdc.ns-sol.co.jp>]
+
   *) mod_disk_cache: Make sure that only positive integers are accepted
      for the CacheMaxFileSize and CacheMinFileSize parameters in the
      config file. PR39380 [Niklas Edmundsson <nikke acc.umu.se>]
diff --git a/STATUS b/STATUS
index 78d5a6784fd..d06bba472c1 100644
--- a/STATUS
+++ b/STATUS
@@ -77,15 +77,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_proxy_balancer: Extract stickysession routing information contained as
-      parameter in the URL correctly.
-        PR: 40400
-      Trunk version of patch:
-        http://svn.apache.org/viewvc?view=rev&rev=440160
-      2.2.x version of patch:
-        Trunk version works
-      +1: rpluem, jim, mturk
-
   * mod_proxy: Don't try to use dead backend connection in proxy
      http://svn.apache.org/viewvc?view=rev&revision=431339
      PR#37770.  Patch by Olivier Boel
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 32cbe4e4f16..c4e33079011 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -122,9 +122,7 @@ static char *get_path_param(apr_pool_t *pool, char *url,
             ++path;
             if (strlen(path)) {
                 char *q;
-                path = apr_pstrdup(pool, path);
-                if ((q = strchr(path, '?')))
-                    *q = '\0';
+                path = apr_strtok(apr_pstrdup(pool, path), "?&", &q);
                 return path;
             }
         }