------------------------------------------------------------ revno: 12622 revision-id: squid3@treenet.co.nz-20130911010345-l9hvcbdaa3ih6s0y parent: squid3@treenet.co.nz-20130911010254-5az9ij1b8or48lg2 author: Amos Jeffries , Priyanka Gupta committer: Amos Jeffries branch nick: 3.3 timestamp: Tue 2013-09-10 19:03:45 -0600 message: Fix myportname ACL on ICAP/eCAP transactions The port name from http_port/https_port was not being propigated to adapted reqeusts after ICAP/eCAP. Which makes the myportname ACL and logging of portname not work on adapted requests. This is an iCelero Project ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20130911010345-l9hvcbdaa3ih6s0y # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 7186f763028e40cb522893e6cbf9409233aef8ac # timestamp: 2013-09-11 01:08:55 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20130911010254-\ # 5az9ij1b8or48lg2 # # Begin patch === modified file 'src/HttpRequest.cc' --- src/HttpRequest.cc 2013-07-26 12:21:20 +0000 +++ src/HttpRequest.cc 2013-09-11 01:03:45 +0000 @@ -223,7 +223,6 @@ copy->vary_headers = vary_headers ? xstrdup(vary_headers) : NULL; // XXX: what to do with copy->peer_domain? - copy->myportname = myportname; copy->tag = tag; copy->extacl_log = extacl_log; copy->extacl_message = extacl_message; @@ -268,6 +267,8 @@ extacl_passwd = aReq->extacl_passwd; #endif + myportname = aReq->myportname; + // main property is which connection the request was received on (if any) clientConnectionManager = aReq->clientConnectionManager;