------------------------------------------------------------
revno: 13109
revision-id: squidadm@squid-cache.org-20131101001511-56mofjcjtappkw39
parent: squid3@treenet.co.nz-20131029163756-aq459w2q5dz1nqxd
committer: Automatic source maintenance <squidadm@squid-cache.org>
branch nick: trunk
timestamp: Thu 2013-10-31 18:15:11 -0600
message:
  SourceFormat Enforcement
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squidadm@squid-cache.org-20131101001511-\
#   56mofjcjtappkw39
# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# testament_sha1: bf0834fcdf4f20093a342c6c4d03cda8490925f1
# timestamp: 2013-11-01 00:16:29 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/
# base_revision_id: squid3@treenet.co.nz-20131029163756-\
#   aq459w2q5dz1nqxd
# 
# Begin patch
=== modified file 'src/AccessLogEntry.h'
--- src/AccessLogEntry.h	2013-10-29 02:24:29 +0000
+++ src/AccessLogEntry.h	2013-11-01 00:15:11 +0000
@@ -87,8 +87,7 @@
         HttpDetails() : method(Http::METHOD_NONE), code(0), content_type(NULL),
                 timedout(false),
                 aborted(false),
-                clientRequest()
-            {}
+                clientRequest() {}
 
         HttpRequestMethod method;
         int code;

=== modified file 'src/format/Format.cc'
--- src/format/Format.cc	2013-10-29 02:24:29 +0000
+++ src/format/Format.cc	2013-11-01 00:15:11 +0000
@@ -1026,7 +1026,7 @@
             outint = al->http.clientRequest.total() + al->http.adaptedReply.total();
             doint = 1;
             break;
-        /*case LFT_SERVER_IO_SIZE_TOTAL: */
+            /*case LFT_SERVER_IO_SIZE_TOTAL: */
 
         case LFT_TAG:
             if (al->request)

=== modified file 'src/tests/Stub.list'
--- src/tests/Stub.list	2013-10-29 00:13:37 +0000
+++ src/tests/Stub.list	2013-11-01 00:15:11 +0000
@@ -23,6 +23,7 @@
 	tests/stub_debug.cc \
 	tests/stub_errorpage.cc \
 	tests/stub_event.cc \
+	tests/stub_external_acl.cc \
 	tests/stub_fatal.cc \
 	tests/stub_fd.cc \
 	tests/stub_helper.cc \
@@ -33,6 +34,8 @@
 	tests/stub_ipc_Forwarder.cc \
 	tests/stub_ipc_TypedMsgHdr.cc \
 	tests/stub_ipcache.cc \
+	tests/stub_libauth.cc \
+	tests/stub_libauth_acls.cc \
 	tests/stub_libcomm.cc \
 	tests/stub_libeui.cc \
 	tests/stub_libformat.cc \
@@ -52,5 +55,6 @@
 	tests/stub_store_rebuild.cc \
 	tests/stub_store_stats.cc \
 	tests/stub_store_swapout.cc \
+	tests/stub_time.cc \
 	tests/stub_tools.cc \
 	tests/stub_wordlist.cc