httpd-cvs mailing list archives

Author: jim
Date: Tue Nov  7 05:29:57 2006
New Revision: 472100

URL: http://svn.apache.org/viewvc?view=rev&rev=472100
Log:
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

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=472100&r1=472099&r2=472100
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Nov  7 05:29:57 2006
@@ -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>]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=472100&r1=472099&r2=472100
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Nov  7 05:29:57 2006
@@ -77,15 +77,6 @@
 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

Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c?view=diff&rev=472100&r1=472099&r2=472100
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c Tue Nov  7 05:29:57 2006
@@ -122,9 +122,7 @@
             ++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;
             }
         }