fielding 97/08/20 19:44:31
Modified: src Tag: APACHE_1_2_X CHANGES
src/modules/proxy Tag: APACHE_1_2_X proxy_http.c
Log:
Modify last fix so that it uses the full-URI for ProxyRemote requests
and the URI path for normal requests.
Revision Changes Path
No revision
No revision
1.286.2.51 +1 -1 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.50
retrieving revision 1.286.2.51
diff -u -r1.286.2.50 -r1.286.2.51
--- CHANGES 1997/08/21 02:28:53 1.286.2.50
+++ CHANGES 1997/08/21 02:44:27 1.286.2.51
@@ -3,7 +3,7 @@
*) The ProxyRemote change in 1.2.3 introduced a bug resulting in the proxy
always making requests with the full-URI instead of just the URI path.
- [Marc Slemko]
+ [Marc Slemko, Roy Fielding]
Changes with Apache 1.2.3
No revision
No revision
1.17.2.5 +2 -1 apache/src/modules/proxy/proxy_http.c
Index: proxy_http.c
===================================================================
RCS file: /export/home/cvs/apache/src/modules/proxy/proxy_http.c,v
retrieving revision 1.17.2.4
retrieving revision 1.17.2.5
diff -u -r1.17.2.4 -r1.17.2.5
--- proxy_http.c 1997/08/21 02:24:30 1.17.2.4
+++ proxy_http.c 1997/08/21 02:44:30 1.17.2.5
@@ -250,7 +250,8 @@
bpushfd(f, sock, sock);
hard_timeout ("proxy send", r);
- bvputs(f, r->method, " ", urlptr, " HTTP/1.0\015\012", NULL);
+ bvputs(f, r->method, " ", proxyhost ? url : urlptr, " HTTP/1.0\015\012",
+ NULL);
bvputs(f, "Host: ", desthost, NULL);
if (destportstr != NULL && destport != DEFAULT_PORT)
bvputs(f, ":", destportstr, "\015\012", NULL);
