[PATCH] proxy_http.c

From: <barbee(at)veribox.net>
Date: Wed Aug 15 2001 - 15:39:13 EDT

fix bug introduced by my cleanup patch (sorry). we modify the url var, so pass char ** the change is still there when we go out of scope.

barbee.

Index: modules/proxy/proxy_http.c

---

RCS file: /home/cvspublic/httpd-proxy/module-2.0/proxy_http.c,v retrieving revision 1.88
diff -u -r1.88 proxy_http.c
--- modules/proxy/proxy_http.c 2001/08/14 18:04:58 1.88 +++ modules/proxy/proxy_http.c 2001/08/15 17:56:36
@@ -191,7 +191,7 @@

                                                 conn_rec *c,
                                                 proxy_server_conf
*conf,
                                                 apr_uri_components
*uri,
-                                                char *url,
+                                                char **url,
                                                 const char *proxyname,
apr_port_t proxyport,
                                                 char *server_portstr)

{
@@ -203,9 +203,9 @@

      */  

     /* we break the URL into host, port, uri */ - if (APR_SUCCESS != apr_uri_parse_components(p, url, uri)) { + if (APR_SUCCESS != apr_uri_parse_components(p, *url, uri)) { return ap_proxyerror(r, HTTP_BAD_REQUEST,

-                             apr_pstrcat(p,"URI cannot be parsed:
", url,
+                             apr_pstrcat(p,"URI cannot be parsed:
", *url,
                                          NULL));
     }
     if (!uri->port) {

@@ -213,7 +213,7 @@


     }
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
-                 "proxy: HTTP connecting %s to %s:%d", url, uri->hostname,
+                 "proxy: HTTP connecting %s to %s:%d", *url, uri->hostname,

uri->port);  

     /* do a DNS lookup for the destination host */
@@ -235,10 +235,10 @@

         p_conn->name = apr_pstrdup(c->pool, uri->hostname);
         p_conn->port = uri->port;
         p_conn->addr = uri_addr;
-        url = apr_pstrcat(p, uri->path, uri->query ? "?" : "",
-                          uri->query ? uri->query : "",
-                          uri->fragment ? "#" : "",
-                          uri->fragment ? uri->fragment : "", NULL);
+        *url = apr_pstrcat(p, uri->path, uri->query ? "?" : "",

+                           uri->query ? uri->query : "",
+                           uri->fragment ? "#" : "",
+                           uri->fragment ? uri->fragment : "", NULL);

}  

     if (err != APR_SUCCESS) {
@@ -915,8 +915,8 @@

     }  

     /* Step One: Determine Who To Connect To */ - status = ap_proxy_http_determine_connection(p, r, p_conn, c, conf, uri, url,

-                                                proxyname, proxyport,

+ status = ap_proxy_http_determine_connection(p, r, p_conn, c, conf, uri,

+                                                &url, proxyname,
proxyport,
Do you need more help?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related httpd.apache.org Links
announce
bugs
cvs
dev
docs
gui-dev
modproxy-dev
packagers
testers
Request more information about Pantek
                                                 server_portstr);

if ( status != OK ) { Received on Wed Aug 15 18:01:46 2001