]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
projects / thirdparty / squid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3248e96)
SourceFormat Enforcement
authorSource Maintenance <squidadm@squid-cache.org>
Fri, 16 Jan 2015 18:12:04 +0000 (18:12 +0000)
committerSource Maintenance <squidadm@squid-cache.org>
Fri, 16 Jan 2015 18:12:04 +0000 (18:12 +0000)
errors/template.list patch | blob | blame | history
errors/templates/ERR_PROTOCOL_UNKNOWN patch | blob | blame | history
src/AclRegs.cc patch | blob | blame | history
src/acl/SquidError.cc patch | blob | blame | history
src/acl/SquidError.h patch | blob | blame | history
src/acl/SquidErrorData.cc patch | blob | blame | history
src/acl/SquidErrorData.h patch | blob | blame | history
src/cache_cf.cc patch | blob | blame | history
src/client_side.cc patch | blob | blame | history
src/client_side.h patch | blob | blame | history

diff --git a/errors/template.list b/errors/template.list
index 55812c11d6fb7f18814d6ca0ef57dbafbeb60a24..81f48a9e1cb4e12a8ca64324f2298e03b86befe6 100644 (file)
--- a/errors/template.list
+++ b/errors/template.list
@@ -37,6 +37,7 @@ ERROR_TEMPLATES= \
     templates/ERR_NO_RELAY \
     templates/ERR_ONLY_IF_CACHED_MISS \
     templates/ERR_PRECONDITION_FAILED \
+    templates/ERR_PROTOCOL_UNKNOWN \
     templates/ERR_READ_ERROR \
     templates/ERR_READ_TIMEOUT \
     templates/ERR_SECURE_CONNECT_FAIL \
@@ -47,5 +48,4 @@ ERROR_TEMPLATES= \
     templates/ERR_UNSUP_REQ \
     templates/ERR_URN_RESOLVE \
     templates/ERR_WRITE_ERROR \
-    templates/ERR_ZERO_SIZE_OBJECT \
-    templates/ERR_PROTOCOL_UNKNOWN
+    templates/ERR_ZERO_SIZE_OBJECT 
diff --git a/errors/templates/ERR_PROTOCOL_UNKNOWN b/errors/templates/ERR_PROTOCOL_UNKNOWN
index ace91512992421aa099701ef8e312e9feb4901b7..5a1be7d0922ed6e82426cde3f4f58feff179d54c 100644 (file)
--- a/errors/templates/ERR_PROTOCOL_UNKNOWN
+++ b/errors/templates/ERR_PROTOCOL_UNKNOWN
@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html><head>
-<meta type="copyright" content="Copyright (C) 1996-2014 The Squid Software Foundation and contributors">
+<meta type="copyright" content="Copyright (C) 1996-2015 The Squid Software Foundation and contributors">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>ERROR: The requested URL could not be retrieved</title>
 <style type="text/css"><!-- 
diff --git a/src/AclRegs.cc b/src/AclRegs.cc
index b71d886ad982617d5adb65b395478194e62c0c6b..0b129a521417fd9e43157304cf39ebdb7a3c43d3 100644 (file)
--- a/src/AclRegs.cc
+++ b/src/AclRegs.cc
@@ -222,3 +222,4 @@ ACLStrategised<const char *> ACLAdaptationService::RegistryEntry_(new ACLAdaptat
 
 ACL::Prototype ACLSquidError::RegistryProtoype(&ACLSquidError::RegistryEntry_, "squid_error");
 ACLStrategised<err_type> ACLSquidError::RegistryEntry_(new ACLSquidErrorData, ACLSquidErrorStrategy::Instance(), "squid_error");
+
diff --git a/src/acl/SquidError.cc b/src/acl/SquidError.cc
index 4dff3216dd37ff37f3c1a94be7fc3dd9d86d164b..4a749a3f283574d1ac15d20838d51a03ebd832bb 100644 (file)
--- a/src/acl/SquidError.cc
+++ b/src/acl/SquidError.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -28,3 +28,4 @@ ACLSquidErrorStrategy::Instance()
 }
 
 ACLSquidErrorStrategy ACLSquidErrorStrategy::Instance_;
+
diff --git a/src/acl/SquidError.h b/src/acl/SquidError.h
index 676b864953ba22e1f7a27daad49db567e259d4d4..47bcd26907d86c57c1bf87a526f4922be988b324 100644 (file)
--- a/src/acl/SquidError.h
+++ b/src/acl/SquidError.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -41,3 +41,4 @@ private:
 };
 
 #endif /* SQUID_ACLSQUIDERROR_H */
