------------------------------------------------------------
revno: 13123
revision-id: squid3@treenet.co.nz-20140423050652-f8cv02mqh23m0emk
parent: squid3@treenet.co.nz-20140418184517-mmfmyjhn3pegssco
fixes bug(s): http://bugs.squid-cache.org/show_bug.cgi?id=3986
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.4
timestamp: Tue 2014-04-22 22:06:52 -0700
message:
  Bug 3986 (partial): assertion failed due to incorrect error page buffer size
  
  errorpage.cc:1307:
     "(size_t)content->contentSize() == strlen(content->content())"
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20140423050652-f8cv02mqh23m0emk
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# testament_sha1: af3103f5e4453a8a55d5a38f91c862d94ae63314
# timestamp: 2014-04-23 05:14:29 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4
# base_revision_id: squid3@treenet.co.nz-20140418184517-\
#   mmfmyjhn3pegssco
# 
# Begin patch
=== modified file 'src/errorpage.cc'
--- src/errorpage.cc	2014-04-09 16:53:05 +0000
+++ src/errorpage.cc	2014-04-23 05:06:52 +0000
@@ -1304,6 +1304,8 @@
     if (*m)
         content->Printf("%s", m);	/* copy tail */
 
+    content->terminate();
+
     assert((size_t)content->contentSize() == strlen(content->content()));
 
     return content;