trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject trafficserver git commit: TS-3631 Fix clang-format
Date Tue, 26 May 2015 23:51:09 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 3a7358c54 -> f265aae62


TS-3631 Fix clang-format


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f265aae6
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f265aae6
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f265aae6

Branch: refs/heads/master
Commit: f265aae629a7c83b7f8d16dae200514c3edda924
Parents: 3a7358c
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Tue May 26 17:51:01 2015 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Tue May 26 17:51:01 2015 -0600

----------------------------------------------------------------------
 proxy/http/HttpConfig.cc   |  5 ++---
 proxy/http/HttpTransact.cc |  6 ++++--
 proxy/logging/Log.cc       | 17 ++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f265aae6/proxy/http/HttpConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index 54955e5..bfdd31b 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -854,9 +854,8 @@ register_stat_callbacks()
                      (int)https_incoming_requests_stat, RecRawStatSyncCount);
   RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.https.total_client_connections",
RECD_COUNTER, RECP_PERSISTENT,
                      (int)https_total_client_connections_stat, RecRawStatSyncCount);
-  RecRegisterRawStat(http_rsb, RECT_PROCESS,
-                     "proxy.process.http.post_body_too_large",
-                     RECD_COUNTER, RECP_PERSISTENT, (int) http_post_body_too_large, RecRawStatSyncCount);
+  RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.post_body_too_large", RECD_COUNTER,
RECP_PERSISTENT,
+                     (int)http_post_body_too_large, RecRawStatSyncCount);
   // milestones
   RecRegisterRawStat(http_rsb, RECT_PROCESS, "proxy.process.http.milestone.ua_begin", RECD_COUNTER,
RECP_PERSISTENT,
                      (int)http_ua_begin_time_stat, RecRawStatSyncSum);

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f265aae6/proxy/http/HttpTransact.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index ae52df4..961d78b 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -1253,8 +1253,10 @@ HttpTransact::HandleRequest(State *s)
   initialize_state_variables_from_request(s, &s->hdr_info.client_request);
 
   // The following code is configurable to allow a user to control the max post size (TS-3631)
