------------------------------------------------------------
revno: 13192
revision-id: squid3@treenet.co.nz-20141203120113-hcx43ty5grkbd268
parent: squid3@treenet.co.nz-20141203115837-5098wzicrpnntmcm
fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4148
author: Jorge Ivan Burgos Aguilar <jorgeivanburgosaguilar@gmail.com>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Wed 2014-12-03 04:01:13 -0800
message:
  Bug 4148: external_acl_type header format does not accept the new libformat syntax
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20141203120113-hcx43ty5grkbd268
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: e0c2720a5cd47816635e1d7d59ae428e3f8016ac
# timestamp: 2014-12-03 12:01:59 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20141203115837-\
#   5098wzicrpnntmcm
# 
# Begin patch
=== modified file 'src/external_acl.cc'
--- src/external_acl.cc	2014-10-09 11:53:28 +0000
+++ src/external_acl.cc	2014-12-03 12:01:13 +0000
@@ -425,12 +425,12 @@
             debugs(82, DBG_PARSE_NOTE(DBG_IMPORTANT), "WARNING: external_acl_type format %>{...} is being replaced by %>ha{...} for : " << token);
             parse_header_token(format, (token+3), _external_acl_format::EXT_ACL_HEADER_REQUEST);
         } else if (strncmp(token, "%>ha{", 5) == 0) {
-            parse_header_token(format, (token+3), _external_acl_format::EXT_ACL_HEADER_REQUEST);
+            parse_header_token(format, (token+5), _external_acl_format::EXT_ACL_HEADER_REQUEST);
         } else if (strncmp(token, "%<{", 3) == 0) {
             debugs(82, DBG_PARSE_NOTE(DBG_IMPORTANT), "WARNING: external_acl_type format %<{...} is being replaced by %<h{...} for : " << token);
             parse_header_token(format, (token+3), _external_acl_format::EXT_ACL_HEADER_REPLY);
         } else if (strncmp(token, "%<h{", 4) == 0) {
-            parse_header_token(format, (token+3), _external_acl_format::EXT_ACL_HEADER_REPLY);
+            parse_header_token(format, (token+4), _external_acl_format::EXT_ACL_HEADER_REPLY);
 #if USE_AUTH
         } else if (strcmp(token, "%LOGIN") == 0 || strcmp(token, "%ul") == 0) {
             format->type = _external_acl_format::EXT_ACL_LOGIN;