------------------------------------------------------------
revno: 14048
revision-id: squidadm@squid-cache.org-20160506121415-1nfh46micwe370ar
parent: squid3@treenet.co.nz-20160506101149-buocosbzx9gpsy58
committer: Source Maintenance <squidadm@squid-cache.org>
branch nick: 3.5
timestamp: Fri 2016-05-06 12:14:15 +0000
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20160506121415-\
#   1nfh46micwe370ar
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# testament_sha1: 7eafa86573f8e610fa0686513b64c9d4c3a8b468
# timestamp: 2016-05-06 12:50:55 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
# base_revision_id: squid3@treenet.co.nz-20160506101149-\
#   buocosbzx9gpsy58
# 
# Begin patch
=== modified file 'src/esi/Context.h'
--- src/esi/Context.h	2016-05-06 09:39:48 +0000
+++ src/esi/Context.h	2016-05-06 12:14:15 +0000
@@ -13,8 +13,8 @@
 #include "err_type.h"
 #include "esi/Element.h"
 #include "esi/Parser.h"
+#include "http/StatusCode.h"
 #include "HttpReply.h"
-#include "http/StatusCode.h"
 
 class ESIVarState;
 class ClientHttpRequest;

=== modified file 'src/esi/Esi.cc'
--- src/esi/Esi.cc	2016-05-06 09:39:48 +0000
+++ src/esi/Esi.cc	2016-05-06 12:14:15 +0000
@@ -574,7 +574,7 @@
 #endif
 
     if (!(rep != NULL || (outbound.getRaw() &&
-                  outbound->len && (outbound_offset <= outbound->len)))) {
+                          outbound->len && (outbound_offset <= outbound->len)))) {
         debugs(86, 5, "ESIContext::send: Nothing to send.");
         return 0;
     }