-  if (s->http_config_param->max_post_size > 0 && s->hdr_info.request_content_length
> 0 && s->hdr_info.request_content_length > s->http_config_param->max_post_size)
{
-    DebugTxn("http_trans", "Max post size %" PRId64 " Client tried to post a body that was
too large.", s->http_config_param->max_post_size);
+  if (s->http_config_param->max_post_size > 0 && s->hdr_info.request_content_length
> 0 &&
+      s->hdr_info.request_content_length > s->http_config_param->max_post_size)
{
+    DebugTxn("http_trans", "Max post size %" PRId64 " Client tried to post a body that was
too large.",
+             s->http_config_param->max_post_size);
     HTTP_INCREMENT_TRANS_STAT(http_post_body_too_large);
     bootstrap_state_variables_from_request(s, &s->hdr_info.client_request);
     build_error_response(s, HTTP_STATUS_REQUEST_ENTITY_TOO_LARGE, "Request Entity Too Large",
"request#entity_too_large", NULL);

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f265aae6/proxy/logging/Log.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/Log.cc b/proxy/logging/Log.cc
index 842bf16..cfd83d1 100644
--- a/proxy/logging/Log.cc
+++ b/proxy/logging/Log.cc
@@ -501,15 +501,14 @@ Log::init_fields()
     SQUID_LOG_UDP_HIT_OBJ, "UDP_HIT_OBJ", SQUID_LOG_UDP_MISS, "UDP_MISS", SQUID_LOG_UDP_DENIED,
"UDP_DENIED", SQUID_LOG_UDP_INVALID,
     "UDP_INVALID", SQUID_LOG_UDP_RELOADING, "UDP_RELOADING", SQUID_LOG_UDP_FUTURE_1, "UDP_FUTURE_1",
SQUID_LOG_UDP_FUTURE_2,
     "UDP_FUTURE_2", SQUID_LOG_ERR_READ_TIMEOUT, "ERR_READ_TIMEOUT", SQUID_LOG_ERR_LIFETIME_EXP,
"ERR_LIFETIME_EXP",
-    SQUID_LOG_ERR_POST_ENTITY_TOO_LARGE, "ERR_POST_ENTITY_TOO_LARGE",
-    SQUID_LOG_ERR_NO_CLIENTS_BIG_OBJ, "ERR_NO_CLIENTS_BIG_OBJ", SQUID_LOG_ERR_READ_ERROR,
"ERR_READ_ERROR",
-    SQUID_LOG_ERR_CLIENT_ABORT, "ERR_CLIENT_ABORT", SQUID_LOG_ERR_CONNECT_FAIL, "ERR_CONNECT_FAIL",
SQUID_LOG_ERR_INVALID_REQ,
-    "ERR_INVALID_REQ", SQUID_LOG_ERR_UNSUP_REQ, "ERR_UNSUP_REQ", SQUID_LOG_ERR_INVALID_URL,
"ERR_INVALID_URL", SQUID_LOG_ERR_NO_FDS,
-    "ERR_NO_FDS", SQUID_LOG_ERR_DNS_FAIL, "ERR_DNS_FAIL", SQUID_LOG_ERR_NOT_IMPLEMENTED,
"ERR_NOT_IMPLEMENTED",
-    SQUID_LOG_ERR_CANNOT_FETCH, "ERR_CANNOT_FETCH", SQUID_LOG_ERR_NO_RELAY, "ERR_NO_RELAY",
SQUID_LOG_ERR_DISK_IO, "ERR_DISK_IO",
-    SQUID_LOG_ERR_ZERO_SIZE_OBJECT, "ERR_ZERO_SIZE_OBJECT", SQUID_LOG_ERR_PROXY_DENIED, "ERR_PROXY_DENIED",
-    SQUID_LOG_ERR_WEBFETCH_DETECTED, "ERR_WEBFETCH_DETECTED", SQUID_LOG_ERR_FUTURE_1, "ERR_FUTURE_1",
SQUID_LOG_ERR_UNKNOWN,
-    "ERR_UNKNOWN");
+    SQUID_LOG_ERR_POST_ENTITY_TOO_LARGE, "ERR_POST_ENTITY_TOO_LARGE", SQUID_LOG_ERR_NO_CLIENTS_BIG_OBJ,
"ERR_NO_CLIENTS_BIG_OBJ",
+    SQUID_LOG_ERR_READ_ERROR, "ERR_READ_ERROR", SQUID_LOG_ERR_CLIENT_ABORT, "ERR_CLIENT_ABORT",
SQUID_LOG_ERR_CONNECT_FAIL,
+    "ERR_CONNECT_FAIL", SQUID_LOG_ERR_INVALID_REQ, "ERR_INVALID_REQ", SQUID_LOG_ERR_UNSUP_REQ,
"ERR_UNSUP_REQ",
+    SQUID_LOG_ERR_INVALID_URL, "ERR_INVALID_URL", SQUID_LOG_ERR_NO_FDS, "ERR_NO_FDS", SQUID_LOG_ERR_DNS_FAIL,
"ERR_DNS_FAIL",
+    SQUID_LOG_ERR_NOT_IMPLEMENTED, "ERR_NOT_IMPLEMENTED", SQUID_LOG_ERR_CANNOT_FETCH, "ERR_CANNOT_FETCH",
SQUID_LOG_ERR_NO_RELAY,
+    "ERR_NO_RELAY", SQUID_LOG_ERR_DISK_IO, "ERR_DISK_IO", SQUID_LOG_ERR_ZERO_SIZE_OBJECT,
"ERR_ZERO_SIZE_OBJECT",
+    SQUID_LOG_ERR_PROXY_DENIED, "ERR_PROXY_DENIED", SQUID_LOG_ERR_WEBFETCH_DETECTED, "ERR_WEBFETCH_DETECTED",
+    SQUID_LOG_ERR_FUTURE_1, "ERR_FUTURE_1", SQUID_LOG_ERR_UNKNOWN, "ERR_UNKNOWN");
 
   Ptr<LogFieldAliasTable> cache_hit_miss_map = make_ptr(new LogFieldAliasTable);
   cache_hit_miss_map->init(23, SQUID_HIT_RESERVED, "HIT", SQUID_HIT_LEVEL_1, "HIT_RAM",
// Also SQUID_HIT_RAM


Mime
View raw message