------------------------------------------------------------
revno: 13107
revision-id: squid3@treenet.co.nz-20140321084523-9ud6re333qjcpfqe
parent: squid3@treenet.co.nz-20140309094022-9mk9pf1unuxux3wo
author: Nikolai Gorchilov <niki@x3me.net>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Fri 2014-03-21 02:45:23 -0600
message:
  Use request URI instead of StoreID when forwarding requests to peers
  
  TODO: There are more bugs like that, including using Store IDs in ICP
  requests.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140321084523-9ud6re333qjcpfqe
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: 2fa8b46b660330ea1fcc2cfb7394afbcc01725bf
# timestamp: 2014-03-21 08:49:13 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20140309094022-\
#   9mk9pf1unuxux3wo
# 
# Begin patch
=== modified file 'src/http.cc'
--- src/http.cc	2014-03-09 01:48:00 +0000
+++ src/http.cc	2014-03-21 08:45:23 +0000
@@ -2105,7 +2105,7 @@
     Http::ProtocolVersion httpver(1,1);
     const char * url;
     if (_peer && !_peer->options.originserver)
-        url = entry->url();
+        url = urlCanonical(request);
     else
         url = request->urlpath.termedBuf();
     mb->Printf("%s %s %s/%d.%d\r\n",