+
diff --git a/src/acl/SquidErrorData.cc b/src/acl/SquidErrorData.cc
index 08d52f4e028c57f3aec92c211926d2970dc0b92f..ac0d88633f407bf60fbb0de433ac162c81d19a38 100644 (file)
--- a/src/acl/SquidErrorData.cc
+++ b/src/acl/SquidErrorData.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
diff --git a/src/acl/SquidErrorData.h b/src/acl/SquidErrorData.h
index 8e04510bdf98745e8e8433c25f6c862d7f220110..965c5c6ea3a85dfeabe2035aaf18aba5bf77ea74 100644 (file)
--- a/src/acl/SquidErrorData.h
+++ b/src/acl/SquidErrorData.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -32,3 +32,4 @@ private:
 };
 
 #endif //SQUID_ACLSQUIDERRORDATA_H
+
diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 6499ba8ee106c92945bbf9029d455ce1e7097604..6b571d5ddd206b791af4baaa763ed73127ed787c 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -5009,7 +5009,7 @@ free_configuration_includes_quoted_values(bool *)
 static void
 parse_on_unsupported_protocol(acl_access **access)
 {
-   char *tm;
+    char *tm;
     if ((tm = ConfigParser::NextToken()) == NULL) {
         self_destruct();
         return;
@@ -5060,3 +5060,4 @@ free_on_unsupported_protocol(acl_access **access)
 {
     free_acl_access(access);
 }
+
diff --git a/src/client_side.cc b/src/client_side.cc
index e8baa3ddf9bfbca38b5fe7d5fbda5c2e94cec33a..68aca4eb01c38cb649eba6d2e9b9e87493020474 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -2467,7 +2467,7 @@ bool
 clientTunnelOnError(ConnStateData *conn, ClientSocketContext *context, HttpRequest *request, const HttpRequestMethod& method, err_type requestError, Http::StatusCode errStatusCode, const char *requestErrorBytes)
 {
     if (conn->port->flags.isIntercepted() &&
-        Config.accessList.on_unsupported_protocol && conn->nrequests <= 1) {
+            Config.accessList.on_unsupported_protocol && conn->nrequests <= 1) {
         ACLFilledChecklist checklist(Config.accessList.on_unsupported_protocol, request, NULL);
         checklist.requestErrorType = requestError;
         checklist.src_addr = conn->clientConnection->remote;
@@ -2479,7 +2479,7 @@ clientTunnelOnError(ConnStateData *conn, ClientSocketContext *context, HttpReque
             if (context)
                 context->removeFromConnectionList(conn);
             Comm::SetSelect(conn->clientConnection->fd, COMM_SELECT_READ, NULL, NULL, 0);
-    
+
             SBuf preReadData;
             if (conn->preservedClientData.length())
                 preReadData.append(conn->preservedClientData);
@@ -3584,7 +3584,7 @@ httpsCreate(const Comm::ConnectionPointer &conn, SSL_CTX *sslContext)
 }
 
 /**
- * 
+ *
  * \retval 1 on success
  * \retval 0 when needs more data
  * \retval -1 on error
@@ -4197,7 +4197,7 @@ clientPeekAndSpliceSSL(int fd, void *data)
         if (!conn->spliceOnError(err))
             conn->clientConnection->close();
         return;
-    } 
+    }
 
     if (bio->rBufData().contentSize() > 0)
         conn->receivedFirstByte();
@@ -5023,3 +5023,4 @@ ConnStateData::unpinConnection(const bool andClose)
     /* NOTE: pinning.pinned should be kept. This combined with fd == -1 at the end of a request indicates that the host
      * connection has gone away */
 }
+
diff --git a/src/client_side.h b/src/client_side.h
index 341c73590394010d6c2226686fa1f89809179a31..1e93498778da6e5121466f5a26d6c3dc375b1a4e 100644 (file)
--- a/src/client_side.h
+++ b/src/client_side.h
@@ -414,7 +414,7 @@ public:
     /// stop parsing the request and create context for relaying error info
     ClientSocketContext *abortRequestParsing(const char *const errUri);
 
-    /// client data which may need to forward as-is to server after an 
+    /// client data which may need to forward as-is to server after an
     /// on_unsupported_protocol tunnel decision.
     SBuf preservedClientData;
 protected:
Mirror of https://github.com/squid-cache/squid.git