You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2015/12/29 19:50:34 UTC
trafficserver git commit: Format: Clang formatting.
Repository: trafficserver
Updated Branches:
refs/heads/master c804ebc4e -> a94590e43
Format: Clang formatting.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a94590e4
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a94590e4
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a94590e4
Branch: refs/heads/master
Commit: a94590e43cc0403c7b9d0ea5318c4a95c14729db
Parents: c804ebc
Author: Alan M. Carroll <am...@apache.org>
Authored: Tue Dec 29 12:49:45 2015 -0600
Committer: Alan M. Carroll <am...@apache.org>
Committed: Tue Dec 29 12:49:45 2015 -0600
----------------------------------------------------------------------
proxy/ControlMatcher.h | 1 -
proxy/congest/Congestion.cc | 10 +++++-----
proxy/http/remap/RemapProcessor.cc | 4 ++--
3 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a94590e4/proxy/ControlMatcher.h
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index b53708a..16b0338 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -126,7 +126,6 @@ public:
virtual sockaddr const *get_ip() = 0;
virtual sockaddr const *get_client_ip() = 0;
-
};
class HttpRequestData : public RequestData
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a94590e4/proxy/congest/Congestion.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/Congestion.cc b/proxy/congest/Congestion.cc
index f952881..3aba97f 100644
--- a/proxy/congest/Congestion.cc
+++ b/proxy/congest/Congestion.cc
@@ -256,7 +256,7 @@ CongestionControlRecord::UpdateMatch(CongestionControlRule *pRule, RequestData *
*/
if (pRule->record == 0 || pRule->record->rank < rank || (pRule->record->line_num > line_num && pRule->record->rank == rank)) {
if (rank > 0) {
- CongestionEntry* entry = dynamic_cast<CongestionEntry*>(rdata);
+ CongestionEntry *entry = dynamic_cast<CongestionEntry *>(rdata);
if (entry) {
// Enforce the same port and prefix
if (port != 0 && port != entry->pRecord->port)
@@ -266,10 +266,10 @@ CongestionControlRecord::UpdateMatch(CongestionControlRule *pRule, RequestData *
if (prefix != NULL && strncmp(prefix, entry->pRecord->prefix, prefix_len))
return;
} else {
- HttpRequestData* h = dynamic_cast<HttpRequestData*>(rdata);
- if (h && !this->CheckModifiers(h)) {
- return;
- }
+ HttpRequestData *h = dynamic_cast<HttpRequestData *>(rdata);
+ if (h && !this->CheckModifiers(h)) {
+ return;
+ }
}
}
pRule->record = this;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a94590e4/proxy/http/remap/RemapProcessor.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapProcessor.cc b/proxy/http/remap/RemapProcessor.cc
index 4040118..fd3e524 100644
--- a/proxy/http/remap/RemapProcessor.cc
+++ b/proxy/http/remap/RemapProcessor.cc
@@ -88,8 +88,8 @@ RemapProcessor::setup_for_remap(HttpTransact::State *s)
if (rewrite_table->num_rules_forward_with_recv_port) {
Debug("url_rewrite", "[lookup] forward mappings with recv port found; Using recv port %d", s->client_info.dst_addr.port());
- if (rewrite_table->forwardMappingWithRecvPortLookup(request_url, s->client_info.dst_addr.port(), request_host,
- request_host_len, s->url_map)) {
+ if (rewrite_table->forwardMappingWithRecvPortLookup(request_url, s->client_info.dst_addr.port(), request_host, request_host_len,
+ s->url_map)) {
Debug("url_rewrite", "Found forward mapping with recv port");
mapping_found = true;
} else if (rewrite_table->num_rules_forward == 0) {