Commit 847141bd authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent cc506447

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- 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>]


































STATUS



+0
−9



























Changes for STATUS: 0 added lines, 9 removed lines.



Original line number
Diff line number
Diff line







@@ -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


































modules/proxy/mod_proxy_balancer.c



+1
−3



























Changes for modules/proxy/mod_proxy_balancer.c: 1 added line, 3 removed lines.



Original line number
Diff line number
Diff line







@@ -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;









            }









        }