This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new a5e376e Updates everything with the latest clang-format version
a5e376e is described below
commit a5e376e70b987b150a90e34e672fee22b1923bd0
Author: Leif Hedstrom <[email protected]>
AuthorDate: Tue Apr 4 12:38:18 2017 -0600
Updates everything with the latest clang-format version
---
example/cppapi/async_http_fetch/AsyncHttpFetch.cc | 1 +
example/cppapi/async_timer/AsyncTimer.cc | 1 +
example/cppapi/clientredirect/ClientRedirect.cc | 1 +
example/cppapi/customresponse/CustomResponse.cc | 1 +
.../GzipTransformationPlugin.cc | 1 +
.../NullTransformationPlugin.cc | 1 +
example/cppapi/post_buffer/PostBuffer.cc | 1 +
iocore/dns/DNS.cc | 15 +++++------
iocore/eventsystem/I_Event.h | 2 +-
iocore/eventsystem/I_VConnection.h | 27 ++++++++++----------
iocore/eventsystem/I_VIO.h | 5 ++--
lib/cppapi/include/atscppapi/Async.h | 3 +++
lib/cppapi/include/atscppapi/Headers.h | 1 +
lib/cppapi/include/atscppapi/Mutex.h | 2 ++
lib/cppapi/include/atscppapi/noncopyable.h | 1 +
lib/ts/IntrusiveDList.h | 1 +
lib/ts/Trie.h | 1 +
mgmt/ProxyConfig.h | 1 +
mgmt/api/NetworkMessage.cc | 29 ++++++++++------------
plugins/esi/lib/Variables.h | 1 +
plugins/experimental/mp4/mp4_meta.h | 1 +
.../experimental/stream_editor/stream_editor.cc | 2 +-
.../experimental/webp_transform/ImageTransform.cc | 1 +
plugins/header_rewrite/operators.h | 3 +++
plugins/regex_remap/regex_remap.cc | 4 +--
proxy/CacheControl.cc | 12 +++++++--
proxy/StatPages.h | 1 +
proxy/http/remap/UrlRewrite.cc | 5 ++--
tools/jtest/jtest.cc | 25 ++++++++++---------
29 files changed, 90 insertions(+), 60 deletions(-)
diff --git a/example/cppapi/async_http_fetch/AsyncHttpFetch.cc
b/example/cppapi/async_http_fetch/AsyncHttpFetch.cc
index 1fb29a8..3901add 100644
--- a/example/cppapi/async_http_fetch/AsyncHttpFetch.cc
+++ b/example/cppapi/async_http_fetch/AsyncHttpFetch.cc
@@ -74,6 +74,7 @@ public:
return getDispatchController()->isEnabled();
}
~DelayedAsyncHttpFetch() { delete timer_; }
+
private:
std::shared_ptr<Mutex> mutex_;
AsyncTimer *timer_;
diff --git a/example/cppapi/async_timer/AsyncTimer.cc
b/example/cppapi/async_timer/AsyncTimer.cc
index c940031..b0d5e90 100644
--- a/example/cppapi/async_timer/AsyncTimer.cc
+++ b/example/cppapi/async_timer/AsyncTimer.cc
@@ -48,6 +48,7 @@ public:
}
~TimerEventReceiver() { delete timer_; }
+
private:
int max_instances_;
int instance_count_;
diff --git a/example/cppapi/clientredirect/ClientRedirect.cc
b/example/cppapi/clientredirect/ClientRedirect.cc
index f4aca40..a6b46ea 100644
--- a/example/cppapi/clientredirect/ClientRedirect.cc
+++ b/example/cppapi/clientredirect/ClientRedirect.cc
@@ -57,6 +57,7 @@ public:
}
virtual ~ClientRedirectTransactionPlugin() {}
+
private:
string location_;
};
diff --git a/example/cppapi/customresponse/CustomResponse.cc
b/example/cppapi/customresponse/CustomResponse.cc
index 462af08..2d4de5f 100644
--- a/example/cppapi/customresponse/CustomResponse.cc
+++ b/example/cppapi/customresponse/CustomResponse.cc
@@ -61,6 +61,7 @@ public:
}
virtual ~CustomResponseTransactionPlugin() {}
+
private:
HttpStatus status_;
string reason_;
diff --git a/example/cppapi/gzip_transformation/GzipTransformationPlugin.cc
b/example/cppapi/gzip_transformation/GzipTransformationPlugin.cc
index 6a195c9..35968ef 100644
--- a/example/cppapi/gzip_transformation/GzipTransformationPlugin.cc
+++ b/example/cppapi/gzip_transformation/GzipTransformationPlugin.cc
@@ -125,6 +125,7 @@ public:
}
virtual ~SomeTransformationPlugin() {}
+
private:
Transaction &transaction_;
};
diff --git
a/example/cppapi/null_transformation_plugin/NullTransformationPlugin.cc
b/example/cppapi/null_transformation_plugin/NullTransformationPlugin.cc
index 2dc7626..6080e93 100644
--- a/example/cppapi/null_transformation_plugin/NullTransformationPlugin.cc
+++ b/example/cppapi/null_transformation_plugin/NullTransformationPlugin.cc
@@ -69,6 +69,7 @@ public:
}
virtual ~NullTransformationPlugin() {}
+
private:
};
diff --git a/example/cppapi/post_buffer/PostBuffer.cc
b/example/cppapi/post_buffer/PostBuffer.cc
index fa8c2ec..ac20974 100644
--- a/example/cppapi/post_buffer/PostBuffer.cc
+++ b/example/cppapi/post_buffer/PostBuffer.cc
@@ -56,6 +56,7 @@ public:
}
virtual ~PostBufferTransformationPlugin() {}
+
private:
Transaction &transaction_;
string buffer_;
diff --git a/iocore/dns/DNS.cc b/iocore/dns/DNS.cc
index 39dc8ff..036b0e8 100644
--- a/iocore/dns/DNS.cc
+++ b/iocore/dns/DNS.cc
@@ -431,13 +431,14 @@ DNSHandler::open_con(sockaddr const *target, bool failed,
int icon)
con[icon].close();
}
- if (con[icon].connect(target, DNSConnection::Options()
- .setNonBlockingConnect(true)
- .setNonBlockingIo(true)
- .setUseTcp(false)
- .setBindRandomPort(true)
- .setLocalIpv6(&local_ipv6.sa)
- .setLocalIpv4(&local_ipv4.sa)) < 0) {
+ if (con[icon].connect(target,
+ DNSConnection::Options()
+ .setNonBlockingConnect(true)
+ .setNonBlockingIo(true)
+ .setUseTcp(false)
+ .setBindRandomPort(true)
+ .setLocalIpv6(&local_ipv6.sa)
+ .setLocalIpv4(&local_ipv4.sa)) < 0) {
Debug("dns", "opening connection %s FAILED for %d", ip_text, icon);
if (!failed) {
if (dns_ns_rr)
diff --git a/iocore/eventsystem/I_Event.h b/iocore/eventsystem/I_Event.h
index 2a48a18..984f5a2 100644
--- a/iocore/eventsystem/I_Event.h
+++ b/iocore/eventsystem/I_Event.h
@@ -280,6 +280,6 @@ extern ClassAllocator<Event> eventAllocator;
if (_p->globally_allocated) \
::_a.free(_p); \
else \
- THREAD_FREE(_p, _a, _t)
+ THREAD_FREE(_p, _a, _t)
#endif /*_Event_h_*/
diff --git a/iocore/eventsystem/I_VConnection.h
b/iocore/eventsystem/I_VConnection.h
index b7e890b..b6721aa 100644
--- a/iocore/eventsystem/I_VConnection.h
+++ b/iocore/eventsystem/I_VConnection.h
@@ -29,8 +29,7 @@
#include "I_EventSystem.h"
#if !defined(I_VIO_h)
#error "include I_VIO.h"
--- -
- include I_VIO.h
+---include I_VIO.h
#endif
//
@@ -111,18 +110,18 @@
#define VC_EVENT_DONE CONTINUATION_DONE
#define VC_EVENT_CONT CONTINUATION_CONT
-
//////////////////////////////////////////////////////////////////////////////
- //
- // Support Data Structures
- //
-
//////////////////////////////////////////////////////////////////////////////
-
- /** Used in VConnection::shutdown(). */
- enum ShutdownHowTo_t {
- IO_SHUTDOWN_READ = 0,
- IO_SHUTDOWN_WRITE,
- IO_SHUTDOWN_READWRITE
- };
+
//////////////////////////////////////////////////////////////////////////////
+ //
+ // Support Data Structures
+ //
+
//////////////////////////////////////////////////////////////////////////////
+
+ /** Used in VConnection::shutdown(). */
+ enum ShutdownHowTo_t {
+ IO_SHUTDOWN_READ = 0,
+ IO_SHUTDOWN_WRITE,
+ IO_SHUTDOWN_READWRITE
+ };
/** Used in VConnection::get_data(). */
enum TSApiDataType {
diff --git a/iocore/eventsystem/I_VIO.h b/iocore/eventsystem/I_VIO.h
index 94792f1..3497d7e 100644
--- a/iocore/eventsystem/I_VIO.h
+++ b/iocore/eventsystem/I_VIO.h
@@ -29,11 +29,10 @@
#include "I_EventSystem.h"
#if !defined(I_IOBuffer_h)
#error "include I_IOBuffer.h"
--- -
- include I_IOBuffer.h
+---include I_IOBuffer.h
#endif
#include "ts/ink_apidefs.h"
- class Continuation;
+ class Continuation;
class VConnection;
class IOVConnection;
class MIOBuffer;
diff --git a/lib/cppapi/include/atscppapi/Async.h
b/lib/cppapi/include/atscppapi/Async.h
index 1104d1e..7f0231c 100644
--- a/lib/cppapi/include/atscppapi/Async.h
+++ b/lib/cppapi/include/atscppapi/Async.h
@@ -85,6 +85,7 @@ public:
}
virtual ~AsyncProvider() {}
+
protected:
std::shared_ptr<AsyncDispatchControllerBase>
getDispatchController()
@@ -151,6 +152,7 @@ public:
}
virtual ~AsyncDispatchController() {}
+
public:
AsyncEventReceiverType *event_receiver_;
std::shared_ptr<Mutex> dispatch_mutex_;
@@ -200,6 +202,7 @@ public:
*/
virtual void handleAsyncComplete(AsyncProviderType &provider) = 0;
virtual ~AsyncReceiver() {}
+
protected:
AsyncReceiver() {}
friend class Async;
diff --git a/lib/cppapi/include/atscppapi/Headers.h
b/lib/cppapi/include/atscppapi/Headers.h
index 0090335..93f7023 100644
--- a/lib/cppapi/include/atscppapi/Headers.h
+++ b/lib/cppapi/include/atscppapi/Headers.h
@@ -238,6 +238,7 @@ class HeaderField
private:
header_field_iterator iter_;
HeaderField(header_field_iterator iter) : iter_(iter) {}
+
public:
typedef unsigned int size_type;
typedef header_field_value_iterator iterator;
diff --git a/lib/cppapi/include/atscppapi/Mutex.h
b/lib/cppapi/include/atscppapi/Mutex.h
index 3ae30b5..c222e90 100644
--- a/lib/cppapi/include/atscppapi/Mutex.h
+++ b/lib/cppapi/include/atscppapi/Mutex.h
@@ -139,6 +139,7 @@ public:
* Unlock the mutex.
*/
~ScopedMutexLock() { mutex_.unlock(); }
+
private:
Mutex &mutex_;
};
@@ -163,6 +164,7 @@ public:
* Unlock the mutex.
*/
~ScopedSharedMutexLock() { mutex_->unlock(); }
+
private:
std::shared_ptr<Mutex> mutex_;
};
diff --git a/lib/cppapi/include/atscppapi/noncopyable.h
b/lib/cppapi/include/atscppapi/noncopyable.h
index b659510..a22fa00 100644
--- a/lib/cppapi/include/atscppapi/noncopyable.h
+++ b/lib/cppapi/include/atscppapi/noncopyable.h
@@ -53,6 +53,7 @@ class noncopyable
protected:
noncopyable() {}
~noncopyable() {}
+
private:
noncopyable(const noncopyable &);
const noncopyable &operator=(const noncopyable &);
diff --git a/lib/ts/IntrusiveDList.h b/lib/ts/IntrusiveDList.h
index 98a29f8..273d3d6 100644
--- a/lib/ts/IntrusiveDList.h
+++ b/lib/ts/IntrusiveDList.h
@@ -179,6 +179,7 @@ public:
/// Dereference.
/// @return A pointer to the referent.
pointer operator->() { return _elt; }
+
protected:
IntrusiveDList *_list; ///< List for this iterator.
T *_elt; ///< Referenced element.
diff --git a/lib/ts/Trie.h b/lib/ts/Trie.h
index 9737756..98207f0 100644
--- a/lib/ts/Trie.h
+++ b/lib/ts/Trie.h
@@ -51,6 +51,7 @@ public:
}
virtual ~Trie() { Clear(); }
+
private:
static const int N_NODE_CHILDREN = 256;
diff --git a/mgmt/ProxyConfig.h b/mgmt/ProxyConfig.h
index 0c9431e..24ef5eb 100644
--- a/mgmt/ProxyConfig.h
+++ b/mgmt/ProxyConfig.h
@@ -82,6 +82,7 @@ public:
operator bool() const { return ptr != 0; }
operator const ConfigType *() const { return ptr; }
const ConfigType *operator->() const { return ptr; }
+
private:
ConfigType *ptr;
};
diff --git a/mgmt/api/NetworkMessage.cc b/mgmt/api/NetworkMessage.cc
index 8073759..efb61c3 100644
--- a/mgmt/api/NetworkMessage.cc
+++ b/mgmt/api/NetworkMessage.cc
@@ -52,9 +52,8 @@ static const struct NetCmdOperation requests[] = {
/* EVENT_ACTIVE */ {2, {MGMT_MARSHALL_INT,
MGMT_MARSHALL_STRING}},
/* EVENT_REG_CALLBACK */ {2, {MGMT_MARSHALL_INT,
MGMT_MARSHALL_STRING}},
/* EVENT_UNREG_CALLBACK */ {2, {MGMT_MARSHALL_INT,
MGMT_MARSHALL_STRING}},
- /* EVENT_NOTIFY */ {3,
- {MGMT_MARSHALL_INT, MGMT_MARSHALL_STRING,
- MGMT_MARSHALL_STRING}}, // only msg sent
from TM to client
+ /* EVENT_NOTIFY */ {3, {MGMT_MARSHALL_INT,
MGMT_MARSHALL_STRING, MGMT_MARSHALL_STRING}}, // only msg sent from TM to
+
// client
/* SNAPSHOT_TAKE */ {2, {MGMT_MARSHALL_INT,
MGMT_MARSHALL_STRING}},
/* SNAPSHOT_RESTORE */ {2, {MGMT_MARSHALL_INT,
MGMT_MARSHALL_STRING}},
/* SNAPSHOT_REMOVE */ {2, {MGMT_MARSHALL_INT,
MGMT_MARSHALL_STRING}},
@@ -74,9 +73,8 @@ static const struct NetCmdOperation responses[] = {
/* FILE_READ */ {3, {MGMT_MARSHALL_INT, MGMT_MARSHALL_INT,
MGMT_MARSHALL_DATA}},
/* FILE_WRITE */ {1, {MGMT_MARSHALL_INT}},
/* RECORD_SET */ {2, {MGMT_MARSHALL_INT, MGMT_MARSHALL_INT}},
- /* RECORD_GET */ {5,
- {MGMT_MARSHALL_INT, MGMT_MARSHALL_INT,
MGMT_MARSHALL_INT, MGMT_MARSHALL_STRING,
- MGMT_MARSHALL_DATA}},
+ /* RECORD_GET */
+ {5, {MGMT_MARSHALL_INT, MGMT_MARSHALL_INT, MGMT_MARSHALL_INT,
MGMT_MARSHALL_STRING, MGMT_MARSHALL_DATA}},
/* PROXY_STATE_GET */ {2, {MGMT_MARSHALL_INT, MGMT_MARSHALL_INT}},
/* PROXY_STATE_SET */ {1, {MGMT_MARSHALL_INT}},
/* RECONFIGURE */ {1, {MGMT_MARSHALL_INT}},
@@ -95,18 +93,17 @@ static const struct NetCmdOperation responses[] = {
/* STATS_RESET_NODE */ {1, {MGMT_MARSHALL_INT}},
/* STATS_RESET_CLUSTER */ {1, {MGMT_MARSHALL_INT}},
/* STORAGE_DEVICE_CMD_OFFLINE */ {1, {MGMT_MARSHALL_INT}},
- /* RECORD_MATCH_GET */ {5,
- {MGMT_MARSHALL_INT, MGMT_MARSHALL_INT,
MGMT_MARSHALL_INT, MGMT_MARSHALL_STRING,
- MGMT_MARSHALL_DATA}},
+ /* RECORD_MATCH_GET */
+ {5, {MGMT_MARSHALL_INT, MGMT_MARSHALL_INT, MGMT_MARSHALL_INT,
MGMT_MARSHALL_STRING, MGMT_MARSHALL_DATA}},
/* API_PING */ {0, {}}, // no reply
/* SERVER_BACKTRACE */ {2, {MGMT_MARSHALL_INT,
MGMT_MARSHALL_STRING}},
- /* RECORD_DESCRIBE_CONFIG */ {15,
- {MGMT_MARSHALL_INT /* status */,
MGMT_MARSHALL_STRING /* name */,
- MGMT_MARSHALL_DATA /* value */,
MGMT_MARSHALL_DATA /* default */, MGMT_MARSHALL_INT /* type */,
- MGMT_MARSHALL_INT /* class */,
MGMT_MARSHALL_INT /* version */, MGMT_MARSHALL_INT /* rsb */,
- MGMT_MARSHALL_INT /* order */,
MGMT_MARSHALL_INT /* access */, MGMT_MARSHALL_INT /* update */,
- MGMT_MARSHALL_INT /* updatetype */,
MGMT_MARSHALL_INT /* checktype */,
- MGMT_MARSHALL_INT /* source */,
MGMT_MARSHALL_STRING /* checkexpr */}},
+ /* RECORD_DESCRIBE_CONFIG */
+ {15,
+ {MGMT_MARSHALL_INT /* status */, MGMT_MARSHALL_STRING /* name */,
MGMT_MARSHALL_DATA /* value */,
+ MGMT_MARSHALL_DATA /* default */, MGMT_MARSHALL_INT /* type */,
MGMT_MARSHALL_INT /* class */, MGMT_MARSHALL_INT /* version */,
+ MGMT_MARSHALL_INT /* rsb */, MGMT_MARSHALL_INT /* order */,
MGMT_MARSHALL_INT /* access */, MGMT_MARSHALL_INT /* update */,
+ MGMT_MARSHALL_INT /* updatetype */, MGMT_MARSHALL_INT /* checktype */,
MGMT_MARSHALL_INT /* source */,
+ MGMT_MARSHALL_STRING /* checkexpr */}},
/* LIFECYCLE_MESSAGE */ {1, {MGMT_MARSHALL_INT}},
};
diff --git a/plugins/esi/lib/Variables.h b/plugins/esi/lib/Variables.h
index 0fcb1c8..da1620b 100644
--- a/plugins/esi/lib/Variables.h
+++ b/plugins/esi/lib/Variables.h
@@ -98,6 +98,7 @@ public:
void clear();
virtual ~Variables() { _releaseCookieJar(); };
+
private:
Variables(const Variables &); // non-copyable
Variables &operator=(const Variables &); // non-copyable
diff --git a/plugins/experimental/mp4/mp4_meta.h
b/plugins/experimental/mp4/mp4_meta.h
index c43d6bf..160f4a2 100644
--- a/plugins/experimental/mp4/mp4_meta.h
+++ b/plugins/experimental/mp4/mp4_meta.h
@@ -360,6 +360,7 @@ public:
}
~Mp4Trak() {}
+
public:
uint32_t timescale;
int64_t duration;
diff --git a/plugins/experimental/stream_editor/stream_editor.cc
b/plugins/experimental/stream_editor/stream_editor.cc
index b1fcb1d..a36cb77 100644
--- a/plugins/experimental/stream_editor/stream_editor.cc
+++ b/plugins/experimental/stream_editor/stream_editor.cc
@@ -370,7 +370,7 @@ public:
if (!isspace(*(x - 1))) \
x = strcasestr(x + 1, str); \
else \
- break
+ break
class rule_t
{
diff --git a/plugins/experimental/webp_transform/ImageTransform.cc
b/plugins/experimental/webp_transform/ImageTransform.cc
index 7ee68d2..d881a71 100644
--- a/plugins/experimental/webp_transform/ImageTransform.cc
+++ b/plugins/experimental/webp_transform/ImageTransform.cc
@@ -76,6 +76,7 @@ public:
}
virtual ~ImageTransform() {}
+
private:
std::stringstream _img;
};
diff --git a/plugins/header_rewrite/operators.h
b/plugins/header_rewrite/operators.h
index 831b7f6..520d1ba 100644
--- a/plugins/header_rewrite/operators.h
+++ b/plugins/header_rewrite/operators.h
@@ -125,6 +125,7 @@ class OperatorNoOp : public Operator
{
public:
OperatorNoOp() { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for OperatorNoOp"); }
+
protected:
void exec(const Resources & /* res ATS_UNUSED */) const {};
@@ -176,6 +177,7 @@ class OperatorRMHeader : public OperatorHeaders
{
public:
OperatorRMHeader() { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for
OperatorRMHeader"); }
+
protected:
void exec(const Resources &res) const;
@@ -233,6 +235,7 @@ class OperatorRMCookie : public OperatorCookies
{
public:
OperatorRMCookie() { TSDebug(PLUGIN_NAME_DBG, "Calling CTOR for
OperatorRMCookie"); }
+
protected:
void exec(const Resources &res) const;
diff --git a/plugins/regex_remap/regex_remap.cc
b/plugins/regex_remap/regex_remap.cc
index 0fca36c..6957f39 100644
--- a/plugins/regex_remap/regex_remap.cc
+++ b/plugins/regex_remap/regex_remap.cc
@@ -919,7 +919,7 @@ TSRemapDeleteInstance(void *ih)
re = ri->first;
while (re) {
- RemapRegex::Override * override = re->get_overrides();
+ RemapRegex::Override *override = re->get_overrides();
while (override) {
RemapRegex::Override *tmp = override;
@@ -1037,7 +1037,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn txnp,
TSRemapRequestInfo *rri)
lowercase_substitutions = true;
}
- RemapRegex::Override * override = re->get_overrides();
+ RemapRegex::Override *override = re->get_overrides();
while (override) {
switch (override->type) {
diff --git a/proxy/CacheControl.cc b/proxy/CacheControl.cc
index d945b67..237ce7a 100644
--- a/proxy/CacheControl.cc
+++ b/proxy/CacheControl.cc
@@ -46,8 +46,16 @@ static const char modulePrefix[] = "[CacheControl]";
#define TWEAK_CACHE_RESPONSES_TO_COOKIES "cache-responses-to-cookies"
static const char *CC_directive_str[CC_NUM_TYPES] = {
- "INVALID", "REVALIDATE_AFTER", "NEVER_CACHE", "STANDARD_CACHE",
"IGNORE_NO_CACHE", "CLUSTER_CACHE_LOCAL",
- "IGNORE_CLIENT_NO_CACHE", "IGNORE_SERVER_NO_CACHE", "PIN_IN_CACHE",
"TTL_IN_CACHE"
+ "INVALID",
+ "REVALIDATE_AFTER",
+ "NEVER_CACHE",
+ "STANDARD_CACHE",
+ "IGNORE_NO_CACHE",
+ "CLUSTER_CACHE_LOCAL",
+ "IGNORE_CLIENT_NO_CACHE",
+ "IGNORE_SERVER_NO_CACHE",
+ "PIN_IN_CACHE",
+ "TTL_IN_CACHE"
// "CACHE_AUTH_CONTENT"
};
diff --git a/proxy/StatPages.h b/proxy/StatPages.h
index 5e5b640..ba78ec7 100644
--- a/proxy/StatPages.h
+++ b/proxy/StatPages.h
@@ -95,6 +95,7 @@ class BaseStatPagesHandler : public Continuation
public:
BaseStatPagesHandler(ProxyMutex *amutex) : Continuation(amutex),
response(NULL), response_size(0), response_length(0){};
~BaseStatPagesHandler() { resp_clear(); };
+
protected:
inkcoreapi void resp_clear(void);
inkcoreapi void resp_add(const char *fmt, ...);
diff --git a/proxy/http/remap/UrlRewrite.cc b/proxy/http/remap/UrlRewrite.cc
index 40d78ac..ef35a90 100644
--- a/proxy/http/remap/UrlRewrite.cc
+++ b/proxy/http/remap/UrlRewrite.cc
@@ -179,8 +179,9 @@ UrlRewrite::_destroyTable(InkHashTable *h_table)
void
UrlRewrite::Print()
{
- printf("URL Rewrite table with %d entries\n", num_rules_forward +
num_rules_reverse + num_rules_redirect_temporary +
- num_rules_redirect_permanent
+ num_rules_forward_with_recv_port);
+ printf("URL Rewrite table with %d entries\n",
+ num_rules_forward + num_rules_reverse + num_rules_redirect_temporary
+ num_rules_redirect_permanent +
+ num_rules_forward_with_recv_port);
printf(" Reverse Proxy is %s\n", (reverse_proxy == 0) ? "Off" : "On");
printf(" Forward Mapping Table with %d entries\n", num_rules_forward);
diff --git a/tools/jtest/jtest.cc b/tools/jtest/jtest.cc
index eae7deb..9305746 100644
--- a/tools/jtest/jtest.cc
+++ b/tools/jtest/jtest.cc
@@ -2875,18 +2875,19 @@ make_bfc_client(unsigned int addr, int port)
// coverity[dont_call]
reload_rate > drand48() ? "Pragma: no-cache\r\n" : "", eheaders,
"Host: localhost\r\n", rbuf, cookie);
} else {
- sprintf(fd[sock].req_header, ftp ? "GET ftp://%s:%d/%12.10f/%d%s%s
HTTP/1.0\r\n"
- "%s"
- "%s"
- "%s"
- "%s"
- "\r\n" :
- "GET http://%s:%d/%12.10f/%d%s%s
HTTP/1.0\r\n"
- "%s"
- "%s"
- "%s"
- "%s"
- "\r\n",
+ sprintf(fd[sock].req_header,
+ ftp ? "GET ftp://%s:%d/%12.10f/%d%s%s HTTP/1.0\r\n"
+ "%s"
+ "%s"
+ "%s"
+ "%s"
+ "\r\n" :
+ "GET http://%s:%d/%12.10f/%d%s%s HTTP/1.0\r\n"
+ "%s"
+ "%s"
+ "%s"
+ "%s"
+ "\r\n",
local_host, server_port, dr, fd[sock].response_length, evo_str,
extension,
fd[sock].keepalive ? "Proxy-Connection: Keep-Alive\r\n" : "",
// coverity[dont_call]
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
