------------------------------------------------------------
revno: 13669
revision-id: squid3@treenet.co.nz-20141203113859-p9jwbfc1oueaj3ft
parent: squid3@treenet.co.nz-20141203113656-da0y9jjbkagt651e
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.5
timestamp: Wed 2014-12-03 03:38:59 -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-20141203113859-p9jwbfc1oueaj3ft
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: f79f2ced4922be9ba0efe23dcfcedf1c39137320
# timestamp: 2014-12-03 11:44:59 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20141203113656-\
#   da0y9jjbkagt651e
# 
# Begin patch
=== modified file 'src/external_acl.cc'
--- src/external_acl.cc	2014-10-08 15:51:28 +0000
+++ src/external_acl.cc	2014-12-03 11:38:59 +0000
@@ -335,12 +335,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), Format::LFT_ADAPTED_REQUEST_HEADER);
         } else if (strncmp(token, "%>ha{", 5) == 0) {
-            parse_header_token(format, (token+3), Format::LFT_ADAPTED_REQUEST_HEADER);
+            parse_header_token(format, (token+5), Format::LFT_ADAPTED_REQUEST_HEADER);
         } 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), Format::LFT_REPLY_HEADER);
         } else if (strncmp(token, "%<h{", 4) == 0) {
-            parse_header_token(format, (token+3), Format::LFT_REPLY_HEADER);
+            parse_header_token(format, (token+4), Format::LFT_REPLY_HEADER);
 #if USE_AUTH
         } else if (strcmp(token, "%LOGIN") == 0 || strcmp(token, "%ul") == 0) {
             format->type = Format::LFT_USER_LOGIN;