------------------------------------------------------------
revno: 13063
revision-id: squid3@treenet.co.nz-20131225213515-aig41kdd0c1dbv9r
parent: squid3@treenet.co.nz-20131225213433-owzg0xz3x9vq63a5
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Wed 2013-12-25 14:35:15 -0700
message:
  Fix \-unescaping in quoted strings from helpers
  
  strwordtok() was unescaping '\' values in unquoted tokens. This causes
  problems with NTLM helper response user\DOMAIN values which are sent as
  a un-quoted un-escaped value.
  
  Restrict un-escaping of '\' to only occur when inside "quoted" words.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20131225213515-aig41kdd0c1dbv9r
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: a8e964201cf625bf2c71c944d2fbf54852198c76
# timestamp: 2013-12-25 21:36:55 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20131225213433-\
#   owzg0xz3x9vq63a5
# 
# Begin patch
=== modified file 'src/String.cc'
--- src/String.cc	2012-10-04 09:14:06 +0000
+++ src/String.cc	2013-12-25 21:35:15 +0000
@@ -376,7 +376,8 @@
         switch (ch) {
 
         case '\\':
-            ++p;
+            if (quoted)
+                ++p;
 
             switch (*p) {