You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2015/07/17 15:38:17 UTC
trafficserver git commit: Clang format updates.
Repository: trafficserver
Updated Branches:
refs/heads/master 2e0689748 -> add34803d
Clang format updates.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/add34803
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/add34803
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/add34803
Branch: refs/heads/master
Commit: add34803d4ca09036b25426f71833f7a41672246
Parents: 2e06897
Author: shinrich <sh...@yahoo-inc.com>
Authored: Fri Jul 17 08:37:53 2015 -0500
Committer: shinrich <sh...@yahoo-inc.com>
Committed: Fri Jul 17 08:37:53 2015 -0500
----------------------------------------------------------------------
iocore/hostdb/HostDB.cc | 3 ++-
proxy/http/HttpSM.cc | 4 ++--
proxy/spdy/SpdyClientSession.h | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/add34803/iocore/hostdb/HostDB.cc
----------------------------------------------------------------------
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index bd7c64b..99a8480 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -2449,7 +2449,8 @@ struct ShowHostDB : public ShowCont {
r->reverse_dns ? "Reverse DNS" : "DNS"));
// Let's display the MD5.
- CHECK_SHOW(show("<tr><td>%s</td><td>%0.16llx %0.8x %0.8x</td></tr>\n", "MD5 (high, low, low low)", r->md5_high, r->md5_low, r->md5_low_low));
+ CHECK_SHOW(show("<tr><td>%s</td><td>%0.16llx %0.8x %0.8x</td></tr>\n", "MD5 (high, low, low low)", r->md5_high, r->md5_low,
+ r->md5_low_low));
CHECK_SHOW(show("<tr><td>%s</td><td>%u</td></tr>\n", "App1", r->app.allotment.application1));
CHECK_SHOW(show("<tr><td>%s</td><td>%u</td></tr>\n", "App2", r->app.allotment.application2));
CHECK_SHOW(show("<tr><td>%s</td><td>%u</td></tr>\n", "LastFailure", r->app.http_data.last_failure));
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/add34803/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index 700203f..3f4dd72 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -3183,7 +3183,7 @@ HttpSM::tunnel_handler_ua(int event, HttpTunnelConsumer *c)
// so the session_close hook occurs after the transaction close hook
// Also delaying the session release to kill_this in the keep_alive case
// so we don't lose any keep-alive opportunities
- }
+ }
return 0;
}
@@ -6562,7 +6562,7 @@ HttpSM::kill_this()
// If this is a keep-alive client connection, just relase the client
// session rather than closing it.
if (t_state.client_info.keep_alive == HTTP_KEEPALIVE &&
- (t_state.www_auth_content != HttpTransact::CACHE_AUTH_SERVE || ua_session->get_bound_ss())) {
+ (t_state.www_auth_content != HttpTransact::CACHE_AUTH_SERVE || ua_session->get_bound_ss())) {
// successful keep-alive, release the client session instead of destroying it
ink_assert(ua_buffer_reader != NULL);
ua_session->release(ua_buffer_reader);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/add34803/proxy/spdy/SpdyClientSession.h
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyClientSession.h b/proxy/spdy/SpdyClientSession.h
index 2ff5a30..498f6d8 100644
--- a/proxy/spdy/SpdyClientSession.h
+++ b/proxy/spdy/SpdyClientSession.h
@@ -118,7 +118,7 @@ public:
return NULL;
}
void start();
-
+
void do_io_close(int lerrno = -1);
void
do_io_shutdown(ShutdownHowTo_t howto)