You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mt...@apache.org on 2005/04/09 09:32:43 UTC
svn commit: r160663 - httpd/httpd/trunk/modules/proxy/proxy_util.c
Author: mturk
Date: Sat Apr 9 00:32:42 2005
New Revision: 160663
URL: http://svn.apache.org/viewcvs?view=rev&rev=160663
Log:
Add r->args to uri->query if the original r->uri
did not contain query string. This fixes #34266.
Modified:
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/proxy_util.c?view=diff&r1=160662&r2=160663
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Sat Apr 9 00:32:42 2005
@@ -1757,7 +1757,9 @@
if (!uri->port) {
uri->port = apr_uri_port_of_scheme(uri->scheme);
}
-
+ if (!uri->query) {
+ uri->query = r->args;
+ }
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"proxy: connecting %s to %s:%d", *url, uri->hostname,
uri->port);
Re: svn commit: r160663 - httpd/httpd/trunk/modules/proxy/proxy_util.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
On Apr 9, 2005, at 3:32 AM, mturk@apache.org wrote:
> Author: mturk
> Date: Sat Apr 9 00:32:42 2005
> New Revision: 160663
>
> URL: http://svn.apache.org/viewcvs?view=rev&rev=160663
> Log:
> Add r->args to uri->query if the original r->uri
> did not contain query string. This fixes #34266.
>
>
Hold on a sec... This is about that bug report sent out
yesterday (I didn't even know modproxy_dev was still
around! :) ), right?
I think the real fix is to extend the actual canonicalization(sp?)
code itself... I have an idea about how to do it.
Re: svn commit: r160663 - httpd/httpd/trunk/modules/proxy/proxy_util.c
Posted by Mladen Turk <mt...@apache.org>.
Sander Striker wrote:
>
> I'm not so sure this is goodness. The url passed into this function
> (ap_proxy_determine_connection) should be complete IIR the code correctly.
> Fixing up what is supposed to be the complete raised a flag for me.
>
Yes, the balancer was missing the canon_handler.
Mladen.
Re: svn commit: r160663 - httpd/httpd/trunk/modules/proxy/proxy_util.c
Posted by Sander Striker <st...@apache.org>.
mturk@apache.org wrote:
> Author: mturk
> Date: Sat Apr 9 00:32:42 2005
> New Revision: 160663
>
> URL: http://svn.apache.org/viewcvs?view=rev&rev=160663
> Log:
> Add r->args to uri->query if the original r->uri
> did not contain query string. This fixes #34266.
>
> Modified:
> httpd/httpd/trunk/modules/proxy/proxy_util.c
>
> Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
> URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/proxy_util.c?view=diff&r1=160662&r2=160663
> ==============================================================================
> --- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
> +++ httpd/httpd/trunk/modules/proxy/proxy_util.c Sat Apr 9 00:32:42 2005
> @@ -1757,7 +1757,9 @@
> if (!uri->port) {
> uri->port = apr_uri_port_of_scheme(uri->scheme);
> }
> -
> + if (!uri->query) {
> + uri->query = r->args;
> + }
> ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
> "proxy: connecting %s to %s:%d", *url, uri->hostname,
> uri->port);
I'm not so sure this is goodness. The url passed into this function
(ap_proxy_determine_connection) should be complete IIR the code correctly.
Fixing up what is supposed to be the complete raised a flag for me.
Sander
Re: svn commit: r160663 - httpd/httpd/trunk/modules/proxy/proxy_util.c
Posted by Jim Jagielski <ji...@jaguNET.com>.
On Apr 9, 2005, at 3:32 AM, mturk@apache.org wrote:
> Author: mturk
> Date: Sat Apr 9 00:32:42 2005
> New Revision: 160663
>
> URL: http://svn.apache.org/viewcvs?view=rev&rev=160663
> Log:
> Add r->args to uri->query if the original r->uri
> did not contain query string. This fixes #34266.
>
>
Hold on a sec... This is about that bug report sent out
yesterday (I didn't even know modproxy_dev was still
around! :) ), right?
I think the real fix is to extend the actual canonicalization(sp?)
code itself... I have an idea about how to do it.