You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2014/11/14 18:55:30 UTC
[1/5] trafficserver git commit: Remove trailing whitespace
Repository: trafficserver
Updated Branches:
refs/heads/master e9f057f45 -> ab5ba9a8a
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_hook.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_hook.c b/plugins/experimental/ts_lua/ts_lua_hook.c
index 1b27cf1..c77acab 100644
--- a/plugins/experimental/ts_lua/ts_lua_hook.c
+++ b/plugins/experimental/ts_lua/ts_lua_hook.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -200,7 +200,7 @@ ts_lua_add_hook(lua_State * L)
} else {
lua_pushvalue(L, 2);
lua_setglobal(L, TS_LUA_FUNCTION_G_POST_REMAP);
- }
+ }
break;
case TS_LUA_HOOK_OS_DNS:
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_hook.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_hook.h b/plugins/experimental/ts_lua/ts_lua_hook.h
index 3996899..e40e0b3 100644
--- a/plugins/experimental/ts_lua/ts_lua_hook.h
+++ b/plugins/experimental/ts_lua/ts_lua_hook.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_http.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_http.c b/plugins/experimental/ts_lua/ts_lua_http.c
index 0ceb0bb..c79680b 100644
--- a/plugins/experimental/ts_lua/ts_lua_http.c
+++ b/plugins/experimental/ts_lua/ts_lua_http.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_http.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_http.h b/plugins/experimental/ts_lua/ts_lua_http.h
index 0b70a4a..144af67 100644
--- a/plugins/experimental/ts_lua/ts_lua_http.h
+++ b/plugins/experimental/ts_lua/ts_lua_http.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_http_cntl.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_http_cntl.c b/plugins/experimental/ts_lua/ts_lua_http_cntl.c
index e88bf74..7ec8bec 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_cntl.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_cntl.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_http_cntl.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_http_cntl.h b/plugins/experimental/ts_lua/ts_lua_http_cntl.h
index 9613084..1bba7e7 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_cntl.h
+++ b/plugins/experimental/ts_lua/ts_lua_http_cntl.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_http_config.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_http_config.c b/plugins/experimental/ts_lua/ts_lua_http_config.c
index 9209e23..6fe190e 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_config.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_config.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_http_config.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_http_config.h b/plugins/experimental/ts_lua/ts_lua_http_config.h
index 0cf00f8..aa4eb46 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_config.h
+++ b/plugins/experimental/ts_lua/ts_lua_http_config.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_http_intercept.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_http_intercept.c b/plugins/experimental/ts_lua/ts_lua_http_intercept.c
index 6693d7c..47b37e9 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_intercept.c
+++ b/plugins/experimental/ts_lua/ts_lua_http_intercept.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_http_intercept.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_http_intercept.h b/plugins/experimental/ts_lua/ts_lua_http_intercept.h
index 2403e11..9709cb7 100644
--- a/plugins/experimental/ts_lua/ts_lua_http_intercept.h
+++ b/plugins/experimental/ts_lua/ts_lua_http_intercept.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_log.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_log.c b/plugins/experimental/ts_lua/ts_lua_log.c
index b0861c2..fcf9226 100644
--- a/plugins/experimental/ts_lua/ts_lua_log.c
+++ b/plugins/experimental/ts_lua/ts_lua_log.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_log.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_log.h b/plugins/experimental/ts_lua/ts_lua_log.h
index 4029c2d..90f9964 100644
--- a/plugins/experimental/ts_lua/ts_lua_log.h
+++ b/plugins/experimental/ts_lua/ts_lua_log.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_mgmt.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_mgmt.c b/plugins/experimental/ts_lua/ts_lua_mgmt.c
index 2bfd5b7..8cffd48 100644
--- a/plugins/experimental/ts_lua/ts_lua_mgmt.c
+++ b/plugins/experimental/ts_lua/ts_lua_mgmt.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_mgmt.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_mgmt.h b/plugins/experimental/ts_lua/ts_lua_mgmt.h
index d6d79e0..78b5c9b 100644
--- a/plugins/experimental/ts_lua/ts_lua_mgmt.h
+++ b/plugins/experimental/ts_lua/ts_lua_mgmt.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_misc.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_misc.c b/plugins/experimental/ts_lua/ts_lua_misc.c
index f20a1df..e18c0ae 100644
--- a/plugins/experimental/ts_lua/ts_lua_misc.c
+++ b/plugins/experimental/ts_lua/ts_lua_misc.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_misc.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_misc.h b/plugins/experimental/ts_lua/ts_lua_misc.h
index 3ce86cc..ebc9dc7 100644
--- a/plugins/experimental/ts_lua/ts_lua_misc.h
+++ b/plugins/experimental/ts_lua/ts_lua_misc.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_package.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_package.c b/plugins/experimental/ts_lua/ts_lua_package.c
index ab5096d..a985340 100644
--- a/plugins/experimental/ts_lua/ts_lua_package.c
+++ b/plugins/experimental/ts_lua/ts_lua_package.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_package.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_package.h b/plugins/experimental/ts_lua/ts_lua_package.h
index ae5a467..4f32f79 100644
--- a/plugins/experimental/ts_lua/ts_lua_package.h
+++ b/plugins/experimental/ts_lua/ts_lua_package.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_remap.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_remap.c b/plugins/experimental/ts_lua/ts_lua_remap.c
index 4df7ccf..058e821 100644
--- a/plugins/experimental/ts_lua/ts_lua_remap.c
+++ b/plugins/experimental/ts_lua/ts_lua_remap.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_remap.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_remap.h b/plugins/experimental/ts_lua/ts_lua_remap.h
index ef24ac2..eae67c2 100644
--- a/plugins/experimental/ts_lua/ts_lua_remap.h
+++ b/plugins/experimental/ts_lua/ts_lua_remap.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_server_request.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_server_request.c b/plugins/experimental/ts_lua/ts_lua_server_request.c
index 4f43ea4..b0d11ca 100644
--- a/plugins/experimental/ts_lua/ts_lua_server_request.c
+++ b/plugins/experimental/ts_lua/ts_lua_server_request.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_server_request.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_server_request.h b/plugins/experimental/ts_lua/ts_lua_server_request.h
index 40d5d09..3f3226f 100644
--- a/plugins/experimental/ts_lua/ts_lua_server_request.h
+++ b/plugins/experimental/ts_lua/ts_lua_server_request.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_server_response.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_server_response.c b/plugins/experimental/ts_lua/ts_lua_server_response.c
index 55a2a63..6a0bbd0 100644
--- a/plugins/experimental/ts_lua/ts_lua_server_response.c
+++ b/plugins/experimental/ts_lua/ts_lua_server_response.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_server_response.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_server_response.h b/plugins/experimental/ts_lua/ts_lua_server_response.h
index 9e89069..a5b8033 100644
--- a/plugins/experimental/ts_lua/ts_lua_server_response.h
+++ b/plugins/experimental/ts_lua/ts_lua_server_response.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_string.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_string.c b/plugins/experimental/ts_lua/ts_lua_string.c
index 40511c5..1aea555 100644
--- a/plugins/experimental/ts_lua/ts_lua_string.c
+++ b/plugins/experimental/ts_lua/ts_lua_string.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_string.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_string.h b/plugins/experimental/ts_lua/ts_lua_string.h
index 2d67468..1a509e8 100644
--- a/plugins/experimental/ts_lua/ts_lua_string.h
+++ b/plugins/experimental/ts_lua/ts_lua_string.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_transform.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_transform.c b/plugins/experimental/ts_lua/ts_lua_transform.c
index b480c86..bfb26e0 100644
--- a/plugins/experimental/ts_lua/ts_lua_transform.c
+++ b/plugins/experimental/ts_lua/ts_lua_transform.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_transform.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_transform.h b/plugins/experimental/ts_lua/ts_lua_transform.h
index b05294e..8c9bb22 100644
--- a/plugins/experimental/ts_lua/ts_lua_transform.h
+++ b/plugins/experimental/ts_lua/ts_lua_transform.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_util.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_util.c b/plugins/experimental/ts_lua/ts_lua_util.c
index 5304531..868618d 100644
--- a/plugins/experimental/ts_lua/ts_lua_util.c
+++ b/plugins/experimental/ts_lua/ts_lua_util.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -132,7 +132,7 @@ ts_lua_add_module(ts_lua_instance_conf * conf, ts_lua_main_ctx * arr, int n, int
return -1;
}
- } else if (conf->script) {
+ } else if (conf->script) {
if (luaL_loadfile(L, conf->script)) {
TSError("[%s] luaL_loadfile %s failed: %s", __FUNCTION__, conf->script, lua_tostring(L, -1));
lua_pop(L, 1);
@@ -639,7 +639,7 @@ ts_lua_http_cont_handler(TSCont contp, TSEvent event, void *edata)
if (lua_pcall(l, 0, 1, 0)) {
TSError("lua_pcall failed: %s", lua_tostring(l, -1));
}
-
+
ret = lua_tointeger(l, -1);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_util.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_util.h b/plugins/experimental/ts_lua/ts_lua_util.h
index efd1b3a..9eafeae 100644
--- a/plugins/experimental/ts_lua/ts_lua_util.h
+++ b/plugins/experimental/ts_lua/ts_lua_util.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/gzip/configuration.cc
----------------------------------------------------------------------
diff --git a/plugins/gzip/configuration.cc b/plugins/gzip/configuration.cc
index 5e69c5c..2ea6472 100644
--- a/plugins/gzip/configuration.cc
+++ b/plugins/gzip/configuration.cc
@@ -130,7 +130,7 @@ namespace Gzip {
bool HostConfiguration::ContentTypeIsCompressible(const char * content_type, int content_type_length) {
string scontent_type(content_type, content_type_length);
bool is_match = false;
-
+
for (size_t i = 0; i < compressible_content_types_.size(); i++) {
const char* match_string = compressible_content_types_[i].c_str();
bool exclude = match_string[0] == '!';
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/gzip/configuration.h
----------------------------------------------------------------------
diff --git a/plugins/gzip/configuration.h b/plugins/gzip/configuration.h
index b38cb64..da11b35 100644
--- a/plugins/gzip/configuration.h
+++ b/plugins/gzip/configuration.h
@@ -29,7 +29,7 @@
#include <vector>
#include "debug_macros.h"
-namespace Gzip {
+namespace Gzip {
class HostConfiguration {
public: //todo -> only configuration should be able to construct hostconfig
explicit HostConfiguration(const std::string & host)
@@ -40,11 +40,11 @@ namespace Gzip {
{}
inline bool enabled() { return enabled_; }
- inline void set_enabled(bool x) { enabled_ = x; }
+ inline void set_enabled(bool x) { enabled_ = x; }
inline bool cache() { return cache_; }
- inline void set_cache(bool x) { cache_ = x; }
+ inline void set_cache(bool x) { cache_ = x; }
inline bool remove_accept_encoding() { return remove_accept_encoding_; }
- inline void set_remove_accept_encoding(bool x) { remove_accept_encoding_ = x; }
+ inline void set_remove_accept_encoding(bool x) { remove_accept_encoding_ = x; }
inline std::string host() { return host_; }
void add_disallow(const std::string & disallow);
void add_compressible_content_type(const std::string & content_type);
@@ -65,7 +65,7 @@ namespace Gzip {
friend class HostConfiguration;
public:
static Configuration * Parse(const char * path);
- HostConfiguration * Find(const char * host, int host_length);
+ HostConfiguration * Find(const char * host, int host_length);
inline HostConfiguration * GlobalConfiguration() {
return host_configurations_[0];
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/gzip/gzip.cc
----------------------------------------------------------------------
diff --git a/plugins/gzip/gzip.cc b/plugins/gzip/gzip.cc
index ba42fdb..2da9a1d 100644
--- a/plugins/gzip/gzip.cc
+++ b/plugins/gzip/gzip.cc
@@ -43,9 +43,9 @@ using namespace Gzip;
// from mod_deflate:
// ZLIB's compression algorithm uses a
-// 0-9 based scale that GZIP does where '1' is 'Best speed'
-// and '9' is 'Best compression'. Testing has proved level '6'
-// to be about the best level to use in an HTTP Server.
+// 0-9 based scale that GZIP does where '1' is 'Best speed'
+// and '9' is 'Best compression'. Testing has proved level '6'
+// to be about the best level to use in an HTTP Server.
const int ZLIB_COMPRESSION_LEVEL = 6;
@@ -152,7 +152,7 @@ gzip_vary_header(TSMBuffer bufp, TSMLoc hdr_loc)
ce_loc = TSMimeHdrFieldFind(bufp, hdr_loc, "Vary", sizeof("Vary") - 1);
if (ce_loc) {
- int idx, count, len;
+ int idx, count, len;
const char *value;
count = TSMimeHdrFieldValuesCount(bufp, hdr_loc, ce_loc);
@@ -558,7 +558,7 @@ gzip_transformable(TSHttpTxn txnp, int server, HostConfiguration * host_configur
value = TSMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, -1, &len);
int rv = host_configuration->ContentTypeIsCompressible(value, len);
- if (!rv) {
+ if (!rv) {
info("content-type [%.*s] not compressible", len, value);
}
TSHandleMLocRelease(bufp, hdr_loc, field_loc);
@@ -584,7 +584,7 @@ gzip_transform_add(TSHttpTxn txnp, int /* server ATS_UNUSED */, HostConfiguratio
if (!hc->cache()) {
TSHttpTxnTransformedRespCache(txnp, 0);
- } else {
+ } else {
TSHttpTxnTransformedRespCache(txnp, 1);
}
@@ -620,7 +620,7 @@ cache_transformable(TSHttpTxn txnp)
return 0;
}
-HostConfiguration *
+HostConfiguration *
find_host_configuration(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer bufp, TSMLoc locp)
{
TSMLoc fieldp = TSMimeHdrFieldFind(bufp, locp, TS_MIME_FIELD_HOST, TS_MIME_LEN_HOST);
@@ -630,7 +630,7 @@ find_host_configuration(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer bufp, TSMLoc
const char *strv = TSMimeHdrFieldValueStringGet(bufp, locp, fieldp, -1, &strl);
TSHandleMLocRelease(bufp, locp, fieldp);
- HostConfiguration * host_configuration = config->Find(strv, strl);
+ HostConfiguration * host_configuration = config->Find(strv, strl);
return host_configuration;
}
@@ -661,7 +661,7 @@ transform_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
TSHttpTxnArgSet(txnp, arg_idx_url_disallowed, (void *) &GZIP_ONE);
info("url [%.*s] not allowed", url_len, url);
} else {
- normalize_accept_encoding(txnp, req_buf, req_loc);
+ normalize_accept_encoding(txnp, req_buf, req_loc);
}
TSfree(url);
TSHandleMLocRelease(req_buf, TS_NULL_MLOC, req_loc);
@@ -675,7 +675,7 @@ transform_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
//os: the accept encoding header needs to be restored..
//otherwise the next request won't get a cache hit on this
HostConfiguration * hc = (HostConfiguration*)TSHttpTxnArgGet(txnp, arg_idx_host_configuration);
- if (hc != NULL) {
+ if (hc != NULL) {
if (hc->remove_accept_encoding()) {
TSMBuffer req_buf;
TSMLoc req_loc;
@@ -715,7 +715,7 @@ transform_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
{
int allowed = !TSHttpTxnArgGet(txnp, arg_idx_url_disallowed);
HostConfiguration * hc = (HostConfiguration*)TSHttpTxnArgGet(txnp, arg_idx_host_configuration);
- if ( hc != NULL ) {
+ if ( hc != NULL ) {
if (allowed && cache_transformable(txnp) && gzip_transformable(txnp, 0, hc, &compress_type)) {
gzip_transform_add(txnp, 0, hc, compress_type);
}
@@ -764,7 +764,7 @@ TSPluginInit(int argc, const char *argv[])
if (argc > 2) {
fatal("the gzip plugin does not accept more than 1 plugin argument");
- } else if (argc == 2) {
+ } else if (argc == 2) {
config_path = std::string(argv[1]);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/gzip/misc.cc
----------------------------------------------------------------------
diff --git a/plugins/gzip/misc.cc b/plugins/gzip/misc.cc
index 7e88b9a..2bc7aeb 100644
--- a/plugins/gzip/misc.cc
+++ b/plugins/gzip/misc.cc
@@ -48,8 +48,8 @@ normalize_accept_encoding(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer reqp, TSMLo
int deflate = 0;
int gzip = 0;
- //remove the accept encoding field(s),
- //while finding out if gzip or deflate is supported.
+ //remove the accept encoding field(s),
+ //while finding out if gzip or deflate is supported.
while (field) {
TSMLoc tmp;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/regex_remap/regex_remap.cc
----------------------------------------------------------------------
diff --git a/plugins/regex_remap/regex_remap.cc b/plugins/regex_remap/regex_remap.cc
index 5823af3..3c61c4a 100644
--- a/plugins/regex_remap/regex_remap.cc
+++ b/plugins/regex_remap/regex_remap.cc
@@ -1028,7 +1028,7 @@ TSRemapDoRemap(void* ih, TSHttpTxn txnp, TSRemapRequestInfo *rri)
}
-
+
/*
local variables:
mode: C++
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/CacheControl.cc
----------------------------------------------------------------------
diff --git a/proxy/CacheControl.cc b/proxy/CacheControl.cc
index 6ede297..2a2c2be 100644
--- a/proxy/CacheControl.cc
+++ b/proxy/CacheControl.cc
@@ -193,12 +193,12 @@ getCacheControl(CacheControlResult *result, HttpRequestData *rdata, OverridableH
}
}
-bool
+bool
getClusterCacheLocal(URL *url, char * /* hostname ATS_UNUSED */)
{
HttpRequestData rdata;
CacheControlResult result;
- HTTPHdr req_hdr;
+ HTTPHdr req_hdr;
req_hdr.create(HTTP_TYPE_REQUEST, NULL);
req_hdr.url_set(url);
@@ -495,7 +495,7 @@ CacheControlRecord::UpdateMatch(CacheControlResult * result, RequestData * rdata
result->cache_responses_to_cookies);
else
crtc_debug[0] = 0;
-
+
Debug("cache_control", "Matched with for %s at line %d%s", CC_directive_str[this->directive],
this->line_num, crtc_debug);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/ControlMatcher.cc
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index 561bf6b..226e136 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -311,7 +311,7 @@ template<class Data, class Result> char *UrlMatcher<Data, Result>::NewEntry(matc
matcher_name, line_info->line_num);
return errBuf;
}
-
+
// Remove our consumed label from the parsed line
line_info->line[0][line_info->dest_entry] = 0;
line_info->num_el--;
@@ -339,7 +339,7 @@ template<class Data, class Result> void UrlMatcher<Data, Result>::Match(RequestD
{
char *url_str;
int *value;
-
+
// Check to see there is any work to before we copy the
// URL
if (num_el <= 0) {
@@ -354,7 +354,7 @@ template<class Data, class Result> void UrlMatcher<Data, Result>::Match(RequestD
url_str = ats_strdup("");
}
- if (ink_hash_table_lookup(url_ht, url_str, (void **)&value)) {
+ if (ink_hash_table_lookup(url_ht, url_str, (void **)&value)) {
Debug("matcher", "%s Matched %s with url at line %d", matcher_name, url_str, data_array[*value].line_num);
data_array[*value].UpdateMatch(result, rdata);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/ControlMatcher.h
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.h b/proxy/ControlMatcher.h
index 081b5f3..801a6b9 100644
--- a/proxy/ControlMatcher.h
+++ b/proxy/ControlMatcher.h
@@ -145,7 +145,7 @@ public:
HttpRequestData()
: hdr(NULL), hostname_str(NULL), api_info(NULL), xact_start(0), incoming_port(0), tag(NULL)
- {
+ {
ink_zero(src_ip);
ink_zero(dest_ip);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/CoreUtils.cc
----------------------------------------------------------------------
diff --git a/proxy/CoreUtils.cc b/proxy/CoreUtils.cc
index ea0b912..31eb50e 100644
--- a/proxy/CoreUtils.cc
+++ b/proxy/CoreUtils.cc
@@ -844,12 +844,12 @@ CoreUtils::process_NetVC(UnixNetVConnection * nvc_test)
if (read_from_core((intptr_t) nvc_test, sizeof(UnixNetVConnection), buf) != -1) {
UnixNetVConnection *loaded_nvc = (UnixNetVConnection *) buf;
-
+
// Probably not 64-bit safe. /leif
char addrbuf[INET6_ADDRSTRLEN];
printf("----------- UnixNetVConnection @ 0x%p ----------\n", nvc_test);
printf(" ip: %s port: %d\n",
- ats_ip_ntop(&loaded_nvc->server_addr.sa, addrbuf, sizeof(addrbuf)),
+ ats_ip_ntop(&loaded_nvc->server_addr.sa, addrbuf, sizeof(addrbuf)),
ats_ip_port_host_order(&loaded_nvc->server_addr));
printf(" closed: %d\n\n", loaded_nvc->closed);
printf(" read state: \n");
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/FetchSM.cc
----------------------------------------------------------------------
diff --git a/proxy/FetchSM.cc b/proxy/FetchSM.cc
index 18bbcd8..91d1111 100644
--- a/proxy/FetchSM.cc
+++ b/proxy/FetchSM.cc
@@ -192,7 +192,7 @@ FetchSM::check_connection_close()
{
static char const CLOSE_TEXT[] = "close";
static size_t const CLOSE_LEN = sizeof(CLOSE_TEXT) - 1;
-
+
if (resp_received_close < 0) {
resp_received_close = static_cast<int>(this->check_for_field_value(MIME_FIELD_CONNECTION, MIME_LEN_CONNECTION, CLOSE_TEXT, CLOSE_LEN));
}
@@ -254,12 +254,12 @@ FetchSM::InvokePluginExt(int fetch_event)
}
}
- // TS-3112: always check 'contp' after handleEvent()
+ // TS-3112: always check 'contp' after handleEvent()
// since handleEvent effectively calls the plugin (or SPDY layer)
- // which may call TSFetchDestroy in error conditions.
- // TSFetchDestroy sets contp to NULL, but, doesn't destroy FetchSM yet,
- // since, it¹s in a tight loop protected by 'recursion' counter.
- // When handleEvent returns, 'recursion' is decremented and contp is
+ // which may call TSFetchDestroy in error conditions.
+ // TSFetchDestroy sets contp to NULL, but, doesn't destroy FetchSM yet,
+ // since, it¹s in a tight loop protected by 'recursion' counter.
+ // When handleEvent returns, 'recursion' is decremented and contp is
// already null, so, FetchSM gets destroyed.
if (!contp)
goto out;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/ICP.cc
----------------------------------------------------------------------
diff --git a/proxy/ICP.cc b/proxy/ICP.cc
index 71afe9d..c7d6aa9 100644
--- a/proxy/ICP.cc
+++ b/proxy/ICP.cc
@@ -1889,7 +1889,7 @@ ICPProcessor::ICPQuery(Continuation * c, URL * url)
ICPRequestCont *rc = new(ICPRequestCont_allocator.alloc()) ICPRequestCont(this, c, url);
ICP_INCREMENT_DYN_STAT(icp_query_requests_stat);
-
+
rc->SetRequestStartTime();
SET_CONTINUATION_HANDLER(rc, (ICPRequestContHandler) & ICPRequestCont::ICPRequestEvent);
eventProcessor.schedule_imm(rc, ET_ICP);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/IPAllow.h
----------------------------------------------------------------------
diff --git a/proxy/IPAllow.h b/proxy/IPAllow.h
index 695d351..4e07c1a 100644
--- a/proxy/IPAllow.h
+++ b/proxy/IPAllow.h
@@ -81,7 +81,7 @@ struct AclRecord {
bool isMethodAllowed(int method_wksidx) const {
return _method_mask & MethodIdxToMask(method_wksidx);
}
-
+
bool isNonstandardMethodAllowed(const std::string &method_str) const {
if (_method_mask == ALL_METHOD_MASK) {
return true;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 3ce524d..5033d91 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -3939,7 +3939,7 @@ TSCacheKeyDigestSet(TSCacheKey key, const char *input, int length)
sdk_assert(sdk_sanity_check_iocore_structure((void*) input) == TS_SUCCESS);
sdk_assert(length > 0);
CacheInfo* ci = reinterpret_cast<CacheInfo*>(key);
-
+
if (ci->magic != CACHE_INFO_MAGIC_ALIVE)
return TS_ERROR;
@@ -8710,18 +8710,18 @@ TSVConnTunnel(TSVConn sslp)
}
TSSslConnection
-TSVConnSSLConnectionGet(TSVConn sslp)
+TSVConnSSLConnectionGet(TSVConn sslp)
{
TSSslConnection ssl = NULL;
NetVConnection *vc = reinterpret_cast<NetVConnection*>(sslp);
SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection*>(vc);
if (ssl_vc != NULL) {
ssl = reinterpret_cast<TSSslConnection>(ssl_vc->ssl);
- }
+ }
return ssl;
}
-tsapi TSSslContext TSSslContextFindByName(const char *name)
+tsapi TSSslContext TSSslContextFindByName(const char *name)
{
TSSslContext ret = NULL;
SSLCertLookup *lookup = SSLCertificateConfig::acquire();
@@ -8750,7 +8750,7 @@ tsapi TSSslContext TSSslContextFindByAddr(struct sockaddr const* addr)
return ret;
}
-tsapi int TSVConnIsSsl(TSVConn sslp)
+tsapi int TSVConnIsSsl(TSVConn sslp)
{
NetVConnection *vc = reinterpret_cast<NetVConnection*>(sslp);
SSLNetVConnection *ssl_vc = dynamic_cast<SSLNetVConnection*>(vc);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/InkAPIInternal.h
----------------------------------------------------------------------
diff --git a/proxy/InkAPIInternal.h b/proxy/InkAPIInternal.h
index 319291b..79a948b 100644
--- a/proxy/InkAPIInternal.h
+++ b/proxy/InkAPIInternal.h
@@ -294,7 +294,7 @@ typedef enum {
TS_SSL_INTERNAL_FIRST_HOOK,
TS_VCONN_PRE_ACCEPT_INTERNAL_HOOK = TS_SSL_INTERNAL_FIRST_HOOK,
TS_SSL_SNI_INTERNAL_HOOK,
- TS_SSL_INTERNAL_LAST_HOOK
+ TS_SSL_INTERNAL_LAST_HOOK
} TSSslHookInternalID;
class SslAPIHooks : public FeatureAPIHooks<TSSslHookInternalID, TS_SSL_INTERNAL_LAST_HOOK>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/InkAPITestTool.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPITestTool.cc b/proxy/InkAPITestTool.cc
index bb902e5..3dbe2ee 100644
--- a/proxy/InkAPITestTool.cc
+++ b/proxy/InkAPITestTool.cc
@@ -427,7 +427,7 @@ static ClientTxn *
synclient_txn_create(void)
{
HttpProxyPort* proxy_port;
-
+
ClientTxn *txn = (ClientTxn *) TSmalloc(sizeof(ClientTxn));
if (0 == (proxy_port = HttpProxyPort::findHttp(AF_INET)))
txn->connect_port = PROXY_HTTP_DEFAULT_PORT;
@@ -499,7 +499,7 @@ synclient_txn_send_request(ClientTxn * txn, char *request)
cont = TSContCreate(synclient_txn_main_handler, TSMutexCreate());
TSContDataSet(cont, txn);
-
+
ats_ip4_set(&addr, txn->connect_ip, htons(txn->connect_port));
TSNetConnect(cont, ats_ip_sa_cast(&addr));
return 1;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/InkIOCoreAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkIOCoreAPI.cc b/proxy/InkIOCoreAPI.cc
index 59235db..29634c6 100644
--- a/proxy/InkIOCoreAPI.cc
+++ b/proxy/InkIOCoreAPI.cc
@@ -362,14 +362,14 @@ INKBasedTimeGet()
TSAction
INKUDPBind(TSCont contp, unsigned int ip, int port)
-{
+{
sdk_assert(sdk_sanity_check_continuation(contp) == TS_SUCCESS);
-
+
FORCE_PLUGIN_MUTEX(contp);
struct sockaddr_in addr;
ats_ip4_set(&addr, ip, htons(port));
-
+
return reinterpret_cast<TSAction>(udpNet.UDPBind((Continuation *)contp, ats_ip_sa_cast(&addr), INK_ETHERNET_MTU_SIZE, INK_ETHERNET_MTU_SIZE));
}
@@ -485,7 +485,7 @@ INKUDPPacketGet(INKUDPacketQueue queuep)
packet = qp->pop();
return (packet);
- }
+ }
return NULL;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/PluginVC.cc
----------------------------------------------------------------------
diff --git a/proxy/PluginVC.cc b/proxy/PluginVC.cc
index f7db604..a271312 100644
--- a/proxy/PluginVC.cc
+++ b/proxy/PluginVC.cc
@@ -806,8 +806,8 @@ PluginVC::setup_event_cb(ink_hrtime in, Event ** e_ptr)
{
*e_ptr = eventProcessor.schedule_imm(this);
}
- }
- else
+ }
+ else
{
if(this_ethread()->tt == REGULAR) {
*e_ptr = this_ethread()->schedule_in_local(this,in);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/ReverseProxy.cc
----------------------------------------------------------------------
diff --git a/proxy/ReverseProxy.cc b/proxy/ReverseProxy.cc
index a69206a..a2ae22d 100644
--- a/proxy/ReverseProxy.cc
+++ b/proxy/ReverseProxy.cc
@@ -121,7 +121,7 @@ response_url_remap(HTTPHdr *response_header)
{
return rewrite_table ? rewrite_table->ReverseMap(response_header) : false;
}
-
+
//
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/StatSystem.cc
----------------------------------------------------------------------
diff --git a/proxy/StatSystem.cc b/proxy/StatSystem.cc
index 3dd8a5e..87e4d5e 100644
--- a/proxy/StatSystem.cc
+++ b/proxy/StatSystem.cc
@@ -506,7 +506,7 @@ initialize_all_global_stats()
}
}
- // TODO: HMMMM, wtf does this do? The following is that this
+ // TODO: HMMMM, wtf does this do? The following is that this
// function does:
// ink_atomic_swap(&this->f_update_lock, (void *) func)
//
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/Transform.cc
----------------------------------------------------------------------
diff --git a/proxy/Transform.cc b/proxy/Transform.cc
index 9f2366d..4604cca 100644
--- a/proxy/Transform.cc
+++ b/proxy/Transform.cc
@@ -561,7 +561,7 @@ TransformControl::handle_event(int event, void * /* edata ATS_UNUSED */)
case TRANSFORM_READ_READY:
{
MIOBuffer *buf = new_empty_MIOBuffer();
-
+
m_read_buf = buf->alloc_reader();
m_tvc->do_io_read(this, INT64_MAX, buf);
break;
@@ -998,7 +998,7 @@ RangeTransform::change_response_header()
MIMEField *field;
char *reason_phrase;
HTTPStatus status_code;
-
+
ink_release_assert(m_transform_resp);
status_code = HTTP_STATUS_PARTIAL_CONTENT;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/TransformInternal.h
----------------------------------------------------------------------
diff --git a/proxy/TransformInternal.h b/proxy/TransformInternal.h
index 25ba297..1e60b84 100644
--- a/proxy/TransformInternal.h
+++ b/proxy/TransformInternal.h
@@ -135,8 +135,8 @@ public:
public:
MIOBuffer * m_output_buf;
IOBufferReader *m_output_reader;
-
-
+
+
// MIMEField *m_range_field;
HTTPHdr *m_transform_resp;
VIO *m_output_vio;
@@ -149,7 +149,7 @@ public:
RangeRecord *m_ranges;
int64_t m_output_cl;
int64_t m_done;
-
+
};
#define PREFETCH
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/api/ts/experimental.h
----------------------------------------------------------------------
diff --git a/proxy/api/ts/experimental.h b/proxy/api/ts/experimental.h
index f82ff17..006ddbc 100644
--- a/proxy/api/ts/experimental.h
+++ b/proxy/api/ts/experimental.h
@@ -21,7 +21,7 @@
limitations under the License.
*/
-/*
+/*
* Interfaces in this header file are experimental, undocumented and
* are subject to change even across minor releases of Traffic Server.
* None of the interfaces in this file are committed to be stable
@@ -56,7 +56,7 @@ extern "C"
typedef struct tsapi_fetchsm* TSFetchSM;
- /* Forward declaration of in_addr, any user of these APIs should probably
+ /* Forward declaration of in_addr, any user of these APIs should probably
include net/netinet.h or whatever is appropriate on the platform. */
struct in_addr;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/api/ts/ts.h
----------------------------------------------------------------------
diff --git a/proxy/api/ts/ts.h b/proxy/api/ts/ts.h
index ef6fe84..b5b0abe 100644
--- a/proxy/api/ts/ts.h
+++ b/proxy/api/ts/ts.h
@@ -1370,44 +1370,44 @@ extern "C"
/** Change packet firewall mark for the client side connection
*
@note The change takes effect immediately
-
+
@return TS_SUCCESS if the client connection was modified
*/
tsapi TSReturnCode TSHttpTxnClientPacketMarkSet(TSHttpTxn txnp, int mark);
-
+
/** Change packet firewall mark for the server side connection
*
@note The change takes effect immediately, if no OS connection has been
made, then this sets the mark that will be used IF an OS connection
is established
-
+
@return TS_SUCCESS if the (future?) server connection was modified
*/
tsapi TSReturnCode TSHttpTxnServerPacketMarkSet(TSHttpTxn txnp, int mark);
-
+
/** Change packet TOS for the client side connection
*
@note The change takes effect immediately
-
+
@note TOS is deprecated and replaced by DSCP, this is still used to
set DSCP however the first 2 bits of this value will be ignored as
they now belong to the ECN field.
-
+
@return TS_SUCCESS if the client connection was modified
*/
tsapi TSReturnCode TSHttpTxnClientPacketTosSet(TSHttpTxn txnp, int tos);
-
+
/** Change packet TOS for the server side connection
*
-
+
@note The change takes effect immediately, if no OS connection has been
made, then this sets the mark that will be used IF an OS connection
is established
-
+
@note TOS is deprecated and replaced by DSCP, this is still used to
set DSCP however the first 2 bits of this value will be ignored as
they now belong to the ECN field.
-
+
@return TS_SUCCESS if the (future?) server connection was modified
*/
tsapi TSReturnCode TSHttpTxnServerPacketTosSet(TSHttpTxn txnp, int tos);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/congest/CongestionDB.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/CongestionDB.cc b/proxy/congest/CongestionDB.cc
index 4179cc5..e9fda61 100644
--- a/proxy/congest/CongestionDB.cc
+++ b/proxy/congest/CongestionDB.cc
@@ -616,7 +616,7 @@ remove_congested_entry(char *buf, MIOBuffer * out_buffer)
} else if (strncasecmp(buf, "ip=", 3) == 0) {
IpEndpoint ip;
memset(&ip, 0, sizeof(ip));
-
+
char *p = buf + 3;
char *prefix = strchr(p, '/');
int prelen = 0;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/congest/CongestionTest.cc
----------------------------------------------------------------------
diff --git a/proxy/congest/CongestionTest.cc b/proxy/congest/CongestionTest.cc
index 26b4baf..5ef0da4 100644
--- a/proxy/congest/CongestionTest.cc
+++ b/proxy/congest/CongestionTest.cc
@@ -470,7 +470,7 @@ CCCongestionDBTestCont::mainEvent(int /* event ATS_UNUSED */, Event * /* e ATS_U
IpEndpoint ip;
ats_ip4_set(&ip, i + 255);
-
+
CongestionEntry *tmp = gen_CongestionEntry(&ip.sa);
db->addRecord(tmp->m_key, tmp);
}
@@ -508,7 +508,7 @@ CCCongestionDBTestCont::mainEvent(int /* event ATS_UNUSED */, Event * /* e ATS_U
IpEndpoint ip;
ats_ip4_set(&ip, i + 255);
-
+
CongestionEntry *tmp = gen_CongestionEntry(&ip.sa, 1);
db->addRecord(tmp->m_key, tmp);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/hdrs/HTTP.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HTTP.cc b/proxy/hdrs/HTTP.cc
index e637826..2bdc58e 100644
--- a/proxy/hdrs/HTTP.cc
+++ b/proxy/hdrs/HTTP.cc
@@ -1578,7 +1578,7 @@ class UrlPrintHack {
bool is_valid() const {
return 0 != m_hdr;
}
-
+
/// Saved values.
///@{
bool m_host_modified_p;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/hdrs/HdrHeap.h
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrHeap.h b/proxy/hdrs/HdrHeap.h
index dfe01ce..d29426c 100644
--- a/proxy/hdrs/HdrHeap.h
+++ b/proxy/hdrs/HdrHeap.h
@@ -51,10 +51,10 @@
// heaps are hand unrolled in the code. Chaning
// this value requires a full pass through HdrBuf.cc
// to fix the unrolled operations
-#define HDR_BUF_RONLY_HEAPS 3
+#define HDR_BUF_RONLY_HEAPS 3
#define HDR_HEAP_DEFAULT_SIZE 2048
-#define HDR_STR_HEAP_DEFAULT_SIZE 2048
+#define HDR_STR_HEAP_DEFAULT_SIZE 2048
#define HDR_MAX_ALLOC_SIZE (HDR_HEAP_DEFAULT_SIZE - sizeof(HdrHeap))
#define HDR_HEAP_HDR_SIZE ROUND(sizeof(HdrHeap), HDR_PTR_SIZE)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/hdrs/HdrTest.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrTest.cc b/proxy/hdrs/HdrTest.cc
index 23ae826..2aad736 100644
--- a/proxy/hdrs/HdrTest.cc
+++ b/proxy/hdrs/HdrTest.cc
@@ -1628,15 +1628,15 @@ HdrTest::test_regex()
{
DFA dfa;
int status = 1;
-
+
const char *test_harness[] = {
"foo",
"(.*\\.apache\\.org)",
"(.*\\.example\\.com)"
};
-
+
bri_box("test_regex");
-
+
dfa.compile(test_harness,SIZEOF(test_harness));
status = status & (dfa.match("trafficserver.apache.org") == 1);
status = status & (dfa.match("www.example.com") == 2);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/hdrs/HdrToken.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/HdrToken.cc b/proxy/hdrs/HdrToken.cc
index 06cda01..c1de6a1 100644
--- a/proxy/hdrs/HdrToken.cc
+++ b/proxy/hdrs/HdrToken.cc
@@ -31,17 +31,17 @@
#include "Regex.h"
#include "URL.h"
-/*
+/*
You SHOULD add to _hdrtoken_commonly_tokenized_strs, with the same ordering
** important, ordering matters **
-
+
You want a regexp like 'Accept' after "greedier" choices so it doesn't match 'Accept-Ranges' earlier than
- it should. The regexp are anchored (^Accept), but I dont see a way with the current system to
+ it should. The regexp are anchored (^Accept), but I dont see a way with the current system to
match the word ONLY without making _hdrtoken_strs a real PCRE, but then that breaks the hashing
hdrtoken_hash("^Accept$") != hdrtoken_hash("Accept")
-
+
So, the current hack is to have "Accept" follow "Accept-.*", lame, I know
-
+
/ericb
*/
@@ -118,13 +118,13 @@ static const char *_hdrtoken_strs[] = {
"Www-Authenticate",
"Xref", // NNTP
"@DataInfo", // Internal Hack
-
+
// Accept-Encoding
"compress",
"deflate",
"gzip",
"identity",
-
+
// Cache-Control flags
"max-age",
"max-stale",
@@ -138,12 +138,12 @@ static const char *_hdrtoken_strs[] = {
"proxy-revalidate",
"s-maxage",
"need-revalidate-once",
-
+
// HTTP miscellaneous
"none",
"chunked",
"close",
-
+
// WS
"websocket",
"Sec-WebSocket-Key",
@@ -170,7 +170,7 @@ static const char *_hdrtoken_strs[] = {
"mms",
"wss",
"ws",
-
+
// HTTP methods
"CONNECT",
"DELETE",
@@ -183,7 +183,7 @@ static const char *_hdrtoken_strs[] = {
"PUT",
"TRACE",
"PUSH",
-
+
// Header extensions
"X-ID",
"X-Forwarded-For",
@@ -375,8 +375,8 @@ hdrtoken_hash(const unsigned char *string, unsigned int length)
uint32_t hash = InitialFNV;
for (size_t i = 0; i < length; i++) {
- hash = hash ^ (toupper(string[i]));
- hash = hash * FNVMultiple;
+ hash = hash ^ (toupper(string[i]));
+ hash = hash * FNVMultiple;
}
return hash;
@@ -458,13 +458,13 @@ static const char *_hdrtoken_commonly_tokenized_strs[] = {
"Www-Authenticate",
"Xref", // NNTP
"@DataInfo", // Internal Hack
-
+
// Accept-Encoding
"compress",
"deflate",
"gzip",
"identity",
-
+
// Cache-Control flags
"max-age",
"max-stale",
@@ -478,12 +478,12 @@ static const char *_hdrtoken_commonly_tokenized_strs[] = {
"proxy-revalidate",
"s-maxage",
"need-revalidate-once",
-
+
// HTTP miscellaneous
"none",
"chunked",
"close",
-
+
// WS
"websocket",
"Sec-WebSocket-Key",
@@ -510,7 +510,7 @@ static const char *_hdrtoken_commonly_tokenized_strs[] = {
"mms",
"wss",
"ws",
-
+
// HTTP methods
"CONNECT",
"DELETE",
@@ -523,7 +523,7 @@ static const char *_hdrtoken_commonly_tokenized_strs[] = {
"PUT",
"TRACE",
"PUSH",
-
+
// Header extensions
"X-ID",
"X-Forwarded-For",
@@ -693,7 +693,7 @@ int
hdrtoken_tokenize_dfa(const char *string, int string_len, const char **wks_string_out)
{
int wks_idx;
-
+
wks_idx = hdrtoken_strs_dfa->match(string, string_len);
if (wks_idx < 0)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/hdrs/URL.cc
----------------------------------------------------------------------
diff --git a/proxy/hdrs/URL.cc b/proxy/hdrs/URL.cc
index 06f8e53..2950440 100644
--- a/proxy/hdrs/URL.cc
+++ b/proxy/hdrs/URL.cc
@@ -142,29 +142,29 @@ url_init()
URL_SCHEME_MMS = hdrtoken_string_to_wks("mms");
URL_SCHEME_MMSU = hdrtoken_string_to_wks("mmsu");
URL_SCHEME_MMST = hdrtoken_string_to_wks("mmst");
-
- ink_assert(URL_SCHEME_FILE &&
+
+ ink_assert(URL_SCHEME_FILE &&
URL_SCHEME_FTP &&
- URL_SCHEME_GOPHER &&
- URL_SCHEME_HTTP &&
- URL_SCHEME_HTTPS &&
+ URL_SCHEME_GOPHER &&
+ URL_SCHEME_HTTP &&
+ URL_SCHEME_HTTPS &&
URL_SCHEME_WS &&
URL_SCHEME_WSS &&
- URL_SCHEME_MAILTO &&
- URL_SCHEME_NEWS &&
- URL_SCHEME_NNTP &&
- URL_SCHEME_PROSPERO &&
+ URL_SCHEME_MAILTO &&
+ URL_SCHEME_NEWS &&
+ URL_SCHEME_NNTP &&
+ URL_SCHEME_PROSPERO &&
URL_SCHEME_TELNET &&
URL_SCHEME_TUNNEL &&
URL_SCHEME_WAIS &&
URL_SCHEME_PNM &&
- URL_SCHEME_RTSP &&
- URL_SCHEME_RTSPU &&
+ URL_SCHEME_RTSP &&
+ URL_SCHEME_RTSPU &&
URL_SCHEME_MMS &&
- URL_SCHEME_MMSU &&
+ URL_SCHEME_MMSU &&
URL_SCHEME_MMST
);
-
+
URL_WKSIDX_FILE = hdrtoken_wks_to_index(URL_SCHEME_FILE);
URL_WKSIDX_FTP = hdrtoken_wks_to_index(URL_SCHEME_FTP);
URL_WKSIDX_GOPHER = hdrtoken_wks_to_index(URL_SCHEME_GOPHER);
@@ -1130,7 +1130,7 @@ url_parse_scheme(HdrHeap * heap, URLImpl * url, const char **start, const char *
;
if (cur < end) { // found a colon
scheme_wks_idx = hdrtoken_tokenize(scheme_start, cur - scheme_start, &scheme_wks);
-
+
/* Distinguish between a scheme only and a username by looking past the colon. If it is missing
or it's a slash, presume scheme. Otherwise it's a username with a password.
*/
@@ -1284,7 +1284,7 @@ url_parse_internet(HdrHeap* heap, URLImpl* url,
}
if (host._size)
url_host_set(heap, url, host._ptr, host._size, copy_strings_p);
-
+
if (last_colon) {
ink_assert(n_colon);
port.set(last_colon+1, cur);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/HttpConfig.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConfig.cc b/proxy/http/HttpConfig.cc
index 7cc8df2..652a56a 100644
--- a/proxy/http/HttpConfig.cc
+++ b/proxy/http/HttpConfig.cc
@@ -119,7 +119,7 @@ ConfigEnumPair<TSServerSessionSharingMatchType> SessionSharingMatchStrings[] =
{ TS_SERVER_SESSION_SHARING_MATCH_HOST, "host" },
{ TS_SERVER_SESSION_SHARING_MATCH_BOTH, "both" }
};
-
+
static
ConfigEnumPair<TSServerSessionSharingPoolType> SessionSharingPoolStrings[] =
{
@@ -194,7 +194,7 @@ static void
http_config_share_server_sessions_read_bc(HttpConfigParams* c)
{
MgmtByte v;
- if (REC_ERR_OKAY == RecGetRecordByte("proxy.config.http.share_server_sessions", &v))
+ if (REC_ERR_OKAY == RecGetRecordByte("proxy.config.http.share_server_sessions", &v))
http_config_share_server_sessions_bc(c, v);
}
@@ -232,7 +232,7 @@ http_server_session_sharing_cb(char const* name, RecDataT dtype, RecData data, v
}
// Signal an update if valid value arrived.
- if (valid_p)
+ if (valid_p)
http_config_cb(name, dtype, data, cookie);
return REC_ERR_OKAY;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/HttpConnectionCount.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpConnectionCount.h b/proxy/http/HttpConnectionCount.h
index 70f3d1f..04abf56 100644
--- a/proxy/http/HttpConnectionCount.h
+++ b/proxy/http/HttpConnectionCount.h
@@ -74,7 +74,7 @@ public:
ConnAddr(const IpEndpoint& addr) : _addr(addr) { }
operator bool() { return ats_is_ip(&_addr); }
};
-
+
class ConnAddrHashFns {
public:
static uintptr_t hash(ConnAddr& addr) { return (uintptr_t) ats_ip_hash(&addr._addr.sa); }
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/HttpProxyServerMain.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
index b3ed496..6196496 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -101,7 +101,7 @@ struct HttpProxyAcceptor {
};
/** Global acceptors.
-
+
This is parallel to @c HttpProxyPort::global(), each generated
from the corresponding port descriptor.
@@ -272,7 +272,7 @@ init_HttpProxyServer(int n_accept_threads)
for ( int i = 0 , n = proxy_ports.length() ; i < n ; ++i ) {
MakeHttpProxyAcceptor(HttpProxyAcceptors.add(), proxy_ports[i], n_accept_threads);
}
-
+
}
void
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/HttpProxyServerMain.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpProxyServerMain.h b/proxy/http/HttpProxyServerMain.h
index 98769ff..95e771b 100644
--- a/proxy/http/HttpProxyServerMain.h
+++ b/proxy/http/HttpProxyServerMain.h
@@ -27,7 +27,7 @@ struct HttpProxyPort;
*/
void init_HttpProxyServer(int n_accept_threads = 0);
-/** Start the proxy server.
+/** Start the proxy server.
The port data should have been created by @c init_HttpProxyServer().
*/
void start_HttpProxyServer();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/HttpSM.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index a095f57..7cb11b0 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -2826,7 +2826,7 @@ HttpSM::is_http_server_eos_truncation(HttpTunnelProducer * p)
// invalidates the current data being passed over to the client.
// So changing it from return true to return false, so the partial data
// is passed onto the client.
- return false;
+ return false;
}
//////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/HttpSM.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpSM.h b/proxy/http/HttpSM.h
index e143ab8..df13a38 100644
--- a/proxy/http/HttpSM.h
+++ b/proxy/http/HttpSM.h
@@ -218,11 +218,11 @@ public:
// setup Range transfomration if so.
// return true when the Range is unsatisfiable
void do_range_setup_if_necessary();
-
+
void do_range_parse(MIMEField *range_field);
void calculate_output_cl(int64_t, int64_t);
void parse_range_and_compare(MIMEField*, int64_t);
-
+
// Called by transact to prevent reset problems
// failed PUSH requests
void set_ua_half_close_flag();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/HttpServerSession.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpServerSession.cc b/proxy/http/HttpServerSession.cc
index f9aca62..7373226 100644
--- a/proxy/http/HttpServerSession.cc
+++ b/proxy/http/HttpServerSession.cc
@@ -79,8 +79,8 @@ HttpServerSession::new_connection(NetVConnection *new_vc)
connection_count = ConnectionCount::getInstance();
connection_count->incrementCount(server_ip);
char addrbuf[INET6_ADDRSTRLEN];
- Debug("http_ss", "[%" PRId64 "] new connection, ip: %s, count: %u",
- con_id,
+ Debug("http_ss", "[%" PRId64 "] new connection, ip: %s, count: %u",
+ con_id,
ats_ip_ntop(&server_ip.sa, addrbuf, sizeof(addrbuf)), connection_count->getCount(server_ip));
}
#ifdef LAZY_BUF_ALLOC
@@ -134,8 +134,8 @@ HttpServerSession::do_io_close(int alerrno)
connection_count->incrementCount(server_ip, -1);
char addrbuf[INET6_ADDRSTRLEN];
Debug("http_ss", "[%" PRId64 "] connection closed, ip: %s, count: %u",
- con_id,
- ats_ip_ntop(&server_ip.sa, addrbuf, sizeof(addrbuf)),
+ con_id,
+ ats_ip_ntop(&server_ip.sa, addrbuf, sizeof(addrbuf)),
connection_count->getCount(server_ip));
} else {
Error("[%" PRId64 "] number of connections should be greater than zero: %u",
@@ -173,7 +173,7 @@ HttpServerSession::release()
}
HSMresult_t r = httpSessionManager.release_session(this);
-
+
if (r == HSM_RETRY) {
// Session could not be put in the session manager
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/HttpServerSession.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpServerSession.h b/proxy/http/HttpServerSession.h
index 2ac4602..02dc945 100644
--- a/proxy/http/HttpServerSession.h
+++ b/proxy/http/HttpServerSession.h
@@ -79,7 +79,7 @@ public:
enable_origin_connection_limiting(false),
connection_count(NULL), read_buffer(NULL),
server_vc(NULL), magic(HTTP_SS_MAGIC_DEAD), buf_reader(NULL)
- {
+ {
ink_zero(server_ip);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/HttpTransactCache.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransactCache.cc b/proxy/http/HttpTransactCache.cc
index f434f7b..0a790dc 100644
--- a/proxy/http/HttpTransactCache.cc
+++ b/proxy/http/HttpTransactCache.cc
@@ -1247,7 +1247,7 @@ HttpTransactCache::CalcVariability(CacheLookupHttpConfig * http_config_params, H
// Disable Vary mismatch checking for Accept-Encoding. This is only safe to
// set if you are promising to fix any Accept-Encoding/Content-Encoding mismatches.
- if (http_config_params->ignore_accept_encoding_mismatch &&
+ if (http_config_params->ignore_accept_encoding_mismatch &&
!strcasecmp((char *) field->str, "Accept-Encoding"))
continue;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/HttpTransactHeaders.h
----------------------------------------------------------------------
diff --git a/proxy/http/HttpTransactHeaders.h b/proxy/http/HttpTransactHeaders.h
index 27abc00..4443d70 100644
--- a/proxy/http/HttpTransactHeaders.h
+++ b/proxy/http/HttpTransactHeaders.h
@@ -63,7 +63,7 @@ public:
HttpTransact::SquidLogInfo * squid_codes);
// Removing handle_conditional_headers. Functionality appears to be elsewhere (issue_revalidate)
- // and the only condition when it does anything causes an assert to go
+ // and the only condition when it does anything causes an assert to go
// off
// static void handle_conditional_headers(HttpTransact::CacheLookupInfo * cache_info, HTTPHdr * header);
static void insert_warning_header(HttpConfigParams *http_config_param,
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/remap/RemapPluginInfo.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/RemapPluginInfo.cc b/proxy/http/remap/RemapPluginInfo.cc
index 8f97933..dd1dd99 100644
--- a/proxy/http/remap/RemapPluginInfo.cc
+++ b/proxy/http/remap/RemapPluginInfo.cc
@@ -25,7 +25,7 @@
remap_plugin_info::remap_plugin_info(char *_path)
: next(0), path(NULL), path_size(0), dlh(NULL), fp_tsremap_init(NULL), fp_tsremap_done(NULL), fp_tsremap_new_instance(NULL),
- fp_tsremap_delete_instance(NULL), fp_tsremap_do_remap(NULL), fp_tsremap_os_response(NULL)
+ fp_tsremap_delete_instance(NULL), fp_tsremap_do_remap(NULL), fp_tsremap_os_response(NULL)
{
// coverity did not see ats_free
// coverity[ctor_dtor_leak]
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/remap/UrlMapping.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlMapping.h b/proxy/http/remap/UrlMapping.h
index ad9c1de..fe3ab01 100644
--- a/proxy/http/remap/UrlMapping.h
+++ b/proxy/http/remap/UrlMapping.h
@@ -141,13 +141,13 @@ public:
{ }
~UrlMappingContainer() { deleteToURL(); }
-
+
URL * getToURL() const { return _toURLPtr; };
URL * getFromURL() const { return _mapping ? &(_mapping->fromURL) : NULL; };
url_mapping *getMapping() const { return _mapping; };
- void set(url_mapping *m) {
+ void set(url_mapping *m) {
deleteToURL();
_mapping = m;
_toURLPtr = m ? &(m->toUrl) : NULL;
@@ -162,7 +162,7 @@ public:
deleteToURL();
_toURL.create(_heap);
_toURLPtr = &_toURL;
- return _toURLPtr;
+ return _toURLPtr;
}
void deleteToURL() {
@@ -183,7 +183,7 @@ private:
URL *_toURLPtr;
URL _toURL;
HdrHeap *_heap;
-
+
// non-copyable, non-assignable
UrlMappingContainer(const UrlMappingContainer &orig);
UrlMappingContainer &operator =(const UrlMappingContainer &rhs);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/remap/UrlMappingPathIndex.h
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlMappingPathIndex.h b/proxy/http/remap/UrlMappingPathIndex.h
index fefd62c..6bc05d6 100644
--- a/proxy/http/remap/UrlMappingPathIndex.h
+++ b/proxy/http/remap/UrlMappingPathIndex.h
@@ -52,7 +52,7 @@ private:
UrlMappingTrieKey(int idx, int p)
: scheme_wks_idx(idx), port(p)
{ }
-
+
bool operator <(const UrlMappingTrieKey &rhs) const {
if (scheme_wks_idx == rhs.scheme_wks_idx) {
return (port < rhs.port);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/remap/UrlRewrite.cc
----------------------------------------------------------------------
diff --git a/proxy/http/remap/UrlRewrite.cc b/proxy/http/remap/UrlRewrite.cc
index 91d6022..01aa16d 100644
--- a/proxy/http/remap/UrlRewrite.cc
+++ b/proxy/http/remap/UrlRewrite.cc
@@ -463,7 +463,7 @@ UrlRewrite::PerformACLFiltering(HttpTransact::State *s, url_mapping *map)
client_enabled_flag = rp->allow_flag ? false : true;
}
}
-
+
} /* end of for(rp = map->filter;rp;rp = rp->next) */
s->client_connection_enabled = client_enabled_flag;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/http/testheaders.cc
----------------------------------------------------------------------
diff --git a/proxy/http/testheaders.cc b/proxy/http/testheaders.cc
index f1813af..a3f09ff 100644
--- a/proxy/http/testheaders.cc
+++ b/proxy/http/testheaders.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_string.h"
+#include "ink_string.h"
#include "HttpTransact.h"
#include "HttpTransactHeaders.h"
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/logging/LogBuffer.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogBuffer.cc b/proxy/logging/LogBuffer.cc
index 3109bc9..23fc949 100644
--- a/proxy/logging/LogBuffer.cc
+++ b/proxy/logging/LogBuffer.cc
@@ -354,7 +354,7 @@ unsigned
LogBuffer::add_header_str(const char *str, char *buf_ptr, unsigned buf_len)
{
unsigned len = 0;
- // This was ambiguous - should it be the real strlen or the
+ // This was ambiguous - should it be the real strlen or the
// rounded up value? Given the +1, presumably it's the real length
// plus the terminating nul.
if (likely(str && (len = (unsigned) (::strlen(str) + 1)) < buf_len)) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/logging/LogFilter.h
----------------------------------------------------------------------
diff --git a/proxy/logging/LogFilter.h b/proxy/logging/LogFilter.h
index 35590ec..a73e4c7 100644
--- a/proxy/logging/LogFilter.h
+++ b/proxy/logging/LogFilter.h
@@ -196,7 +196,7 @@ private:
/*-------------------------------------------------------------------------
LogFilterIP
-
+
Filter for IP fields using IpAddr.
-------------------------------------------------------------------------*/
class LogFilterIP:public LogFilter
@@ -226,7 +226,7 @@ private:
// Checks for a match on this filter.
bool is_match(LogAccess* lad);
-
+
// -- member functions that are not allowed --
LogFilterIP();
LogFilterIP & operator=(LogFilterIP & rhs);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/logging/LogSock.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogSock.cc b/proxy/logging/LogSock.cc
index b25bfb7..95dd8bc 100644
--- a/proxy/logging/LogSock.cc
+++ b/proxy/logging/LogSock.cc
@@ -36,7 +36,7 @@ static const int LS_PROTOCOL = 0;
The constructor establishes the connection table (ct) and initializes the
first entry of the table (index 0) to be the port on which new
connections are accepted.
-*/
+*/
LogSock::LogSock(int max_connects)
:
ct((ConnectTable *) NULL),
@@ -61,7 +61,7 @@ m_max_connections(max_connects + 1)
LogSock::~LogSock
Shut down all connections and delete memory for the tables.
-*/
+*/
LogSock::~LogSock()
{
Debug("log-sock", "shutting down LogSocket on [%s:%d]", ct[0].host, ct[0].port);
@@ -225,7 +225,7 @@ LogSock::accept()
Establish a new connection to another machine [host:port], and place this
information into the connection and poll tables.
-*/
+*/
int
LogSock::connect(sockaddr const* ip)
{
@@ -286,7 +286,7 @@ LogSock::connect(sockaddr const* ip)
descriptors.
@return Returns true if there is something incoming, with *cid
set to the index corresponding to the incoming socket.
-*/
+*/
bool LogSock::pending_data(int *cid, int timeout_msec, bool include_connects)
{
int
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/logstats.cc
----------------------------------------------------------------------
diff --git a/proxy/logstats.cc b/proxy/logstats.cc
index 802edcc..1a18375 100644
--- a/proxy/logstats.cc
+++ b/proxy/logstats.cc
@@ -306,7 +306,7 @@ struct UrlStats
const char *url;
StatsCounter req;
ElapsedStats time;
- int64_t c_000;
+ int64_t c_000;
int64_t c_2xx;
int64_t c_3xx;
int64_t c_4xx;
@@ -418,7 +418,7 @@ public:
_dump_url(u, as_object);
if (as_object)
std::cout << " \"_timestamp\" : \"" << static_cast<int>(ink_time_wall_seconds()) << "\"" << std::endl;
- else
+ else
std::cout << " { \"_timestamp\" : \"" << static_cast<int>(ink_time_wall_seconds()) << "\" }" << std::endl;
}
@@ -582,8 +582,8 @@ private:
std::cout << " { \"" << u->url << "\" : { ";
// Requests
std::cout << "\"req\" : { \"total\" : \"" << u->req.count <<
- "\", \"hits\" : \"" << u->hits <<
- "\", \"misses\" : \"" << u->misses <<
+ "\", \"hits\" : \"" << u->hits <<
+ "\", \"misses\" : \"" << u->misses <<
"\", \"errors\" : \"" << u->errors <<
"\", \"000\" : \"" << u->c_000 <<
"\", \"2xx\" : \"" << u->c_2xx <<
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/proxy/spdy/SpdyClientSession.cc
----------------------------------------------------------------------
diff --git a/proxy/spdy/SpdyClientSession.cc b/proxy/spdy/SpdyClientSession.cc
index 2c475b7..8c56340 100644
--- a/proxy/spdy/SpdyClientSession.cc
+++ b/proxy/spdy/SpdyClientSession.cc
@@ -363,7 +363,7 @@ spdy_process_fetch_header(TSEvent /*event*/, SpdyClientSession *sm, TSFetchSM fe
SpdyRequest *req = (SpdyRequest *)TSFetchUserDataGet(fetch_sm);
SpdyNV spdy_nv(fetch_sm);
-
+
if (!spdy_nv.is_valid_response()) {
Debug("spdy_error", "----spdy_process_fetch_header, invalid http response");
return -1;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/tools/http_load/http_load.c
----------------------------------------------------------------------
diff --git a/tools/http_load/http_load.c b/tools/http_load/http_load.c
index 59fbd32..c778c04 100644
--- a/tools/http_load/http_load.c
+++ b/tools/http_load/http_load.c
@@ -11,7 +11,7 @@
** 2. Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in the
** documentation and/or other materials provided with the distribution.
-**
+**
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -2846,7 +2846,7 @@ close_connection(int cnum)
total_bytes += connections[cnum].bytes;
if (connections[cnum].did_connect) {
long long connect_usecs = delta_timeval(&connections[cnum].connect_at, &connections[cnum].request_at);
-/*
+/*
if ( connect_usecs > ( max_connect_usecs << 3 ) && max_connect_usecs )
connect_usecs = max_connect_usecs;
*/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/tools/lighttpd_mod_generator/mod_generator.c
----------------------------------------------------------------------
diff --git a/tools/lighttpd_mod_generator/mod_generator.c b/tools/lighttpd_mod_generator/mod_generator.c
index fe42aa4..8613ecd 100644
--- a/tools/lighttpd_mod_generator/mod_generator.c
+++ b/tools/lighttpd_mod_generator/mod_generator.c
@@ -62,9 +62,9 @@ typedef struct {
PLUGIN_DATA;
buffer *match_buf;
-
+
plugin_config **config_storage;
-
+
plugin_config conf;
} plugin_data;
@@ -229,7 +229,7 @@ URIHANDLER_FUNC(mod_generator_subrequest_handler) {
//plugin_data *p = p_d;
buffer *b;
b = chunkqueue_get_append_buffer(con->write_queue);
-
+
// get the url information
//int length = strlen(con->uri.path->ptr);
@@ -302,7 +302,7 @@ URIHANDLER_FUNC(mod_generator_subrequest_handler) {
log_error_write(srv, __FILE__, __LINE__, "s", "didn't see cache or no_cache in the url");
return HANDLER_GO_ON;
}
-
+
// print the body of the message
uint64_t to_write = 0;
--bytes; // leave a char left over for \n
@@ -317,7 +317,7 @@ URIHANDLER_FUNC(mod_generator_subrequest_handler) {
buffer_append_string_len(b, static_data, to_write);
bytes -= to_write;
}
-
+
if (bytes == 0) {
buffer_append_string_len(b, "\n", 1); // add a \n to the end of the body
}
@@ -329,7 +329,7 @@ URIHANDLER_FUNC(mod_generator_subrequest_handler) {
response_header_insert(srv, con, CONST_STR_LEN("Last-Modified"), CONST_STR_LEN("Thu, 12 Feb 2009 23:00:00 GMT"));
response_header_insert(srv, con, CONST_STR_LEN("Cache-Control"), CONST_STR_LEN("max-age=86400, public"));
}
-
+
con->http_status = 200;
con->file_finished = 1;
return HANDLER_FINISHED;
@@ -338,7 +338,7 @@ URIHANDLER_FUNC(mod_generator_subrequest_handler) {
/* this function is called at dlopen() time and inits the callbacks */
int mod_generator_plugin_init(plugin *p) {
-
+
p->version = LIGHTTPD_VERSION_ID;
p->name = buffer_init_string("generator");
[5/5] trafficserver git commit: Remove trailing whitespace
Posted by so...@apache.org.
Remove trailing whitespace
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ab5ba9a8
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ab5ba9a8
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ab5ba9a8
Branch: refs/heads/master
Commit: ab5ba9a8a629fc2866767796a8c51eb2d3e2039f
Parents: e9f057f
Author: Phil Sorber <so...@apache.org>
Authored: Fri Nov 14 10:50:20 2014 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Nov 14 10:54:45 2014 -0700
----------------------------------------------------------------------
ci/coverity-model.cc | 4 +-
cmd/traffic_cop/traffic_cop.cc | 2 +-
cmd/traffic_top/stats.h | 8 +-
example/intercept/intercept.cc | 2 +-
example/query-remap/query-remap.c | 2 +-
example/remap/remap.cc | 4 +-
example/secure-link/secure-link.c | 2 +-
example/ssl-preaccept/ats-util.h | 2 +-
example/ssl-preaccept/ssl-preaccept.cc | 22 +--
example/ssl-sni-whitelist/ssl-sni-whitelist.cc | 20 +--
example/ssl-sni/ssl-sni.cc | 24 ++--
example/version/version.c | 2 +-
iocore/cache/Cache.cc | 4 +-
iocore/cache/CachePages.cc | 2 +-
iocore/cache/CacheTest.cc | 6 +-
iocore/cache/CacheVol.cc | 2 +-
iocore/cache/CacheWrite.cc | 2 +-
iocore/cache/I_Cache.h | 4 +-
iocore/cache/P_CacheDir.h | 4 +-
iocore/cache/P_CacheDisk.h | 2 +-
iocore/cache/P_CacheInternal.h | 2 +-
iocore/cache/P_CacheVol.h | 4 +-
iocore/cache/RamCacheCLFUS.cc | 6 +-
iocore/cluster/ClusterHandler.cc | 2 +-
iocore/cluster/ClusterHandlerBase.cc | 12 +-
iocore/dns/I_DNSProcessor.h | 4 +-
iocore/dns/P_DNSConnection.h | 2 +-
iocore/dns/P_DNSProcessor.h | 2 +-
iocore/eventsystem/I_Tasks.h | 2 +-
iocore/hostdb/P_MultiCache.h | 2 +-
iocore/net/I_NetVConnection.h | 4 +-
iocore/net/OCSPStapling.cc | 2 +-
iocore/net/P_SSLCertLookup.h | 2 +-
iocore/net/P_SSLNetVConnection.h | 2 +-
iocore/net/P_UnixNetVConnection.h | 2 +-
iocore/net/SSLCertLookup.cc | 2 +-
iocore/net/SSLNetVConnection.cc | 48 +++----
iocore/net/UnixConnection.cc | 2 +-
iocore/net/UnixNetVConnection.cc | 4 +-
.../examples/async_http_fetch/AsyncHttpFetch.cc | 4 +-
.../NullTransformationPlugin.cc | 2 +-
.../examples/remap_plugin/RemapPlugin.cc | 2 +-
.../src/CaseInsensitiveStringComparator.cc | 6 +-
lib/atscppapi/src/Headers.cc | 8 +-
lib/atscppapi/src/InterceptPlugin.cc | 12 +-
lib/atscppapi/src/Request.cc | 4 +-
lib/atscppapi/src/include/atscppapi/Async.h | 14 +-
.../src/include/atscppapi/AsyncTimer.h | 6 +-
.../src/include/atscppapi/ClientRequest.h | 4 +-
lib/atscppapi/src/include/atscppapi/Headers.h | 4 +-
.../src/include/atscppapi/InterceptPlugin.h | 2 +-
.../src/include/atscppapi/PluginInit.h | 4 +-
.../src/include/atscppapi/RemapPlugin.h | 10 +-
lib/atscppapi/src/include/atscppapi/Request.h | 2 +-
lib/atscppapi/src/utils_internal.cc | 4 +-
lib/records/RecHttp.cc | 6 +-
lib/ts/IntrusiveDList.h | 4 +-
lib/ts/IpMap.cc | 30 ++---
lib/ts/IpMap.h | 6 +-
lib/ts/IpMapTest.cc | 6 +-
lib/ts/List.h | 2 +-
lib/ts/Map.h | 48 +++----
lib/ts/TsBuffer.h | 4 +-
lib/ts/Vec.cc | 70 +++++-----
lib/ts/Vec.h | 82 ++++++------
lib/ts/ink_args.cc | 2 +-
lib/ts/ink_inet.cc | 8 +-
lib/ts/ink_inet.h | 8 +-
lib/ts/ink_memory.h | 2 +-
lib/ts/ink_rand.cc | 14 +-
lib/ts/ink_rand.h | 12 +-
lib/ts/ink_res_init.cc | 4 +-
lib/ts/ink_sock.cc | 4 +-
lib/ts/test_Map.cc | 6 +-
lib/tsconfig/Errata.cc | 2 +-
lib/tsconfig/Errata.h | 4 +-
lib/tsconfig/IntrusivePtr.h | 12 +-
lib/tsconfig/TsConfigGrammar.c | 10 +-
lib/tsconfig/TsConfigGrammar.h | 10 +-
lib/tsconfig/TsConfigSyntax.c | 50 +++----
lib/tsconfig/TsErrataUtil.cc | 4 +-
lib/tsconfig/TsValue.h | 2 +-
lib/wccp/Wccp.h | 8 +-
lib/wccp/WccpConfig.cc | 6 +-
lib/wccp/WccpEndPoint.cc | 14 +-
lib/wccp/WccpLocal.h | 10 +-
lib/wccp/WccpMeta.h | 2 +-
lib/wccp/WccpMsg.cc | 54 ++++----
lib/wccp/WccpStatic.cc | 4 +-
lib/wccp/wccp-test-router.cc | 2 +-
mgmt/Rollback.cc | 2 +-
mgmt/api/TSControlMain.cc | 4 +-
mgmt/web2/WebHttp.cc | 2 +-
plugins/conf_remap/conf_remap.cc | 6 +-
.../ats_pagespeed/ats_base_fetch.cc | 20 +--
.../experimental/ats_pagespeed/ats_base_fetch.h | 2 +-
.../ats_pagespeed/ats_beacon_intercept.cc | 32 ++---
.../experimental/ats_pagespeed/ats_config.cc | 2 +-
plugins/experimental/ats_pagespeed/ats_config.h | 2 +-
.../ats_pagespeed/ats_header_utils.cc | 2 +-
.../ats_pagespeed/ats_message_handler.cc | 8 +-
.../experimental/ats_pagespeed/ats_pagespeed.cc | 134 +++++++++----------
.../ats_pagespeed/ats_process_context.cc | 6 +-
.../ats_pagespeed/ats_resource_intercept.cc | 36 ++---
.../ats_pagespeed/ats_resource_intercept.h | 2 +-
.../ats_pagespeed/ats_rewrite_driver_factory.cc | 8 +-
.../ats_pagespeed/ats_rewrite_driver_factory.h | 4 +-
.../ats_pagespeed/gzip/configuration.cc | 4 +-
.../ats_pagespeed/gzip/configuration.h | 10 +-
plugins/experimental/ats_pagespeed/gzip/gzip.cc | 24 ++--
plugins/experimental/ats_pagespeed/gzip/misc.cc | 4 +-
.../background_fetch/background_fetch.cc | 6 +-
.../experimental/buffer_upload/buffer_upload.cc | 8 +-
.../custom_redirect/custom_redirect.cc | 14 +-
plugins/experimental/esi/combo_handler.cc | 2 +-
plugins/experimental/esi/esi.cc | 22 +--
.../esi/fetcher/FetchedDataProcessor.h | 4 +-
.../esi/fetcher/HttpDataFetcherImpl.cc | 14 +-
.../esi/fetcher/HttpDataFetcherImpl.h | 10 +-
plugins/experimental/esi/lib/ComponentBase.h | 8 +-
plugins/experimental/esi/lib/DocNode.cc | 2 +-
plugins/experimental/esi/lib/DocNode.h | 12 +-
plugins/experimental/esi/lib/EsiGunzip.cc | 10 +-
plugins/experimental/esi/lib/EsiGunzip.h | 124 ++++++++---------
plugins/experimental/esi/lib/EsiGzip.cc | 8 +-
plugins/experimental/esi/lib/EsiParser.cc | 40 +++---
plugins/experimental/esi/lib/EsiParser.h | 18 +--
plugins/experimental/esi/lib/EsiProcessor.cc | 72 +++++-----
plugins/experimental/esi/lib/EsiProcessor.h | 40 +++---
plugins/experimental/esi/lib/Expression.cc | 10 +-
plugins/experimental/esi/lib/Expression.h | 14 +-
plugins/experimental/esi/lib/FailureInfo.cc | 20 +--
plugins/experimental/esi/lib/FailureInfo.h | 4 +-
plugins/experimental/esi/lib/HttpHeader.h | 2 +-
.../esi/lib/IncludeHandlerFactory.h | 2 +-
plugins/experimental/esi/lib/Stats.h | 2 +-
plugins/experimental/esi/lib/Utils.cc | 2 +-
plugins/experimental/esi/lib/Utils.h | 8 +-
plugins/experimental/esi/lib/Variables.cc | 18 +--
plugins/experimental/esi/lib/Variables.h | 6 +-
plugins/experimental/esi/lib/gzip.cc | 2 +-
plugins/experimental/esi/lib/gzip.h | 2 +-
plugins/experimental/esi/serverIntercept.cc | 18 +--
.../experimental/esi/test/StubIncludeHandler.cc | 4 +-
.../experimental/esi/test/StubIncludeHandler.h | 8 +-
.../experimental/esi/test/TestHttpDataFetcher.h | 8 +-
plugins/experimental/esi/test/docnode_test.cc | 12 +-
plugins/experimental/esi/test/parser_test.cc | 52 +++----
plugins/experimental/esi/test/processor_test.cc | 78 +++++------
plugins/experimental/esi/test/sampleProb.cc | 50 +++----
plugins/experimental/esi/test/utils_test.cc | 6 +-
plugins/experimental/esi/test/vars_test.cc | 6 +-
plugins/experimental/geoip_acl/acl.cc | 4 +-
plugins/experimental/geoip_acl/geoip_acl.cc | 4 +-
plugins/experimental/geoip_acl/lulu.h | 4 +-
plugins/experimental/hipes/hipes.cc | 30 ++---
.../experimental/mysql_remap/lib/dictionary.c | 6 +-
.../experimental/mysql_remap/lib/iniparser.c | 8 +-
plugins/experimental/s3_auth/s3_auth.cc | 4 +-
plugins/experimental/ssl_cert_loader/ats-util.h | 2 +-
.../experimental/ssl_cert_loader/domain-tree.cc | 14 +-
.../experimental/ssl_cert_loader/domain-tree.h | 10 +-
.../ssl_cert_loader/ssl-cert-loader.cc | 66 ++++-----
plugins/experimental/ts_lua/ts_lua.c | 6 +-
.../ts_lua/ts_lua_cached_response.c | 2 +-
.../ts_lua/ts_lua_cached_response.h | 2 +-
.../experimental/ts_lua/ts_lua_client_request.c | 6 +-
.../experimental/ts_lua/ts_lua_client_request.h | 2 +-
.../ts_lua/ts_lua_client_response.c | 2 +-
.../ts_lua/ts_lua_client_response.h | 2 +-
plugins/experimental/ts_lua/ts_lua_common.h | 2 +-
plugins/experimental/ts_lua/ts_lua_context.c | 2 +-
plugins/experimental/ts_lua/ts_lua_context.h | 2 +-
plugins/experimental/ts_lua/ts_lua_crypto.c | 2 +-
plugins/experimental/ts_lua/ts_lua_crypto.h | 2 +-
plugins/experimental/ts_lua/ts_lua_hook.c | 4 +-
plugins/experimental/ts_lua/ts_lua_hook.h | 2 +-
plugins/experimental/ts_lua/ts_lua_http.c | 2 +-
plugins/experimental/ts_lua/ts_lua_http.h | 2 +-
plugins/experimental/ts_lua/ts_lua_http_cntl.c | 2 +-
plugins/experimental/ts_lua/ts_lua_http_cntl.h | 2 +-
.../experimental/ts_lua/ts_lua_http_config.c | 2 +-
.../experimental/ts_lua/ts_lua_http_config.h | 2 +-
.../experimental/ts_lua/ts_lua_http_intercept.c | 2 +-
.../experimental/ts_lua/ts_lua_http_intercept.h | 2 +-
plugins/experimental/ts_lua/ts_lua_log.c | 2 +-
plugins/experimental/ts_lua/ts_lua_log.h | 2 +-
plugins/experimental/ts_lua/ts_lua_mgmt.c | 2 +-
plugins/experimental/ts_lua/ts_lua_mgmt.h | 2 +-
plugins/experimental/ts_lua/ts_lua_misc.c | 2 +-
plugins/experimental/ts_lua/ts_lua_misc.h | 2 +-
plugins/experimental/ts_lua/ts_lua_package.c | 2 +-
plugins/experimental/ts_lua/ts_lua_package.h | 2 +-
plugins/experimental/ts_lua/ts_lua_remap.c | 2 +-
plugins/experimental/ts_lua/ts_lua_remap.h | 2 +-
.../experimental/ts_lua/ts_lua_server_request.c | 2 +-
.../experimental/ts_lua/ts_lua_server_request.h | 2 +-
.../ts_lua/ts_lua_server_response.c | 2 +-
.../ts_lua/ts_lua_server_response.h | 2 +-
plugins/experimental/ts_lua/ts_lua_string.c | 2 +-
plugins/experimental/ts_lua/ts_lua_string.h | 2 +-
plugins/experimental/ts_lua/ts_lua_transform.c | 2 +-
plugins/experimental/ts_lua/ts_lua_transform.h | 2 +-
plugins/experimental/ts_lua/ts_lua_util.c | 6 +-
plugins/experimental/ts_lua/ts_lua_util.h | 2 +-
plugins/gzip/configuration.cc | 2 +-
plugins/gzip/configuration.h | 10 +-
plugins/gzip/gzip.cc | 24 ++--
plugins/gzip/misc.cc | 4 +-
plugins/regex_remap/regex_remap.cc | 2 +-
proxy/CacheControl.cc | 6 +-
proxy/ControlMatcher.cc | 6 +-
proxy/ControlMatcher.h | 2 +-
proxy/CoreUtils.cc | 4 +-
proxy/FetchSM.cc | 12 +-
proxy/ICP.cc | 2 +-
proxy/IPAllow.h | 2 +-
proxy/InkAPI.cc | 10 +-
proxy/InkAPIInternal.h | 2 +-
proxy/InkAPITestTool.cc | 4 +-
proxy/InkIOCoreAPI.cc | 8 +-
proxy/PluginVC.cc | 4 +-
proxy/ReverseProxy.cc | 2 +-
proxy/StatSystem.cc | 2 +-
proxy/Transform.cc | 4 +-
proxy/TransformInternal.h | 6 +-
proxy/api/ts/experimental.h | 4 +-
proxy/api/ts/ts.h | 20 +--
proxy/congest/CongestionDB.cc | 2 +-
proxy/congest/CongestionTest.cc | 4 +-
proxy/hdrs/HTTP.cc | 2 +-
proxy/hdrs/HdrHeap.h | 4 +-
proxy/hdrs/HdrTest.cc | 6 +-
proxy/hdrs/HdrToken.cc | 40 +++---
proxy/hdrs/URL.cc | 30 ++---
proxy/http/HttpConfig.cc | 6 +-
proxy/http/HttpConnectionCount.h | 2 +-
proxy/http/HttpProxyServerMain.cc | 4 +-
proxy/http/HttpProxyServerMain.h | 2 +-
proxy/http/HttpSM.cc | 2 +-
proxy/http/HttpSM.h | 4 +-
proxy/http/HttpServerSession.cc | 10 +-
proxy/http/HttpServerSession.h | 2 +-
proxy/http/HttpTransactCache.cc | 2 +-
proxy/http/HttpTransactHeaders.h | 2 +-
proxy/http/remap/RemapPluginInfo.cc | 2 +-
proxy/http/remap/UrlMapping.h | 8 +-
proxy/http/remap/UrlMappingPathIndex.h | 2 +-
proxy/http/remap/UrlRewrite.cc | 2 +-
proxy/http/testheaders.cc | 2 +-
proxy/logging/LogBuffer.cc | 2 +-
proxy/logging/LogFilter.h | 4 +-
proxy/logging/LogSock.cc | 8 +-
proxy/logstats.cc | 8 +-
proxy/spdy/SpdyClientSession.cc | 2 +-
tools/http_load/http_load.c | 4 +-
tools/lighttpd_mod_generator/mod_generator.c | 14 +-
257 files changed, 1231 insertions(+), 1231 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/ci/coverity-model.cc
----------------------------------------------------------------------
diff --git a/ci/coverity-model.cc b/ci/coverity-model.cc
index 1f952a3..bfd620a 100644
--- a/ci/coverity-model.cc
+++ b/ci/coverity-model.cc
@@ -1,4 +1,4 @@
-/**
+/**
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -27,7 +27,7 @@ typedef struct real_pcre pcre;
typedef struct pcre_extra {
} pcre_extra;
-int
+int
pcre_exec(const pcre *argument_re, const pcre_extra *extra_data,
PCRE_SPTR subject, int length, int start_offset, int options, int *offsets,
int offsetcount)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/cmd/traffic_cop/traffic_cop.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_cop/traffic_cop.cc b/cmd/traffic_cop/traffic_cop.cc
index ee65d63..7cf32ec 100644
--- a/cmd/traffic_cop/traffic_cop.cc
+++ b/cmd/traffic_cop/traffic_cop.cc
@@ -247,7 +247,7 @@ sig_term(int signum)
// safely^W commit suicide.
cop_log_trace("Sending signal %d to entire group\n", signum);
killpg(0, signum);
-
+
cop_log_trace("Waiting for children to exit.");
for (;;) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/cmd/traffic_top/stats.h
----------------------------------------------------------------------
diff --git a/cmd/traffic_top/stats.h b/cmd/traffic_top/stats.h
index bfb4cb4..c0e29d3 100644
--- a/cmd/traffic_top/stats.h
+++ b/cmd/traffic_top/stats.h
@@ -254,7 +254,7 @@ public:
(*_stats)[key] = foo;
}
}
- }
+ }
_old_time = _now;
_now = now;
_time_diff = _now - _old_time;
@@ -295,7 +295,7 @@ public:
abort();
}
- /* always cleanup */
+ /* always cleanup */
curl_easy_cleanup(curl);
}
}
@@ -320,7 +320,7 @@ public:
map<string, LookupItem>::const_iterator lookup_it = lookup_table.find(key);
assert(lookup_it != lookup_table.end());
const LookupItem &item = lookup_it->second;
-
+
map<string, string>::const_iterator stats_it = _stats->find(item.name);
if (stats_it == _stats->end())
value = "";
@@ -411,7 +411,7 @@ public:
size_t start = response.find(constant::start, pos);
size_t seperator = response.find(constant::seperator, pos);
size_t end = response.find(constant::end, pos);
-
+
if (start == string::npos || seperator == string::npos || end == string::npos)
return;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/example/intercept/intercept.cc
----------------------------------------------------------------------
diff --git a/example/intercept/intercept.cc b/example/intercept/intercept.cc
index 44c7014..c56a01d 100644
--- a/example/intercept/intercept.cc
+++ b/example/intercept/intercept.cc
@@ -354,7 +354,7 @@ InterceptInterceptionHook(TSCont contp, TSEvent event, void * edata)
return TS_EVENT_NONE;
}
-
+
case TS_EVENT_NET_ACCEPT_FAILED: {
// TS_EVENT_NET_ACCEPT_FAILED will be delivered if the
// transaction is cancelled before we start tunnelling
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/example/query-remap/query-remap.c
----------------------------------------------------------------------
diff --git a/example/query-remap/query-remap.c b/example/query-remap/query-remap.c
index 3026a2c..8eabd3f 100644
--- a/example/query-remap/query-remap.c
+++ b/example/query-remap/query-remap.c
@@ -126,7 +126,7 @@ TSRemapDoRemap(void* ih, TSHttpTxn rh ATS_UNUSED, TSRemapRequestInfo *rri)
int req_query_len;
const char* req_query = TSUrlHttpQueryGet(rri->requestBufp, rri->requestUrl, &req_query_len);
-
+
if (req_query && req_query_len > 0) {
char *q, *key;
char *s = NULL;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/example/remap/remap.cc
----------------------------------------------------------------------
diff --git a/example/remap/remap.cc b/example/remap/remap.cc
index ec51ce8..2dbe82a 100644
--- a/example/remap/remap.cc
+++ b/example/remap/remap.cc
@@ -23,7 +23,7 @@
@section description
Build this sample remap plugin using tsxs:
- $ tsxs -v -o remap.so remap.cc
+ $ tsxs -v -o remap.so remap.cc
To install it:
# tsxs -i -o remap.so
@@ -316,7 +316,7 @@ TSRemapDoRemap(void* ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
size_t len = snprintf(tmp, 255,
"This is very small example of TS API usage!\nIteration %d!\nHTTP return code %d\n",
my_local_counter, TS_HTTP_STATUS_CONTINUE + my_local_counter);
- TSHttpTxnSetHttpRetStatus((TSHttpTxn) rh, (TSHttpStatus) ((int) TS_HTTP_STATUS_CONTINUE + my_local_counter));
+ TSHttpTxnSetHttpRetStatus((TSHttpTxn) rh, (TSHttpStatus) ((int) TS_HTTP_STATUS_CONTINUE + my_local_counter));
TSHttpTxnErrorBodySet((TSHttpTxn) rh, tmp, len, NULL); // Defaults to text/html
my_local_counter++;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/example/secure-link/secure-link.c
----------------------------------------------------------------------
diff --git a/example/secure-link/secure-link.c b/example/secure-link/secure-link.c
index ef1f03e..9f55e18 100644
--- a/example/secure-link/secure-link.c
+++ b/example/secure-link/secure-link.c
@@ -103,7 +103,7 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo* rri)
MD5_Init(&ctx);
MD5_Update(&ctx, sli->secret, strlen(sli->secret));
MD5_Update(&ctx, ip, strlen(ip));
- if (path)
+ if (path)
MD5_Update(&ctx, path, strlen(path));
if (expire)
MD5_Update(&ctx, expire, strlen(expire));
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/example/ssl-preaccept/ats-util.h
----------------------------------------------------------------------
diff --git a/example/ssl-preaccept/ats-util.h b/example/ssl-preaccept/ats-util.h
index 1164a20..428b588 100644
--- a/example/ssl-preaccept/ats-util.h
+++ b/example/ssl-preaccept/ats-util.h
@@ -27,7 +27,7 @@
foo *bar[ZOMG]; // array of pointers.
ink_zero(bar); // zero all pointers in the array.
@endcode
-
+
*/
template < typename T > inline void
ink_zero(
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/example/ssl-preaccept/ssl-preaccept.cc
----------------------------------------------------------------------
diff --git a/example/ssl-preaccept/ssl-preaccept.cc b/example/ssl-preaccept/ssl-preaccept.cc
index c0f0ce8..8754ea3 100644
--- a/example/ssl-preaccept/ssl-preaccept.cc
+++ b/example/ssl-preaccept/ssl-preaccept.cc
@@ -2,7 +2,7 @@
SSL Preaccept test plugin
Implements blind tunneling based on the client IP address
- The client ip addresses are specified in the plugin's
+ The client ip addresses are specified in the plugin's
config file as an array of IP addresses or IP address ranges under the
key "client-blind-tunnel"
@@ -49,7 +49,7 @@ IpRangeQueue ClientBlindTunnelIp;
Configuration Config; // global configuration
void
-Parse_Addr_String(ts::ConstBuffer const &text, IpRange &range)
+Parse_Addr_String(ts::ConstBuffer const &text, IpRange &range)
{
IpAddr newAddr;
std::string textstr(text._ptr, text._size);
@@ -64,12 +64,12 @@ Parse_Addr_String(ts::ConstBuffer const &text, IpRange &range)
else { // Assume it is a single address
newAddr.load(text);
range.first = newAddr;
- range.second = newAddr;
+ range.second = newAddr;
}
}
/// Get a string value from a config node.
-void Load_Config_Value(Value const& parent, char const* name, IpRangeQueue &addrs)
+void Load_Config_Value(Value const& parent, char const* name, IpRangeQueue &addrs)
{
Value v = parent[name];
std::string zret;
@@ -89,7 +89,7 @@ void Load_Config_Value(Value const& parent, char const* name, IpRangeQueue &addr
int
-Load_Config_File()
+Load_Config_File()
{
ts::Rv<Configuration> cv = Configuration::loadFromPath(ConfigPath.c_str());
if (!cv.isOK()) {
@@ -101,7 +101,7 @@ Load_Config_File()
}
int
-Load_Configuration()
+Load_Configuration()
{
int ret = Load_Config_File();
if (ret != 0) {
@@ -116,7 +116,7 @@ Load_Configuration()
}
int
-CB_Pre_Accept(TSCont, TSEvent event, void *edata)
+CB_Pre_Accept(TSCont, TSEvent event, void *edata)
{
TSVConn ssl_vc = reinterpret_cast<TSVConn>(edata);
IpAddr ip(TSNetVConnLocalAddrGet(ssl_vc));
@@ -132,7 +132,7 @@ CB_Pre_Accept(TSCont, TSEvent event, void *edata)
);
// Not the worlds most efficient address comparison. For short lists
- // shouldn't be too bad. If the client IP is in any of the ranges,
+ // shouldn't be too bad. If the client IP is in any of the ranges,
// flip the tunnel to be blind tunneled instead of decrypted and proxied
bool proxy_tunnel = true;
IpRangeQueue::iterator iter;
@@ -158,7 +158,7 @@ CB_Pre_Accept(TSCont, TSEvent event, void *edata)
// Called by ATS as our initialization point
void
-TSPluginInit(int argc, const char *argv[])
+TSPluginInit(int argc, const char *argv[])
{
bool success = false;
TSPluginRegistrationInfo info;
@@ -181,7 +181,7 @@ TSPluginInit(int argc, const char *argv[])
ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(optarg);
break;
}
- }
+ }
if (ConfigPath.length() == 0) {
static char const * const DEFAULT_CONFIG_PATH = "ssl_preaccept.config";
ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(DEFAULT_CONFIG_PATH);
@@ -200,7 +200,7 @@ TSPluginInit(int argc, const char *argv[])
TSHttpHookAdd(TS_VCONN_PRE_ACCEPT_HOOK, cb_pa);
success = true;
}
-
+
if (!success) {
if (cb_pa) TSContDestroy(cb_pa);
TSError(PCP "not initialized");
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
----------------------------------------------------------------------
diff --git a/example/ssl-sni-whitelist/ssl-sni-whitelist.cc b/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
index 496e950..8c4d384 100644
--- a/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
+++ b/example/ssl-sni-whitelist/ssl-sni-whitelist.cc
@@ -1,5 +1,5 @@
-/** @file
-
+/** @file
+
SSL SNI white list plugin
If the server name and IP address are not in the ssl_multicert.config
go head and blind tunnel it.
@@ -47,7 +47,7 @@ std::string ConfigPath;
Configuration Config; // global configuration
int
-Load_Config_File()
+Load_Config_File()
{
ts::Rv<Configuration> cv = Configuration::loadFromPath(ConfigPath.c_str());
if (!cv.isOK()) {
@@ -70,7 +70,7 @@ Load_Configuration()
}
int
-CB_servername_whitelist(TSCont /* contp */, TSEvent /* event */, void *edata)
+CB_servername_whitelist(TSCont /* contp */, TSEvent /* event */, void *edata)
{
TSVConn ssl_vc = reinterpret_cast<TSVConn>(edata);
TSSslConnection sslobj = TSVConnSSLConnectionGet(ssl_vc);
@@ -94,16 +94,16 @@ CB_servername_whitelist(TSCont /* contp */, TSEvent /* event */, void *edata)
TSDebug("skh", "SNI callback: do blind tunnel for %s", servername);
TSVConnTunnel(ssl_vc);
return TS_SUCCESS; // Don't re-enable so we interrupt processing
- }
+ }
TSVConnReenable(ssl_vc);
return TS_SUCCESS;
-}
+}
} // Anon namespace
// Called by ATS as our initialization point
void
-TSPluginInit(int argc, const char *argv[])
+TSPluginInit(int argc, const char *argv[])
{
bool success = false;
TSPluginRegistrationInfo info;
@@ -126,7 +126,7 @@ TSPluginInit(int argc, const char *argv[])
ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(optarg);
break;
}
- }
+ }
if (ConfigPath.length() == 0) {
static char const * const DEFAULT_CONFIG_PATH = "ssl_sni_whitelist.config";
ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(DEFAULT_CONFIG_PATH);
@@ -145,7 +145,7 @@ TSPluginInit(int argc, const char *argv[])
TSHttpHookAdd(TS_SSL_SNI_HOOK, cb_sni);
success = true;
}
-
+
if (!success) {
if (cb_sni) TSContDestroy(cb_sni);
TSError(PCP "not initialized");
@@ -158,7 +158,7 @@ TSPluginInit(int argc, const char *argv[])
# else // ! TS_USE_TLS_SNI
void
-TSPluginInit(int, const char *[])
+TSPluginInit(int, const char *[])
{
TSError(PCP "requires TLS SNI which is not available.");
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/example/ssl-sni/ssl-sni.cc
----------------------------------------------------------------------
diff --git a/example/ssl-sni/ssl-sni.cc b/example/ssl-sni/ssl-sni.cc
index 0367d5f..d8101b8 100644
--- a/example/ssl-sni/ssl-sni.cc
+++ b/example/ssl-sni/ssl-sni.cc
@@ -1,8 +1,8 @@
-/**
- @file
+/**
+ @file
SSL Preaccept test plugin
Implements blind tunneling based on the client IP address
- The client ip addresses are specified in the plugin's
+ The client ip addresses are specified in the plugin's
config file as an array of IP addresses or IP address ranges under the
key "client-blind-tunnel"
@@ -50,7 +50,7 @@ std::string ConfigPath;
Configuration Config; // global configuration
int
-Load_Config_File()
+Load_Config_File()
{
ts::Rv<Configuration> cv = Configuration::loadFromPath(ConfigPath.c_str());
if (!cv.isOK()) {
@@ -62,7 +62,7 @@ Load_Config_File()
}
int
-Load_Configuration()
+Load_Configuration()
{
int ret = Load_Config_File();
if (ret != 0) {
@@ -82,7 +82,7 @@ Load_Configuration()
this connection.
*/
int
-CB_servername(TSCont /* contp */, TSEvent /* event */, void *edata)
+CB_servername(TSCont /* contp */, TSEvent /* event */, void *edata)
{
TSVConn ssl_vc = reinterpret_cast<TSVConn>(edata);
TSSslConnection sslobj = TSVConnSSLConnectionGet(ssl_vc);
@@ -109,12 +109,12 @@ CB_servername(TSCont /* contp */, TSEvent /* event */, void *edata)
if (ctxobj != NULL) {
TSDebug("skh", "Found cert for safelyfiled");
SSL_CTX *ctx = reinterpret_cast<SSL_CTX *>(ctxobj);
- SSL_set_SSL_CTX(ssl, ctx);
+ SSL_set_SSL_CTX(ssl, ctx);
TSDebug("skh", "SNI plugin cb: replace SSL CTX");
}
}
}
- }
+ }
// All done, reactivate things
@@ -126,7 +126,7 @@ CB_servername(TSCont /* contp */, TSEvent /* event */, void *edata)
// Called by ATS as our initialization point
void
-TSPluginInit(int argc, const char *argv[])
+TSPluginInit(int argc, const char *argv[])
{
bool success = false;
TSPluginRegistrationInfo info;
@@ -149,7 +149,7 @@ TSPluginInit(int argc, const char *argv[])
ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(optarg);
break;
}
- }
+ }
if (ConfigPath.length() == 0) {
static char const * const DEFAULT_CONFIG_PATH = "ssl_sni.config";
ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(DEFAULT_CONFIG_PATH);
@@ -168,7 +168,7 @@ TSPluginInit(int argc, const char *argv[])
TSHttpHookAdd(TS_SSL_SNI_HOOK, cb_sni);
success = true;
}
-
+
if (!success) {
if (cb_sni) TSContDestroy(cb_sni);
TSError(PCP "not initialized");
@@ -181,7 +181,7 @@ TSPluginInit(int argc, const char *argv[])
# else // ! TS_USE_TLS_SNI
void
-TSPluginInit(int, const char *[])
+TSPluginInit(int, const char *[])
{
TSError(PCP "requires TLS SNI which is not available.");
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/example/version/version.c
----------------------------------------------------------------------
diff --git a/example/version/version.c b/example/version/version.c
index 5512858..71aa15e 100644
--- a/example/version/version.c
+++ b/example/version/version.c
@@ -56,7 +56,7 @@ TSPluginInit(int argc ATS_UNUSED, const char *argv[] ATS_UNUSED)
// partial compilation
#if (TS_VERSION_NUMBER < 3000000)
if (TSPluginRegister(TS_SDK_VERSION_2_0, &info) != TS_SUCCESS) {
-#else
+#else
if (TSPluginRegister(TS_SDK_VERSION_3_0, &info) != TS_SUCCESS) {
#endif
TSError("Plugin registration failed. \n");
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cache/Cache.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index 3b1eebd..9aece93 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -463,11 +463,11 @@ CacheVC::set_http_info(CacheHTTPInfo *ainfo)
}
if (enable_cache_empty_http_doc) {
MIMEField *field = ainfo->m_alt->m_response_hdr.field_find(MIME_FIELD_CONTENT_LENGTH, MIME_LEN_CONTENT_LENGTH);
- if (field && !field->value_get_int64())
+ if (field && !field->value_get_int64())
f.allow_empty_doc = 1;
else
f.allow_empty_doc = 0;
- } else
+ } else
f.allow_empty_doc = 0;
alternate.copy_shallow(ainfo);
ainfo->clear();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cache/CachePages.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CachePages.cc b/iocore/cache/CachePages.cc
index cf0ec83..5aa8bc5 100644
--- a/iocore/cache/CachePages.cc
+++ b/iocore/cache/CachePages.cc
@@ -65,7 +65,7 @@ struct ShowCache: public ShowCont {
int handleCacheDeleteComplete(int event, Event *e);
int handleCacheScanCallback(int event, Event *e);
- ShowCache(Continuation *c, HTTPHdr *h):
+ ShowCache(Continuation *c, HTTPHdr *h):
ShowCont(c, h), vol_index(0), seg_index(0), scan_flag(scan_type_lookup),
cache_vc(0), buffer(0), buffer_reader(0), content_length(0), cvio(0)
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cache/CacheTest.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheTest.cc b/iocore/cache/CacheTest.cc
index 2bb1194..6ca424c 100644
--- a/iocore/cache/CacheTest.cc
+++ b/iocore/cache/CacheTest.cc
@@ -382,9 +382,9 @@ EXCLUSIVE_REGRESSION_TEST(cache)(RegressionTest *t, int /* atype ATS_UNUSED */,
large_write_test.nbytes = 10000000;
rand_CacheKey(&large_write_test.key, thread->mutex);
- CACHE_SM(t, pread_test, {
- cacheProcessor.open_read(this, &key, false);
- }
+ CACHE_SM(t, pread_test, {
+ cacheProcessor.open_read(this, &key, false);
+ }
int open_read_callout() {
cvio = cache_vc->do_io_pread(this, nbytes, buffer, 7000000);
return 1;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cache/CacheVol.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheVol.cc b/iocore/cache/CacheVol.cc
index 51e4306..7acbd95 100644
--- a/iocore/cache/CacheVol.cc
+++ b/iocore/cache/CacheVol.cc
@@ -216,7 +216,7 @@ CacheVC::scanObject(int /* event ATS_UNUSED */, Event * /* e ATS_UNUSED */)
Debug("cache_scan_truss", "blockskip %p:scanObject", this);
continue;
}
-
+
if (doc->doc_type != CACHE_FRAG_TYPE_HTTP || !doc->hlen)
goto Lskip;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cache/CacheWrite.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheWrite.cc b/iocore/cache/CacheWrite.cc
index 9000416..cdefdbc 100644
--- a/iocore/cache/CacheWrite.cc
+++ b/iocore/cache/CacheWrite.cc
@@ -1390,7 +1390,7 @@ Lagain:
total_len += avail;
}
length = (uint64_t)towrite;
- if (length > target_fragment_size() &&
+ if (length > target_fragment_size() &&
(length < target_fragment_size() + target_fragment_size() / 4))
write_len = target_fragment_size();
else
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cache/I_Cache.h
----------------------------------------------------------------------
diff --git a/iocore/cache/I_Cache.h b/iocore/cache/I_Cache.h
index de30eb4..1606a23 100644
--- a/iocore/cache/I_Cache.h
+++ b/iocore/cache/I_Cache.h
@@ -186,7 +186,7 @@ struct CacheProcessor:public Processor
static int fix;
static int start_internal_flags;
static int auto_clear_flag;
-
+
VersionNumber min_stripe_version;
VersionNumber max_stripe_version;
@@ -228,7 +228,7 @@ struct CacheVConnection:public VConnection
virtual bool set_pin_in_cache(time_t t) = 0;
virtual time_t get_pin_in_cache() = 0;
virtual int64_t get_object_size() = 0;
-
+
/** Test if the VC can support pread.
@return @c true if @c do_io_pread will work, @c false if not.
*/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cache/P_CacheDir.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_CacheDir.h b/iocore/cache/P_CacheDir.h
index 638051c..e056e6f 100644
--- a/iocore/cache/P_CacheDir.h
+++ b/iocore/cache/P_CacheDir.h
@@ -127,7 +127,7 @@ typedef uint32_t DirInfo;
struct Dir
{
#if DO_NOT_REMOVE_THIS
- // THE BIT-FIELD INTERPRETATION OF THIS STRUCT WHICH HAS TO
+ // THE BIT-FIELD INTERPRETATION OF THIS STRUCT WHICH HAS TO
// USE MACROS TO PREVENT UNALIGNED LOADS
// bits are numbered from lowest in u16 to highest
// always index as u16 to avoid byte order issues
@@ -152,7 +152,7 @@ struct Dir
struct FreeDir
{
#if DO_NOT_REMOVE_THIS
- // THE BIT-FIELD INTERPRETATION OF THIS STRUCT WHICH HAS TO
+ // THE BIT-FIELD INTERPRETATION OF THIS STRUCT WHICH HAS TO
// USE MACROS TO PREVENT UNALIGNED LOADS
unsigned int offset:24; // 0: empty
unsigned int reserved:8;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cache/P_CacheDisk.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_CacheDisk.h b/iocore/cache/P_CacheDisk.h
index 2734f04..a197435 100644
--- a/iocore/cache/P_CacheDisk.h
+++ b/iocore/cache/P_CacheDisk.h
@@ -107,7 +107,7 @@ struct CacheDisk: public Continuation
// Extra configuration values
int forced_volume_num; ///< Volume number for this disk.
ats_scoped_str hash_base_string; ///< Base string for hash seed.
-
+
CacheDisk()
: Continuation(new_ProxyMutex()), header(NULL),
path(NULL), header_len(0), len(0), start(0), skip(0),
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cache/P_CacheInternal.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h
index ac15efe..57c5b0b 100644
--- a/iocore/cache/P_CacheInternal.h
+++ b/iocore/cache/P_CacheInternal.h
@@ -504,7 +504,7 @@ struct CacheVC: public CacheVConnection
};
// BTF optimization used to skip reading stuff in cache partition that doesn't contain any
// dir entries.
- char *scan_vol_map;
+ char *scan_vol_map;
// BTF fix to handle objects that overlapped over two different reads,
// this is how much we need to back up the buffer to get the start of the overlapping object.
off_t scan_fix_buffer_offset;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cache/P_CacheVol.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_CacheVol.h b/iocore/cache/P_CacheVol.h
index 2c79635..53f24c4 100644
--- a/iocore/cache/P_CacheVol.h
+++ b/iocore/cache/P_CacheVol.h
@@ -560,7 +560,7 @@ struct Vol: public Continuation
{
io.aiocb.aio_fildes = AIO_NOT_IN_PROGRESS;
}
-
+
int aggWriteDone(int event, Event *e);
int aggWrite(int event, void *e);
void agg_wrap();
@@ -667,7 +667,7 @@ vol_headerlen(Vol *d) {
TS_INLINE size_t
vol_dirlen(Vol *d)
{
- return vol_headerlen(d) +
+ return vol_headerlen(d) +
ROUND_TO_STORE_BLOCK(((size_t)d->buckets) * DIR_DEPTH * d->segments * SIZEOF_DIR) +
ROUND_TO_STORE_BLOCK(sizeof(VolHeaderFooter));
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cache/RamCacheCLFUS.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/RamCacheCLFUS.cc b/iocore/cache/RamCacheCLFUS.cc
index f7781de..ce4f332 100644
--- a/iocore/cache/RamCacheCLFUS.cc
+++ b/iocore/cache/RamCacheCLFUS.cc
@@ -106,8 +106,8 @@ public:
RamCacheCLFUSCompressor(RamCacheCLFUS *arc)
: rc(arc)
- {
- SET_HANDLER(&RamCacheCLFUSCompressor::mainEvent);
+ {
+ SET_HANDLER(&RamCacheCLFUSCompressor::mainEvent);
}
};
@@ -117,7 +117,7 @@ RamCacheCLFUSCompressor::mainEvent(int /* event ATS_UNUSED */, Event *e)
switch (cache_config_ram_cache_compress) {
default:
Warning("unknown RAM cache compression type: %d", cache_config_ram_cache_compress);
- case CACHE_COMPRESSION_NONE:
+ case CACHE_COMPRESSION_NONE:
case CACHE_COMPRESSION_FASTLZ:
break;
case CACHE_COMPRESSION_LIBZ:
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cluster/ClusterHandler.cc
----------------------------------------------------------------------
diff --git a/iocore/cluster/ClusterHandler.cc b/iocore/cluster/ClusterHandler.cc
index bdfc3f3..afb0156 100644
--- a/iocore/cluster/ClusterHandler.cc
+++ b/iocore/cluster/ClusterHandler.cc
@@ -2131,7 +2131,7 @@ retry:
if (vc->was_closed()) {
if (!vc->write_bytes_in_transit && !vc->schedule_write()) {
close_ClusterVConnection(vc);
- }
+ }
return 0;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/cluster/ClusterHandlerBase.cc
----------------------------------------------------------------------
diff --git a/iocore/cluster/ClusterHandlerBase.cc b/iocore/cluster/ClusterHandlerBase.cc
index a967778..1fec3ff 100644
--- a/iocore/cluster/ClusterHandlerBase.cc
+++ b/iocore/cluster/ClusterHandlerBase.cc
@@ -141,7 +141,7 @@ ClusterControl::free_data()
ink_release_assert(*(((uint8_t *) data) - DATA_HDR + 1) == (uint8_t) ALLOC_DATA_MAGIC);
*(((uint8_t *) data) - DATA_HDR + 1) = (uint8_t) ~ ALLOC_DATA_MAGIC;
- ink_release_assert(*(((char *) data) - DATA_HDR) == size_index);
+ ink_release_assert(*(((char *) data) - DATA_HDR) == size_index);
} else {
// malloc'ed memory, not alloced via real_alloc_data().
// Data will be ats_free()'ed when IOBufferBlock is freed
@@ -1013,14 +1013,14 @@ ClusterHandler::startClusterEvent(int event, Event * e)
if (net_vc->thread == thread) {
cluster_connect_state = CLCON_CONN_BIND_OK;
break;
- } else {
+ } else {
cluster_connect_state = ClusterHandler::CLCON_CONN_BIND_CLEAR;
}
}
case ClusterHandler::CLCON_CONN_BIND_CLEAR:
{
- UnixNetVConnection *vc = (UnixNetVConnection *)net_vc;
+ UnixNetVConnection *vc = (UnixNetVConnection *)net_vc;
MUTEX_TRY_LOCK(lock, vc->nh->mutex, e->ethread);
MUTEX_TRY_LOCK(lock1, vc->mutex, e->ethread);
if (lock.is_locked() && lock1.is_locked()) {
@@ -1049,9 +1049,9 @@ ClusterHandler::startClusterEvent(int event, Event * e)
case ClusterHandler::CLCON_CONN_BIND:
{
- //
+ //
NetHandler *nh = get_NetHandler(e->ethread);
- UnixNetVConnection *vc = (UnixNetVConnection *)net_vc;
+ UnixNetVConnection *vc = (UnixNetVConnection *)net_vc;
MUTEX_TRY_LOCK(lock, nh->mutex, e->ethread);
MUTEX_TRY_LOCK(lock1, vc->mutex, e->ethread);
if (lock.is_locked() && lock1.is_locked()) {
@@ -1086,7 +1086,7 @@ ClusterHandler::startClusterEvent(int event, Event * e)
if (cc && cc->find(ip, port)) {
ClusterConfiguration *c = this_cluster()->current_configuration();
ClusterMachine *m = c->find(ip, port);
-
+
if (!m) { // this first connection
ClusterConfiguration *cconf = configuration_add_machine(c, machine);
CLUSTER_INCREMENT_DYN_STAT(CLUSTER_NODES_STAT);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/dns/I_DNSProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/dns/I_DNSProcessor.h b/iocore/dns/I_DNSProcessor.h
index b66f172..adb8b59 100644
--- a/iocore/dns/I_DNSProcessor.h
+++ b/iocore/dns/I_DNSProcessor.h
@@ -53,9 +53,9 @@ struct HostEnt : RefCountObj {
virtual void free();
- HostEnt() {
+ HostEnt() {
size_t base = sizeof(force_VFPT_to_top); // preserve VFPT
- memset(((char*)this) + base, 0, sizeof(*this) - base);
+ memset(((char*)this) + base, 0, sizeof(*this) - base);
}
};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/dns/P_DNSConnection.h
----------------------------------------------------------------------
diff --git a/iocore/dns/P_DNSConnection.h b/iocore/dns/P_DNSConnection.h
index 4860376..eedd54c 100644
--- a/iocore/dns/P_DNSConnection.h
+++ b/iocore/dns/P_DNSConnection.h
@@ -94,7 +94,7 @@ struct DNSConnection {
static Options const DEFAULT_OPTIONS;
};
-inline DNSConnection::Options::Options()
+inline DNSConnection::Options::Options()
: _non_blocking_connect(true)
, _non_blocking_io(true)
, _use_tcp(false)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/dns/P_DNSProcessor.h
----------------------------------------------------------------------
diff --git a/iocore/dns/P_DNSProcessor.h b/iocore/dns/P_DNSProcessor.h
index 9cb27ea..4183341 100644
--- a/iocore/dns/P_DNSProcessor.h
+++ b/iocore/dns/P_DNSProcessor.h
@@ -335,7 +335,7 @@ TS_INLINE DNSHandler::DNSHandler()
ns_down[i] = 1;
con[i].handler = this;
}
- memset(&qid_in_flight, 0, sizeof(qid_in_flight));
+ memset(&qid_in_flight, 0, sizeof(qid_in_flight));
SET_HANDLER(&DNSHandler::startEvent);
Debug("net_epoll", "inline DNSHandler::DNSHandler()");
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/eventsystem/I_Tasks.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/I_Tasks.h b/iocore/eventsystem/I_Tasks.h
index 4f7a120..64d66a6 100644
--- a/iocore/eventsystem/I_Tasks.h
+++ b/iocore/eventsystem/I_Tasks.h
@@ -31,7 +31,7 @@ extern EventType ET_TASK;
class TasksProcessor: public Processor
{
- public:
+ public:
int start(int task_threads, size_t stacksize=DEFAULT_STACKSIZE);
};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/hostdb/P_MultiCache.h
----------------------------------------------------------------------
diff --git a/iocore/hostdb/P_MultiCache.h b/iocore/hostdb/P_MultiCache.h
index 283f8ec..b5f81ac 100644
--- a/iocore/hostdb/P_MultiCache.h
+++ b/iocore/hostdb/P_MultiCache.h
@@ -546,7 +546,7 @@ Lfound:
template<class C> inline void MultiCache<C>::flush(C * b, int bucket, unsigned int level)
{
C *block = NULL;
- // The comparison against the constant is redundant, but it
+ // The comparison against the constant is redundant, but it
// quiets the array_bounds error generated by g++ 4.9.2
if (level < levels - 1 && level < (MULTI_CACHE_MAX_LEVELS - 1)) {
if (level >= lowest_level(bucket))
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/net/I_NetVConnection.h
----------------------------------------------------------------------
diff --git a/iocore/net/I_NetVConnection.h b/iocore/net/I_NetVConnection.h
index 71cd1fc..1d8024e 100644
--- a/iocore/net/I_NetVConnection.h
+++ b/iocore/net/I_NetVConnection.h
@@ -453,7 +453,7 @@ public:
/** Returns local ip.
@deprecated get_local_addr() should be used instead for AF_INET6 compatibility.
*/
-
+
in_addr_t get_local_ip();
/** Returns local port. */
@@ -462,7 +462,7 @@ public:
/** Returns remote sockaddr storage. */
sockaddr const* get_remote_addr();
- /** Returns remote ip.
+ /** Returns remote ip.
@deprecated get_remote_addr() should be used instead for AF_INET6 compatibility.
*/
in_addr_t get_remote_ip();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/net/OCSPStapling.cc
----------------------------------------------------------------------
diff --git a/iocore/net/OCSPStapling.cc b/iocore/net/OCSPStapling.cc
index 79e6781..423eb03 100644
--- a/iocore/net/OCSPStapling.cc
+++ b/iocore/net/OCSPStapling.cc
@@ -365,7 +365,7 @@ ocsp_update()
for (unsigned i = 0; i < ctxCount; i++) {
SSLCertContext *cc = certLookup->get(i);
if (cc && cc->ctx) {
- ctx = cc->ctx;
+ ctx = cc->ctx;
cinf = stapling_get_cert_info(ctx);
if (cinf) {
ink_mutex_acquire(&cinf->stapling_mutex);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/net/P_SSLCertLookup.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLCertLookup.h b/iocore/net/P_SSLCertLookup.h
index 05d908c..1c1034a 100644
--- a/iocore/net/P_SSLCertLookup.h
+++ b/iocore/net/P_SSLCertLookup.h
@@ -55,7 +55,7 @@ struct SSLCertContext
SSLCertContext() : ctx(0), opt(OPT_NONE) {}
explicit SSLCertContext(SSL_CTX* c) : ctx(c), opt(OPT_NONE) {}
SSLCertContext(SSL_CTX* c, Option o) : ctx(c), opt(o) {}
-
+
SSL_CTX* ctx; ///< openSSL context.
Option opt; ///< Special handling option.
};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/net/P_SSLNetVConnection.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_SSLNetVConnection.h b/iocore/net/P_SSLNetVConnection.h
index a7cfcbf..c481c8b 100644
--- a/iocore/net/P_SSLNetVConnection.h
+++ b/iocore/net/P_SSLNetVConnection.h
@@ -155,7 +155,7 @@ public:
this->handShakeHolder = this->handShakeReader->clone();
}
void free_handshake_buffers() {
-
+
this->handShakeReader->dealloc();
this->handShakeHolder->dealloc();
free_MIOBuffer(this->handShakeBuffer);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/net/P_UnixNetVConnection.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UnixNetVConnection.h b/iocore/net/P_UnixNetVConnection.h
index d1cac6a..355d6a0 100644
--- a/iocore/net/P_UnixNetVConnection.h
+++ b/iocore/net/P_UnixNetVConnection.h
@@ -53,7 +53,7 @@ NetVCOptions::reset()
f_blocking_connect = false;
socks_support = NORMAL_SOCKS;
socks_version = SOCKS_DEFAULT_VERSION;
- socket_recv_bufsize =
+ socket_recv_bufsize =
#if defined(RECV_BUF_SIZE)
RECV_BUF_SIZE;
#else
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/net/SSLCertLookup.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLCertLookup.cc b/iocore/net/SSLCertLookup.cc
index 814b75d..18d4873 100644
--- a/iocore/net/SSLCertLookup.cc
+++ b/iocore/net/SSLCertLookup.cc
@@ -247,7 +247,7 @@ SSLContextStorage::~SSLContextStorage()
this->ctx_store.qsort(SSLCtxCompare);
SSL_CTX *last_ctx = NULL;
for (unsigned i = 0; i < this->ctx_store.length(); ++i) {
- if (this->ctx_store[i].ctx != last_ctx) {
+ if (this->ctx_store[i].ctx != last_ctx) {
last_ctx = this->ctx_store[i].ctx;
SSLReleaseContext(this->ctx_store[i].ctx);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/net/SSLNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 0db4896..9291726 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -142,7 +142,7 @@ make_ssl_connection(SSL_CTX * ctx, SSLNetVConnection * netvc)
netvc->initialize_handshake_buffers();
BIO *rbio = BIO_new(BIO_s_mem());
BIO *wbio = BIO_new_fd(netvc->get_socket(), BIO_NOCLOSE);
- BIO_set_mem_eof_return(wbio, -1);
+ BIO_set_mem_eof_return(wbio, -1);
SSL_set_bio(ssl, rbio, wbio);
}
@@ -286,9 +286,9 @@ ssl_read_from_net(SSLNetVConnection * sslvc, EThread * lthread, int64_t &ret)
}
/**
- * Read from socket directly for handshake data. Store the data in
+ * Read from socket directly for handshake data. Store the data in
* a MIOBuffer. Place the data in the read BIO so the openssl library
- * has access to it.
+ * has access to it.
* If for some ready we much abort out of the handshake, we can replay
* the stored data (e.g. back out to blind tunneling)
*/
@@ -365,16 +365,16 @@ SSLNetVConnection::read_raw_data()
// Sets up the buffer as a read only bio target
// Must be reset on each read
BIO *rbio = BIO_new_mem_buf(start, end - start);
- BIO_set_mem_eof_return(rbio, -1);
+ BIO_set_mem_eof_return(rbio, -1);
// Assigning directly into the SSL structure
// is dirty, but there is no openssl function that only
// assigns the read bio. Originally I was getting and
- // resetting the same write bio, but that caused the
+ // resetting the same write bio, but that caused the
// inserted buffer bios to be freed and then reinserted.
//BIO *wbio = SSL_get_wbio(this->ssl);
//SSL_set_bio(this->ssl, rbio, wbio);
SSL_set_rbio(this, rbio);
-
+
return r;
}
@@ -442,8 +442,8 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
}
else { // Now in blind tunnel. Set things up to read what is in the buffer
this->readSignalDone(VC_EVENT_READ_COMPLETE, nh);
-
- // If the handshake isn't set yet, this means the tunnel
+
+ // If the handshake isn't set yet, this means the tunnel
// decision was make in the SNI callback. We must move
// the client hello message back into the standard read.vio
// so it will get forwarded onto the origin server
@@ -457,7 +457,7 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
int64_t r = buf.writer()->write(this->handShakeHolder);
s->vio.nbytes += r;
s->vio.ndone += r;
-
+
// Clean up the handshake buffers
this->free_handshake_buffers();
@@ -509,29 +509,29 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
// At this point we are at the post-handshake SSL processing
// If the read BIO is not already a socket, consider changing it
if (this->handShakeReader) {
- if (this->handShakeReader->read_avail() <= 0) {
+ if (this->handShakeReader->read_avail() <= 0) {
// Switch the read bio over to a socket bio
SSL_set_rfd(this->ssl, this->get_socket());
this->free_handshake_buffers();
- }
+ }
else { // There is still data in the buffer to drain
char *data_ptr = NULL;
int data_still_to_read = BIO_get_mem_data(SSL_get_rbio(this->ssl), &data_ptr);
if (data_still_to_read > 0) {
// Still data remaining in the current BIO block
}
- else {
+ else {
// reset the block
char *start = this->handShakeReader->start();
char *end = this->handShakeReader->end();
// Sets up the buffer as a read only bio target
// Must be reset on each read
BIO *rbio = BIO_new_mem_buf(start, end - start);
- BIO_set_mem_eof_return(rbio, -1);
+ BIO_set_mem_eof_return(rbio, -1);
// So assigning directly into the SSL structure
// is dirty, but there is no openssl function that only
// assigns the read bio. Originally I was getting and
- // resetting the same write bio, but that caused the
+ // resetting the same write bio, but that caused the
// inserted buffer bios to be freed and then reinserted.
SSL_set_rbio(this, rbio);
//BIO *wbio = SSL_get_wbio(this->ssl);
@@ -541,7 +541,7 @@ SSLNetVConnection::net_read_io(NetHandler *nh, EThread *lthread)
}
// Otherwise, we already replaced the buffer bio with a socket bio
- // not sure if this do-while loop is really needed here, please replace
+ // not sure if this do-while loop is really needed here, please replace
// this comment if you know
do {
ret = ssl_read_from_net(this, lthread, r);
@@ -817,7 +817,7 @@ SSLNetVConnection::free(EThread * t) {
npnEndpoint= NULL;
if (from_accept_thread) {
- sslNetVCAllocator.free(this);
+ sslNetVCAllocator.free(this);
} else {
THREAD_FREE(this, sslNetVCAllocator, t);
}
@@ -839,7 +839,7 @@ SSLNetVConnection::sslStartHandShake(int event, int &err)
IpEndpoint src, dst;
ip_port_text_buffer ipb1, ipb2;
int ip_len;
-
+
safe_getsockname(this->get_socket(), &dst.sa, &(ip_len = sizeof ip));
safe_getpeername(this->get_socket(), &src.sa, &(ip_len = sizeof ip));
ats_ip_nptop(&dst, ipb1, sizeof(ipb1));
@@ -857,7 +857,7 @@ SSLNetVConnection::sslStartHandShake(int event, int &err)
this->ssl = NULL;
return EVENT_DONE;
}
-
+
// Attach the default SSL_CTX to this SSL session. The default context is never going to be able
// to negotiate a SSL session, but it's enough to trampoline us into the SNI callback where we
@@ -923,7 +923,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
}
}
- // If a blind tunnel was requested in the pre-accept calls, convert.
+ // If a blind tunnel was requested in the pre-accept calls, convert.
// Again no data has been exchanged, so we can go directly
// without data replay.
// Note we can't arrive here if a hook is active.
@@ -943,7 +943,7 @@ SSLNetVConnection::sslServerHandShakeEvent(int &err)
char *data_ptr = NULL;
int data_to_read = BIO_get_mem_data(SSL_get_rbio(this->ssl), &data_ptr);
if (data_to_read <= 0) { // If there is not already data in the buffer
- // Read from socket to fill in the BIO buffer with the
+ // Read from socket to fill in the BIO buffer with the
// raw handshake data before calling the ssl accept calls.
int64_t data_read;
if ((data_read = this->read_raw_data()) > 0) {
@@ -1075,7 +1075,7 @@ SSLNetVConnection::sslClientHandShakeEvent(int &err)
}
}
#endif
-
+
ssl_error_t ssl_error = SSLConnect(ssl);
switch (ssl_error) {
case SSL_ERROR_NONE:
@@ -1222,8 +1222,8 @@ SSLNetVConnection::sslContextSet(void* ctx) {
return zret;
}
-bool
-SSLNetVConnection::callHooks(TSHttpHookID eventId)
+bool
+SSLNetVConnection::callHooks(TSHttpHookID eventId)
{
// Only dealing with the SNI hook so far
ink_assert(eventId == TS_SSL_SNI_HOOK);
@@ -1237,7 +1237,7 @@ SSLNetVConnection::callHooks(TSHttpHookID eventId)
// Invoke the hook
hook->invoke(TS_SSL_SNI_HOOK, this);
- // If it did not re-enable, return the code to
+ // If it did not re-enable, return the code to
// stop the accept processing
if (this->sslSNIHookState == SNI_HOOKS_DONE) {
reenabled = false;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/net/UnixConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixConnection.cc b/iocore/net/UnixConnection.cc
index d738c5e..375ae98 100644
--- a/iocore/net/UnixConnection.cc
+++ b/iocore/net/UnixConnection.cc
@@ -335,7 +335,7 @@ Connection::connect(sockaddr const* target, NetVCOptions const& opt) {
// (Is EWOULDBLOCK ok? Does that start the connect?)
// We also want to handle the cases where the connect blocking
// and IO blocking differ, by turning it on or off as needed.
- if (-1 == res
+ if (-1 == res
&& (opt.f_blocking_connect
|| ! (EINPROGRESS == errno || EWOULDBLOCK == errno))) {
return -errno;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/iocore/net/UnixNetVConnection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc
index 955ffb2..b3d1a17 100644
--- a/iocore/net/UnixNetVConnection.cc
+++ b/iocore/net/UnixNetVConnection.cc
@@ -1104,7 +1104,7 @@ UnixNetVConnection::connectUp(EThread *t, int fd)
// Force family to agree with remote (server) address.
options.ip_family = server_addr.sa.sa_family;
-
+
//
// Initialize this UnixNetVConnection
//
@@ -1208,7 +1208,7 @@ UnixNetVConnection::free(EThread *t)
ink_assert(t == this_ethread());
if (from_accept_thread) {
- netVCAllocator.free(this);
+ netVCAllocator.free(this);
} else {
THREAD_FREE(this, netVCAllocator, t);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc b/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc
index fe98748..62db54a 100644
--- a/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc
+++ b/lib/atscppapi/examples/async_http_fetch/AsyncHttpFetch.cc
@@ -82,7 +82,7 @@ public:
AsyncHttpFetch *post_request = new AsyncHttpFetch("http://127.0.0.1/post", "data");
(void)post_request;
-
+
Async::execute<AsyncHttpFetch>(this, new AsyncHttpFetch("http://127.0.0.1/post", "data"),
getMutex());
++num_fetches_pending_;
@@ -141,7 +141,7 @@ private:
const Response &response = async_http_fetch.getResponse();
if (async_http_fetch.getResult() == AsyncHttpFetch::RESULT_SUCCESS) {
TS_DEBUG(TAG, "Response version is [%s], status code %d, reason phrase [%s]",
- HTTP_VERSION_STRINGS[response.getVersion()].c_str(), response.getStatusCode(),
+ HTTP_VERSION_STRINGS[response.getVersion()].c_str(), response.getStatusCode(),
response.getReasonPhrase().c_str());
TS_DEBUG(TAG, "Reponse Headers: \n%s\n", response.getHeaders().str().c_str());
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc b/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc
index 5312d3b..445188e 100644
--- a/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc
+++ b/lib/atscppapi/examples/null_transformation_plugin/NullTransformationPlugin.cc
@@ -34,7 +34,7 @@ class NullTransformationPlugin : public TransformationPlugin {
public:
NullTransformationPlugin(Transaction &transaction, TransformationPlugin::Type xformType)
: TransformationPlugin(transaction, xformType) {
- registerHook((xformType == TransformationPlugin::REQUEST_TRANSFORMATION) ?
+ registerHook((xformType == TransformationPlugin::REQUEST_TRANSFORMATION) ?
HOOK_SEND_REQUEST_HEADERS : HOOK_SEND_RESPONSE_HEADERS);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc b/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc
index 9f15209..bb0a246 100644
--- a/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc
+++ b/lib/atscppapi/examples/remap_plugin/RemapPlugin.cc
@@ -44,7 +44,7 @@ public:
while (std::getline(iss, query_param_raw, '&')) {
size_t equals_pos = query_param_raw.find('=');
if (equals_pos && (equals_pos < (query_param_raw.size() - 1))) {
- query_params[string(query_param_raw, 0, equals_pos)] =
+ query_params[string(query_param_raw, 0, equals_pos)] =
string(query_param_raw, equals_pos + 1, query_param_raw.size() - equals_pos - 1);
}
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/CaseInsensitiveStringComparator.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/CaseInsensitiveStringComparator.cc b/lib/atscppapi/src/CaseInsensitiveStringComparator.cc
index 2d8b77b..e30ce96 100644
--- a/lib/atscppapi/src/CaseInsensitiveStringComparator.cc
+++ b/lib/atscppapi/src/CaseInsensitiveStringComparator.cc
@@ -47,11 +47,11 @@ int CaseInsensitiveStringComparator::compare(const string &lhs, const string &rh
}
size_t lhs_size = lhs.size();
size_t rhs_size = rhs.size();
- if ((lhs_size > 0) && (rhs_size > 0)) {
+ if ((lhs_size > 0) && (rhs_size > 0)) {
size_t num_chars_to_compare = (lhs_size < rhs_size) ? lhs_size : rhs_size;
for (size_t i = 0; i < num_chars_to_compare; ++i) {
- unsigned char normalized_lhs_char = NORMALIZED_CHARACTERS[static_cast<const unsigned char>(lhs[i])];
- unsigned char normalized_rhs_char = NORMALIZED_CHARACTERS[static_cast<const unsigned char>(rhs[i])];
+ unsigned char normalized_lhs_char = NORMALIZED_CHARACTERS[static_cast<const unsigned char>(lhs[i])];
+ unsigned char normalized_rhs_char = NORMALIZED_CHARACTERS[static_cast<const unsigned char>(rhs[i])];
if (normalized_lhs_char < normalized_rhs_char) {
return -1;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/Headers.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Headers.cc b/lib/atscppapi/src/Headers.cc
index 0cdb089..5693c52 100644
--- a/lib/atscppapi/src/Headers.cc
+++ b/lib/atscppapi/src/Headers.cc
@@ -194,7 +194,7 @@ HeaderFieldName HeaderField::name() const {
}
std::string HeaderField::values(const char *join) {
- std::string ret;
+ std::string ret;
for(header_field_value_iterator it = begin(); it != end(); ++it) {
if (ret.size()) {
ret.append(join);
@@ -309,7 +309,7 @@ header_field_iterator::header_field_iterator(void *hdr_buf, void *hdr_loc, void
static_cast<TSMLoc>(field_loc))) { }
header_field_iterator::header_field_iterator(const header_field_iterator& it) :
- state_(new HeaderFieldIteratorState(*it.state_)) { }
+ state_(new HeaderFieldIteratorState(*it.state_)) { }
header_field_iterator &header_field_iterator::operator=(const header_field_iterator &rhs) {
if (this != &rhs) {
@@ -337,7 +337,7 @@ HeaderFieldIteratorState *advanceIterator(HeaderFieldIteratorState *state,
}
header_field_iterator& header_field_iterator::operator++() {
- state_ = advanceIterator(state_, TSMimeHdrFieldNext);
+ state_ = advanceIterator(state_, TSMimeHdrFieldNext);
return *this;
}
@@ -348,7 +348,7 @@ header_field_iterator header_field_iterator::operator++(int) {
}
header_field_iterator& header_field_iterator::nextDup() {
- state_ = advanceIterator(state_, TSMimeHdrFieldNextDup);
+ state_ = advanceIterator(state_, TSMimeHdrFieldNextDup);
return *this;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/InterceptPlugin.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/InterceptPlugin.cc b/lib/atscppapi/src/InterceptPlugin.cc
index 9384fea..fb73602 100644
--- a/lib/atscppapi/src/InterceptPlugin.cc
+++ b/lib/atscppapi/src/InterceptPlugin.cc
@@ -88,9 +88,9 @@ struct InterceptPlugin::State {
plugin_mutex_ = plugin->getMutex();
http_parser_ = TSHttpParserCreate();
}
-
+
~State() {
- TSHttpParserDestroy(http_parser_);
+ TSHttpParserDestroy(http_parser_);
if (hdr_loc_) {
TSHandleMLocRelease(hdr_buf_, TS_NULL_MLOC, hdr_loc_);
}
@@ -180,7 +180,7 @@ bool InterceptPlugin::doRead() {
LOG_ERROR("Error while getting number of bytes available");
return false;
}
-
+
int consumed = 0; // consumed is used to update the input buffers
if (avail > 0) {
int64_t num_body_bytes_in_block;
@@ -233,7 +233,7 @@ bool InterceptPlugin::doRead() {
}
LOG_DEBUG("Consumed %d bytes from input vio", consumed);
TSIOBufferReaderConsume(state_->input_.reader_, consumed);
-
+
// Modify the input VIO to reflect how much data we've completed.
TSVIONDoneSet(state_->input_.vio_, TSVIONDoneGet(state_->input_.vio_) + consumed);
@@ -274,11 +274,11 @@ void InterceptPlugin::handleEvent(int abstract_event, void *edata) {
break;
case TS_EVENT_VCONN_WRITE_READY: // nothing to do
- LOG_DEBUG("Got write ready");
+ LOG_DEBUG("Got write ready");
break;
case TS_EVENT_VCONN_READ_READY:
- LOG_DEBUG("Handling read ready");
+ LOG_DEBUG("Handling read ready");
if (doRead()) {
break;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/Request.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/Request.cc b/lib/atscppapi/src/Request.cc
index f885690..15e3235 100644
--- a/lib/atscppapi/src/Request.cc
+++ b/lib/atscppapi/src/Request.cc
@@ -73,7 +73,7 @@ Request::Request(const string &url_str, HttpMethod method, HttpVersion version)
}
else {
state_->url_loc_ = NULL;
- LOG_ERROR("Could not create URL field; hdr_buf %p", state_->hdr_buf_);
+ LOG_ERROR("Could not create URL field; hdr_buf %p", state_->hdr_buf_);
}
}
@@ -153,7 +153,7 @@ atscppapi::Headers &Request::getHeaders() const {
Request::~Request() {
if (state_->url_loc_) {
if (state_->destroy_buf_) {
- // usually, hdr_loc is the parent of url_loc, but we created this url_loc "directly" in hdr_buf,
+ // usually, hdr_loc is the parent of url_loc, but we created this url_loc "directly" in hdr_buf,
// so we use null as parent loc in this case
TSMLoc null_parent_loc = NULL;
TSHandleMLocRelease(state_->hdr_buf_, null_parent_loc, state_->url_loc_);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/include/atscppapi/Async.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/Async.h b/lib/atscppapi/src/include/atscppapi/Async.h
index 3bfa2f4..72e0eb5 100644
--- a/lib/atscppapi/src/include/atscppapi/Async.h
+++ b/lib/atscppapi/src/include/atscppapi/Async.h
@@ -57,8 +57,8 @@ public:
};
/**
- * @brief AsyncProvider is the interface that providers of async operations must implement.
- * The system allows decoupling of the lifetime/scope of provider and receiver objects. The
+ * @brief AsyncProvider is the interface that providers of async operations must implement.
+ * The system allows decoupling of the lifetime/scope of provider and receiver objects. The
* receiver object might have expired before the async operation is complete and the system
* handles this case. Because of this decoupling, it is the responsibility of the provider
* to manage it's expiration - self-destruct on completion is a good option.
@@ -67,7 +67,7 @@ class AsyncProvider {
public:
/**
* This method is invoked when the async operation is requested. This call should be used
- * to just start the async operation and *not* block this thread. On completion,
+ * to just start the async operation and *not* block this thread. On completion,
* getDispatchController() can be used to invoke the receiver.
*/
virtual void run() = 0;
@@ -143,7 +143,7 @@ private:
/**
* @private
- *
+ *
* @brief A promise is used to let the dispatch controller know if the receiver is still
* alive to receive the async complete dispatch. When the receiver dies, this promise is
* broken and it automatically updates the dispatch controller.
@@ -191,13 +191,13 @@ private:
class Async : noncopyable {
public:
/**
- * This method sets up the dispatch controller to link the async operation provider and
- * receiver and then initiates the operation by invoking the provider.
+ * This method sets up the dispatch controller to link the async operation provider and
+ * receiver and then initiates the operation by invoking the provider.
*
* @param event_receiver The receiver of the async complete dispatch.
* @param provider The provider of the async operation.
* @param mutex The mutex that is locked during the dispatch of the async event complete.
- * One will be created if nothing is passed in. Transaction plugins should use
+ * One will be created if nothing is passed in. Transaction plugins should use
* TransactionPlugin::getMutex() here and global plugins can pass an appropriate
* or NULL mutex.
*/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/include/atscppapi/AsyncTimer.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/AsyncTimer.h b/lib/atscppapi/src/include/atscppapi/AsyncTimer.h
index 5b5f6d5..ecb6621 100644
--- a/lib/atscppapi/src/include/atscppapi/AsyncTimer.h
+++ b/lib/atscppapi/src/include/atscppapi/AsyncTimer.h
@@ -40,7 +40,7 @@ struct AsyncTimerState;
* acts as a timer. It sends events at the set frequency. Calling the
* destructor will stop the events. A one-off timer just sends one
* event. Calling the destructor before this event will cancel the timer.
- *
+ *
* For either type, user must delete the timer.
*
* See example async_timer for sample usage.
@@ -52,7 +52,7 @@ public:
/**
* Constructor.
- *
+ *
* @param type A one-off timer fires only once and a periodic timer fires periodically.
* @param period_in_ms The receiver will receive an event every this many milliseconds.
* @param initial_period_in_ms The first event will arrive after this many milliseconds. Subsequent
@@ -66,7 +66,7 @@ public:
/**
* Starts the timer.
- */
+ */
void run();
void cancel();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/include/atscppapi/ClientRequest.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/ClientRequest.h b/lib/atscppapi/src/include/atscppapi/ClientRequest.h
index 2da61c5..0eee284 100644
--- a/lib/atscppapi/src/include/atscppapi/ClientRequest.h
+++ b/lib/atscppapi/src/include/atscppapi/ClientRequest.h
@@ -32,7 +32,7 @@ struct ClientRequestState;
/**
* @brief Encapsulates a client request. A client request is different from a
- * server request as it has two URLs - the pristine URL sent by the client
+ * server request as it has two URLs - the pristine URL sent by the client
* and a remapped URL created by the server.
*/
class ClientRequest : public Request {
@@ -43,7 +43,7 @@ public:
ClientRequest(void *raw_txn, void *hdr_buf, void *hdr_loc);
/**
- * Returns the pristine (pre-remap) client request URL
+ * Returns the pristine (pre-remap) client request URL
*
* @return Url Reference to non-mutable pristine URL.
*/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/include/atscppapi/Headers.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/Headers.h b/lib/atscppapi/src/include/atscppapi/Headers.h
index 98340d2..751ff6b 100644
--- a/lib/atscppapi/src/include/atscppapi/Headers.h
+++ b/lib/atscppapi/src/include/atscppapi/Headers.h
@@ -233,7 +233,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;
@@ -527,7 +527,7 @@ public:
/**
* Returns the value at given position of header with given name
* @param name of header
- * @param position of value
+ * @param position of value
* @return value
*/
std::string value(const std::string key, size_type index = 0);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/include/atscppapi/InterceptPlugin.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/InterceptPlugin.h b/lib/atscppapi/src/include/atscppapi/InterceptPlugin.h
index da8d5a4..709e9c5 100644
--- a/lib/atscppapi/src/include/atscppapi/InterceptPlugin.h
+++ b/lib/atscppapi/src/include/atscppapi/InterceptPlugin.h
@@ -88,7 +88,7 @@ protected:
private:
State *state_;
-
+
bool doRead();
void handleEvent(int, void *);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/include/atscppapi/PluginInit.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/PluginInit.h b/lib/atscppapi/src/include/atscppapi/PluginInit.h
index ffa2f91..5a4ffb3 100644
--- a/lib/atscppapi/src/include/atscppapi/PluginInit.h
+++ b/lib/atscppapi/src/include/atscppapi/PluginInit.h
@@ -28,7 +28,7 @@
extern "C" {
-/**
+/**
* Invoked for "general" plugins - listed in plugin.config. The arguments in the
* plugin.config line are provided in this invocation.
*
@@ -39,7 +39,7 @@ void TSPluginInit(int argc, const char *argv[]);
enum TsReturnCode { TS_ERROR = -1, TS_SUCCESS = 0 };
-/**
+/**
* Invoked for remap plugins - listed in remap.config. The arguments provided as @pparam
* in the remap.config line are provided in this invocation.
*
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/include/atscppapi/RemapPlugin.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/RemapPlugin.h b/lib/atscppapi/src/include/atscppapi/RemapPlugin.h
index 2f33143..3f44f78 100644
--- a/lib/atscppapi/src/include/atscppapi/RemapPlugin.h
+++ b/lib/atscppapi/src/include/atscppapi/RemapPlugin.h
@@ -30,14 +30,14 @@
namespace atscppapi {
-/**
+/**
* @brief Base class that remap plugins should extend.
*/
class RemapPlugin {
public:
/**
* Constructor
- *
+ *
* @param instance_handle The instance_handle argument received in TSRemapInit() should be passed here.
*/
RemapPlugin(void **instance_handle);
@@ -45,15 +45,15 @@ public:
enum Result { RESULT_ERROR = 0, RESULT_NO_REMAP, RESULT_DID_REMAP, RESULT_NO_REMAP_STOP,
RESULT_DID_REMAP_STOP };
- /**
+ /**
* Invoked when a request matches the remap.config line - implementation should perform the
* remap. The client's URL is in the transaction and that's where it should be modified.
- *
+ *
* @param map_from_url The map from URL specified in the remap.config line.
* @param map_to_url The map to URL specified in the remap.config line.
* @param transaction Transaction
* @param redirect Output argument that should be set to true if the (new) url should be used
- * as a redirect.
+ * as a redirect.
*
* @return Result of the remap - will dictate futher processing by the system.
*/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/include/atscppapi/Request.h
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/include/atscppapi/Request.h b/lib/atscppapi/src/include/atscppapi/Request.h
index 8831725..f2aa1bb 100644
--- a/lib/atscppapi/src/include/atscppapi/Request.h
+++ b/lib/atscppapi/src/include/atscppapi/Request.h
@@ -44,7 +44,7 @@ public:
/**
* Constructed with an initial URL.
*/
- Request(const std::string &url, HttpMethod method = HTTP_METHOD_GET, HttpVersion version = HTTP_VERSION_1_1);
+ Request(const std::string &url, HttpMethod method = HTTP_METHOD_GET, HttpVersion version = HTTP_VERSION_1_1);
/** @return HTTP method of the request */
HttpMethod getMethod() const;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/atscppapi/src/utils_internal.cc
----------------------------------------------------------------------
diff --git a/lib/atscppapi/src/utils_internal.cc b/lib/atscppapi/src/utils_internal.cc
index 33baa53..040ffb0 100644
--- a/lib/atscppapi/src/utils_internal.cc
+++ b/lib/atscppapi/src/utils_internal.cc
@@ -68,7 +68,7 @@ int handleTransactionEvents(TSCont cont, TSEvent event, void *edata) {
utils::internal::initTransactionClientResponse(transaction);
break;
case TS_EVENT_HTTP_TXN_CLOSE:
- { // opening scope to declare plugins variable below
+ { // opening scope to declare plugins variable below
const std::list<TransactionPlugin *> &plugins = utils::internal::getTransactionPlugins(transaction);
for (std::list<TransactionPlugin *>::const_iterator iter = plugins.begin(), end = plugins.end();
iter != end; ++iter) {
@@ -85,7 +85,7 @@ int handleTransactionEvents(TSCont cont, TSEvent event, void *edata) {
default:
assert(false); /* we should never get here */
break;
- }
+ }
TSHttpTxnReenable(ats_txn_handle, TS_EVENT_HTTP_CONTINUE);
return 0;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/records/RecHttp.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecHttp.cc b/lib/records/RecHttp.cc
index 78c1edd..5d263a2 100644
--- a/lib/records/RecHttp.cc
+++ b/lib/records/RecHttp.cc
@@ -403,12 +403,12 @@ void
SessionProtocolNameRegistry::markIn(char const* value, SessionProtocolSet& sp_set) {
int n; // # of tokens
Tokenizer tokens(" ;|,:");
-
+
n = tokens.Initialize(value);
for ( int i = 0 ; i < n ; ++i ) {
char const* elt = tokens[i];
-
+
/// Check special cases
if (0 == strcasecmp(elt, TS_NPN_PROTOCOL_GROUP_HTTP)) {
sp_set.markIn(HTTP_PROTOCOL_SET);
@@ -525,7 +525,7 @@ HttpProxyPort::print(char* out, size_t n) {
need_colon_p = false;
}
if (sp_set.contains(SPDY_PROTOCOL_SET)) {
- if (need_colon_p)
+ if (need_colon_p)
zret += snprintf(out+zret, n-zret, ":%s=", OPT_PROTO_PREFIX);
else
out[zret++] = ';';
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/IntrusiveDList.h
----------------------------------------------------------------------
diff --git a/lib/ts/IntrusiveDList.h b/lib/ts/IntrusiveDList.h
index 2bb82b4..81a5192 100644
--- a/lib/ts/IntrusiveDList.h
+++ b/lib/ts/IntrusiveDList.h
@@ -67,12 +67,12 @@ namespace std {
Elt* _prev;
};
@endcode
-
+
The list is declared as
@code
typedef IntrusiveDList<Elt, &Elt::_next, &Elt::_prev> EltList;
@endcode
-
+
An element can be in multiple types of lists simultaneously as
long as each list type uses distinct members. It is not possible
for an element to be in more than one list of the same type
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/IpMap.cc
----------------------------------------------------------------------
diff --git a/lib/ts/IpMap.cc b/lib/ts/IpMap.cc
index 4b879ff..ce44118 100644
--- a/lib/ts/IpMap.cc
+++ b/lib/ts/IpMap.cc
@@ -107,7 +107,7 @@ template <
typename N ///< Node type.
> struct IpMapBase {
friend class ::IpMap;
-
+
typedef IpMapBase self; ///< Self reference type.
typedef typename N::ArgType ArgType; ///< Import type.
typedef typename N::Metric Metric; ///< Import type.g482
@@ -218,7 +218,7 @@ template <
/// Print all spans.
/// @return This map.
self& print();
-
+
// Helper methods.
N* prev(RBNode* n) const { return static_cast<N*>(n->_prev); }
N* next(RBNode* n) const { return static_cast<N*>(n->_next); }
@@ -673,7 +673,7 @@ public:
return *this;
}
protected:
-
+
/// Set the minimum value of the interval.
/// @return This interval.
self& setMin(
@@ -683,7 +683,7 @@ protected:
_sa._min.sin_addr.s_addr = htonl(min);
return *this;
}
-
+
/// Set the maximum value of the interval.
/// @return This interval.
self& setMax(
@@ -693,7 +693,7 @@ protected:
_sa._max.sin_addr.s_addr = htonl(max);
return *this;
}
-
+
/** Set the maximum value to one less than @a max.
@return This object.
*/
@@ -731,14 +731,14 @@ protected:
) {
++m;
}
-
+
/// Decrement a metric.
static void dec(
Metric& m ///< Decremented in place.
) {
--m;
}
-
+
/// @return Dereferenced @a addr.
static Metric deref(
ArgType addr ///< Argument to dereference.
@@ -752,7 +752,7 @@ protected:
) {
return metric;
}
-
+
struct {
sockaddr_in _min;
sockaddr_in _max;
@@ -807,7 +807,7 @@ public:
return *this;
}
protected:
-
+
/// Set the minimum value of the interval.
/// @return This interval.
self& setMin(
@@ -816,7 +816,7 @@ protected:
ats_ip_copy(ats_ip_sa_cast(&_min), ats_ip_sa_cast(min));
return *this;
}
-
+
/// Set the minimum value of the interval.
/// @note Convenience overload.
/// @return This interval.
@@ -825,7 +825,7 @@ protected:
) {
return this->setMin(&min);
}
-
+
/// Set the maximum value of the interval.
/// @return This interval.
self& setMax(
@@ -870,7 +870,7 @@ protected:
@return This object.
*/
self& incrementMin() { inc(_min); return *this; }
-
+
/// Increment a metric.
static void inc(
Metric& m ///< Incremented in place.
@@ -883,7 +883,7 @@ protected:
++*--b;
} while (b > addr && 0 == *b);
}
-
+
/// Decrement a metric.
static void dec(
Metric& m ///< Decremented in place.
@@ -902,14 +902,14 @@ protected:
) {
return *addr;
}
-
+
/// @return The argument type for the @a metric.
static ArgType argue(
Metric const& metric
) {
return &metric;
}
-
+
};
// We declare this after the helper operators and inside this namespace
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/IpMap.h
----------------------------------------------------------------------
diff --git a/lib/ts/IpMap.h b/lib/ts/IpMap.h
index 7afb9a6..77bef62 100644
--- a/lib/ts/IpMap.h
+++ b/lib/ts/IpMap.h
@@ -94,7 +94,7 @@ public:
typedef IpMap self; ///< Self reference type.
class iterator; // forward declare.
-
+
/** Public API for intervals in the map.
*/
class Node : protected ts::detail::RBNode {
@@ -360,10 +360,10 @@ protected:
/// Force the IPv6 map to exist.
/// @return The IPv6 map.
ts::detail::Ip6Map* force6();
-
+
ts::detail::Ip4Map* _m4; ///< Map of IPv4 addresses.
ts::detail::Ip6Map* _m6; ///< Map of IPv6 addresses.
-
+
};
inline IpMap& IpMap::mark(in_addr_t addr, void* data) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/IpMapTest.cc
----------------------------------------------------------------------
diff --git a/lib/ts/IpMapTest.cc b/lib/ts/IpMapTest.cc
index ead0d48..14a8107 100644
--- a/lib/ts/IpMapTest.cc
+++ b/lib/ts/IpMapTest.cc
@@ -158,7 +158,7 @@ REGRESSION_TEST(IpMap_Fill)(RegressionTest* t, int /* atype ATS_UNUSED */, int*
IpMap map;
ip_text_buffer ipb1, ipb2;
void* const allow = reinterpret_cast<void*>(0);
- void* const deny = reinterpret_cast<void*>(~0);
+ void* const deny = reinterpret_cast<void*>(~0);
void* const markA = reinterpret_cast<void*>(1);
void* const markB = reinterpret_cast<void*>(2);
void* const markC = reinterpret_cast<void*>(3);
@@ -265,7 +265,7 @@ REGRESSION_TEST(IpMap_Fill)(RegressionTest* t, int /* atype ATS_UNUSED */, int*
"IpMap Fill[v6]: 9d9b address has bad mark.");
tb.check(map.contains(&a_0000_0001, &mark) && mark == markA,
"IpMap Fill[v6]: ::1 has bad mark.");
-
+
tb.check(map.getCount() == 10, "IpMap Fill[pre-refill]: Bad range count.");
// These should be ignored by the map as it is completely covered for IPv6.
map.fill(&a_fe80_9d90, &a_fe80_9d9d, markA);
@@ -291,5 +291,5 @@ REGRESSION_TEST(IpMap_Fill)(RegressionTest* t, int /* atype ATS_UNUSED */, int*
"IpMap Fill[v6-2]: 9d9b address has bad mark.");
tb.check(map.contains(&a_0000_0001, &mark) && mark == markC,
"IpMap Fill[v6-2]: ::1 has bad mark.");
-
+
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/List.h
----------------------------------------------------------------------
diff --git a/lib/ts/List.h b/lib/ts/List.h
index af44ece..4faa327 100644
--- a/lib/ts/List.h
+++ b/lib/ts/List.h
@@ -468,7 +468,7 @@ List<C,A>::reverse() {
//
// Atomic lists
-//
+//
template<class C, class L = typename C::Link_link> struct AtomicSLL
{
[3/5] trafficserver git commit: Remove trailing whitespace
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_pagespeed.cc b/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
index dbc1e10..05eebaf 100644
--- a/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
+++ b/plugins/experimental/ats_pagespeed/ats_pagespeed.cc
@@ -103,7 +103,7 @@ static TransformCtx *
ats_ctx_alloc()
{
TransformCtx *ctx;
-
+
ctx = (TransformCtx *) TSmalloc(sizeof(TransformCtx));
ctx->downstream_vio = NULL;
ctx->downstream_buffer = NULL;
@@ -112,7 +112,7 @@ ats_ctx_alloc()
ctx->base_fetch = NULL;
ctx->proxy_fetch = NULL;
-
+
ctx->inflater = NULL;
ctx->url_string = NULL;
ctx->gurl = NULL;
@@ -186,16 +186,16 @@ ats_ctx_destroy(TransformCtx * ctx)
delete ctx->to_host;
ctx->to_host = NULL;
}
- if (ctx->driver != NULL) {
+ if (ctx->driver != NULL) {
ctx->driver->Cleanup();
ctx->driver = NULL;
}
- if (ctx->recorder != NULL) {
+ if (ctx->recorder != NULL) {
ctx->recorder->Fail();
ctx->recorder->DoneAndSetHeaders(NULL); // Deletes recorder.
ctx->recorder = NULL;
}
- if (ctx->ipro_response_headers != NULL) {
+ if (ctx->ipro_response_headers != NULL) {
delete ctx->ipro_response_headers;
ctx->ipro_response_headers = NULL;
}
@@ -298,7 +298,7 @@ handle_send_response_headers(TSHttpTxn txnp) {
// TODO(oschaaf): figure out when this happens.
return;
}
-
+
if (TSHttpTxnClientRespGet(txnp, &bufp, &hdr_loc) == TS_SUCCESS) {
ResponseHeaders* pagespeed_headers =
ctx->base_fetch->response_headers();
@@ -310,7 +310,7 @@ handle_send_response_headers(TSHttpTxn txnp) {
if ( StringCaseEqual(name_gs, "Connection") || StringCaseEqual(name_gs, "Transfer-Encoding") ) {
continue;
}
-
+
TSMLoc field_loc = TSMimeHdrFieldFind(bufp, hdr_loc, name_gs.data(), name_gs.size());
if (field_loc != NULL) {
TSMimeHdrFieldValuesClear(bufp, hdr_loc, field_loc);
@@ -327,9 +327,9 @@ handle_send_response_headers(TSHttpTxn txnp) {
TSHandleMLocRelease(bufp, hdr_loc, field_loc);
} else {
CHECK(false) << "Field create failure";
- }
+ }
}
-
+
TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
} else {
DCHECK(false) << "Could not get response headers?!";
@@ -472,7 +472,7 @@ ats_transform_init(TSCont contp, TransformCtx * ctx)
}
// TODO(oschaaf): fix host/ip(?)
- SystemRequestContext* system_request_context =
+ SystemRequestContext* system_request_context =
new SystemRequestContext(server_context->thread_system()->NewMutex(),
server_context->timer(),
"www.foo.com",
@@ -482,12 +482,12 @@ ats_transform_init(TSCont contp, TransformCtx * ctx)
ctx->base_fetch = new AtsBaseFetch(server_context, RequestContextPtr(system_request_context),
ctx->downstream_vio, ctx->downstream_buffer, false);
-
+
RewriteOptions* options = NULL;
RequestHeaders* request_headers = new RequestHeaders();
ctx->base_fetch->SetRequestHeadersTakingOwnership(request_headers);
copy_request_headers_to_psol(reqp, req_hdr_loc, request_headers);
-
+
TSHttpStatus status = TSHttpHdrStatusGet(bufp, hdr_loc);
// TODO(oschaaf): http version
ctx->base_fetch->response_headers()->set_status_code(status);
@@ -507,7 +507,7 @@ ats_transform_init(TSCont contp, TransformCtx * ctx)
// Take ownership of custom_options.
scoped_ptr<RewriteOptions> custom_options(options);
-
+
if (!ok) {
TSError("Failure while determining request options for psol");
options = server_context->global_options();
@@ -516,17 +516,17 @@ ats_transform_init(TSCont contp, TransformCtx * ctx)
// parameters. Keep url_string in sync with url.
ctx->gurl->Spec().CopyToString(ctx->url_string);
}
-
+
RewriteDriver* driver;
if (custom_options.get() == NULL) {
driver = server_context->NewRewriteDriver(ctx->base_fetch->request_context());
} else {
driver = server_context->NewCustomRewriteDriver(custom_options.release(), ctx->base_fetch->request_context());
}
-
+
driver->SetUserAgent(ctx->user_agent->c_str());
driver->SetRequestHeaders(*request_headers);
-
+
bool page_callback_added = false;
scoped_ptr<ProxyFetchPropertyCallbackCollector>
property_callback(
@@ -538,7 +538,7 @@ ats_transform_init(TSCont contp, TransformCtx * ctx)
ctx->base_fetch,
false /* requires_blink_cohort (no longer unused) */,
&page_callback_added));
-
+
ctx->proxy_fetch =
ats_process_context->proxy_fetch_factory()->CreateNewProxyFetch(
*(ctx->url_string), ctx->base_fetch, driver,
@@ -573,27 +573,27 @@ ats_transform_one(TransformCtx * ctx, TSIOBufferReader upstream_reader, int amou
if (upstream_length > amount) {
upstream_length = amount;
}
-
+
TSDebug("ats-speed", "transform!");
// TODO(oschaaf): use at least the message handler from the server conrtext here?
if (ctx->inflater == NULL) {
- if (ctx->recorder != NULL) {
+ if (ctx->recorder != NULL) {
ctx->recorder->Write(StringPiece((char*)upstream_buffer, upstream_length), ats_process_context->message_handler());
} else {
ctx->proxy_fetch->Write(StringPiece((char*)upstream_buffer, upstream_length), ats_process_context->message_handler());
}
} else {
char buf[net_instaweb::kStackBufferSize];
-
+
ctx->inflater->SetInput((char*)upstream_buffer, upstream_length);
-
+
while (ctx->inflater->HasUnconsumedInput()) {
int num_inflated_bytes = ctx->inflater->InflateBytes(
buf, net_instaweb::kStackBufferSize);
if (num_inflated_bytes < 0) {
TSError("Corrupted inflation");
} else if (num_inflated_bytes > 0) {
- if (ctx->recorder != NULL ) {
+ if (ctx->recorder != NULL ) {
ctx->recorder->Write(StringPiece(buf, num_inflated_bytes),
ats_process_context->message_handler());
} else {
@@ -618,11 +618,11 @@ ats_transform_finish(TransformCtx * ctx)
{
if (ctx->state == transform_state_output) {
ctx->state = transform_state_finished;
- if (ctx->recorder != NULL ) {
+ if (ctx->recorder != NULL ) {
TSDebug("ats-speed", "ipro recording finished");
ctx->recorder->DoneAndSetHeaders(ctx->ipro_response_headers);
ctx->recorder = NULL;
- } else {
+ } else {
TSDebug("ats-speed", "proxy fetch finished");
ctx->proxy_fetch->Done(true);
ctx->proxy_fetch = NULL;
@@ -738,7 +738,7 @@ ats_pagespeed_transform_add(TSHttpTxn txnp)
TSDebug("ats-speed", "transform added");
ctx->transform_added = true;
}
-
+
TSHttpTxnUntransformedRespCache(txnp, ctx->recorder == NULL ? 1 : 0);
TSHttpTxnTransformedRespCache(txnp, 0);
@@ -755,12 +755,12 @@ handle_read_request_header(TSHttpTxn txnp) {
TSMLoc hdr_loc = NULL;
char *url = NULL;
int url_length = -1;
-
+
TransformCtx* ctx = ats_ctx_alloc();
ctx->txn = txnp;
TSHttpTxnArgSet(txnp, TXN_INDEX_ARG, (void*) ctx);
TSHttpTxnArgSet(txnp, TXN_INDEX_OWNED_ARG, &TXN_INDEX_OWNED_ARG_SET);
-
+
if (TSHttpTxnClientReqGet(txnp, &reqp, &hdr_loc) == TS_SUCCESS) {
url = TSHttpTxnEffectiveUrlStringGet(txnp, &url_length);
if (!url || url_length <= 0) {
@@ -768,7 +768,7 @@ handle_read_request_header(TSHttpTxn txnp) {
} else {
std::string s_url = std::string(url,url_length);
GoogleUrl gurl(s_url);
-
+
ctx->url_string = new GoogleString(url, url_length);
ctx->gurl = new GoogleUrl(*(ctx->url_string));
@@ -789,11 +789,11 @@ handle_read_request_header(TSHttpTxn txnp) {
ctx->mps_user_agent = true;
}
if (ats_process_context->server_context()->IsPagespeedResource(gurl)) {
- if (head_or_get && !ctx->mps_user_agent) {
+ if (head_or_get && !ctx->mps_user_agent) {
ctx->resource_request = true;
TSHttpTxnArgSet(txnp, TXN_INDEX_OWNED_ARG, &TXN_INDEX_OWNED_ARG_UNSET);
}
- } else if ( ctx->gurl->PathSansLeaf() ==
+ } else if ( ctx->gurl->PathSansLeaf() ==
((AtsRewriteDriverFactory*)ctx->server_context->factory())->static_asset_prefix()) {
ctx->resource_request = true;
TSHttpTxnArgSet(txnp, TXN_INDEX_OWNED_ARG, &TXN_INDEX_OWNED_ARG_UNSET);
@@ -805,22 +805,22 @@ handle_read_request_header(TSHttpTxn txnp) {
} else {
AtsServerContext* server_context = ctx->server_context;
// TODO(oschaaf): fix host/ip(?)
- SystemRequestContext* system_request_context =
+ SystemRequestContext* system_request_context =
new SystemRequestContext(server_context->thread_system()->NewMutex(),
server_context->timer(),
"www.foo.com",
80,
"127.0.0.1");
-
+
ctx->base_fetch = new AtsBaseFetch(server_context, RequestContextPtr(system_request_context),
ctx->downstream_vio, ctx->downstream_buffer, false);
-
-
+
+
RewriteOptions* options = NULL;
RequestHeaders* request_headers = new RequestHeaders();
ctx->base_fetch->SetRequestHeadersTakingOwnership(request_headers);
copy_request_headers_to_psol(reqp, hdr_loc, request_headers);
-
+
//TSHttpStatus status = TSHttpHdrStatusGet(bufp, hdr_loc);
// TODO(oschaaf): http version
//ctx->base_fetch->response_headers()->set_status_code(status);
@@ -840,7 +840,7 @@ handle_read_request_header(TSHttpTxn txnp) {
// Take ownership of custom_options.
scoped_ptr<RewriteOptions> custom_options(options);
-
+
if (!ok) {
TSError("Failure while determining request options for psol");
options = server_context->global_options();
@@ -849,7 +849,7 @@ handle_read_request_header(TSHttpTxn txnp) {
// parameters. Keep url_string in sync with url.
ctx->gurl->Spec().CopyToString(ctx->url_string);
}
-
+
if (options->in_place_rewriting_enabled() &&
options->enabled() &&
options->IsAllowed(ctx->gurl->Spec())) {
@@ -868,7 +868,7 @@ handle_read_request_header(TSHttpTxn txnp) {
ctx->server_context->message_handler()->Message(
kInfo, "Trying to serve rewritten resource in-place: %s",
ctx->url_string->c_str());
-
+
ctx->in_place = true;
ctx->base_fetch->set_handle_error(false);
ctx->base_fetch->set_is_ipro(true);
@@ -903,7 +903,7 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
CHECK(event == TS_EVENT_HTTP_READ_RESPONSE_HDR || event == TS_EVENT_HTTP_READ_CACHE_HDR
|| event == TS_EVENT_HTTP_SEND_REQUEST_HDR || event == TS_EVENT_HTTP_READ_REQUEST_HDR
- || event == TS_EVENT_HTTP_TXN_CLOSE || event == TS_EVENT_HTTP_SEND_RESPONSE_HDR)
+ || event == TS_EVENT_HTTP_TXN_CLOSE || event == TS_EVENT_HTTP_SEND_RESPONSE_HDR)
<< "Invalid transform event";
if (event != TS_EVENT_HTTP_READ_REQUEST_HDR) {
@@ -922,9 +922,9 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
} if (event == TS_EVENT_HTTP_TXN_CLOSE) {
TransformCtx* ctx = get_transaction_context(txn);
//if (ctx != NULL && !ctx->resource_request && !ctx->beacon_request && !ctx->html_rewrite) {
- // For intercepted requests like beacons and resource requests, we don't own the
+ // For intercepted requests like beacons and resource requests, we don't own the
// ctx here - the interceptor does.
-
+
if (ctx != NULL) {
bool is_owned = TSHttpTxnArgGet(txn, TXN_INDEX_OWNED_ARG) == &TXN_INDEX_OWNED_ARG_SET
//TODO(oschaaf): rewrite this.
@@ -937,11 +937,11 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
return 0;
} if (event == TS_EVENT_HTTP_READ_REQUEST_HDR) {
handle_read_request_header(txn);
- return 0;
+ return 0;
} else if (event == TS_EVENT_HTTP_SEND_REQUEST_HDR) {
TSMBuffer request_header_buf = NULL;
TSMLoc request_header_loc = NULL;
-
+
if (TSHttpTxnServerReqGet(txn, &request_header_buf, &request_header_loc) == TS_SUCCESS) {
hide_accept_encoding(request_header_buf, request_header_loc, "@xxAccept-Encoding");
// Turn off pagespeed optimization at the origin
@@ -955,7 +955,7 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
} else if (event == TS_EVENT_HTTP_READ_RESPONSE_HDR) {
TSMBuffer request_header_buf = NULL;
TSMLoc request_header_loc = NULL;
-
+
if (TSHttpTxnServerReqGet(txn, &request_header_buf, &request_header_loc) == TS_SUCCESS) {
restore_accept_encoding(request_header_buf, request_header_loc, "@xxAccept-Encoding");
TSHandleMLocRelease(request_header_buf, TS_NULL_MLOC, request_header_loc);
@@ -972,7 +972,7 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
return 0;
}
- if (ctx->serve_in_place) {
+ if (ctx->serve_in_place) {
TSHttpTxnArgSet(txn, TXN_INDEX_OWNED_ARG, &TXN_INDEX_OWNED_ARG_UNSET);
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
return 0;
@@ -992,15 +992,15 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
override_expiry = get_override_expiry(host);
}
-
+
if (ctx->mps_user_agent && override_expiry) {
if (TSHttpTxnServerRespGet(txn, &response_header_buf, &response_header_loc) == TS_SUCCESS) {
// TODO => set cacheable.
unset_header(response_header_buf, response_header_loc, "Cache-Control");
unset_header(response_header_buf, response_header_loc, "Expires");
unset_header(response_header_buf, response_header_loc, "Age");
- set_header(response_header_buf, response_header_loc, "Cache-Control", "public, max-age=3600");
- TSHandleMLocRelease(response_header_buf, TS_NULL_MLOC, response_header_loc);
+ set_header(response_header_buf, response_header_loc, "Cache-Control", "public, max-age=3600");
+ TSHandleMLocRelease(response_header_buf, TS_NULL_MLOC, response_header_loc);
}
}
bool ok = ctx->gurl->IsWebValid() &&
@@ -1009,9 +1009,9 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
return 0;
}
-
+
bool have_response_header = false;
-
+
if (TSHttpTxnServerRespGet(txn, &response_header_buf, &response_header_loc) == TS_SUCCESS) {
have_response_header = true;
if (override_expiry) {
@@ -1023,7 +1023,7 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
}
else if (TSHttpTxnCachedRespGet(txn, &response_header_buf, &response_header_loc) == TS_SUCCESS) {
have_response_header = true;
- }
+ }
if (!have_response_header) {
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
return 0;
@@ -1047,12 +1047,12 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
}
}
- if (ok) {
+ if (ok) {
StringPiece s_content_type = get_header(response_header_buf, response_header_loc, "Content-Type");
const net_instaweb::ContentType* content_type =
net_instaweb::MimeTypeToContentType(s_content_type);
- if (ctx->record_in_place && content_type != NULL) {
+ if (ctx->record_in_place && content_type != NULL) {
GoogleString cache_url = *ctx->url_string;
ctx->server_context->rewrite_stats()->ipro_not_in_cache()->Add(1);
ctx->server_context->message_handler()->Message(
@@ -1069,7 +1069,7 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
// (or at least a note that it cannot be cached stored there).
// We do that using an Apache output filter.
// TODO(oschaaf): fix host/ip(?)
- SystemRequestContext* system_request_context =
+ SystemRequestContext* system_request_context =
new SystemRequestContext(ctx->server_context->thread_system()->NewMutex(),
ctx->server_context->timer(),
"www.foo.com",
@@ -1100,14 +1100,14 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
ok = false;
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
return 0;
- }
+ }
}
-
+
if (ok) {
StringPiece content_encoding = get_header(response_header_buf, response_header_loc, "Content-Encoding");
net_instaweb::GzipInflater::InflateType inflate_type;
bool is_encoded = false;
-
+
if (StringCaseEqual(content_encoding, "deflate")) {
is_encoded = true;
inflate_type = GzipInflater::kDeflate;
@@ -1125,7 +1125,7 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
TSDebug(DEBUG_TAG, "Will optimize [%s]", ctx->url_string->c_str());
} else if (ctx->recorder != NULL) {
TSDebug(DEBUG_TAG, "Will record in place: [%s]", ctx->url_string->c_str());
- } else {
+ } else {
CHECK(false) << "At this point, adding a transform makes no sense";
}
@@ -1133,9 +1133,9 @@ transform_plugin(TSCont contp, TSEvent event, void *edata)
ats_pagespeed_transform_add(txn);
}
- TSHandleMLocRelease(response_header_buf, TS_NULL_MLOC, response_header_loc);
+ TSHandleMLocRelease(response_header_buf, TS_NULL_MLOC, response_header_loc);
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
-
+
return 0;
}
@@ -1156,8 +1156,8 @@ bool RegisterPlugin() {
void cleanup_process() {
delete ats_process_context;
- AtsRewriteDriverFactory::Terminate();
- AtsRewriteOptions::Terminate();
+ AtsRewriteDriverFactory::Terminate();
+ AtsRewriteOptions::Terminate();
}
static void
@@ -1166,7 +1166,7 @@ process_configuration()
AtsConfig* new_config = new AtsConfig((AtsThreadSystem*)ats_process_context->server_context()->thread_system());
DIR *dir;
struct dirent *ent;
-
+
if ((dir = opendir ("/usr/local/etc/trafficserver/psol/")) != NULL) {
while ((ent = readdir (dir)) != NULL) {
size_t len = strlen(ent->d_name);
@@ -1201,14 +1201,14 @@ config_notification_callback(void *data)
int BUF_MAX = 1024 * (sizeof(struct inotify_event) + 16);
char buf[BUF_MAX];
int fd,wd;
-
+
fd = inotify_init();
if (fd < 0) {
perror( "inotify_init" );
CHECK(false) << "Failed to initialize inotify";
}
-
+
wd = inotify_add_watch(fd, "/usr/local/etc/trafficserver/psol/", IN_MODIFY | IN_CREATE | IN_DELETE);
while (1) {
@@ -1249,8 +1249,8 @@ void TSPluginInit(int argc, const char *argv[]) {
CHECK(false) << "failed to reserve an argument index";
}
- AtsRewriteOptions::Initialize();
- AtsRewriteDriverFactory::Initialize();
+ AtsRewriteOptions::Initialize();
+ AtsRewriteDriverFactory::Initialize();
net_instaweb::log_message_handler::Install();
atexit(cleanup_process);
ats_process_context = new AtsProcessContext();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_process_context.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_process_context.cc b/plugins/experimental/ats_pagespeed/ats_process_context.cc
index f3ca481..866ee68 100644
--- a/plugins/experimental/ats_pagespeed/ats_process_context.cc
+++ b/plugins/experimental/ats_pagespeed/ats_process_context.cc
@@ -56,7 +56,7 @@ namespace net_instaweb {
message_handler_->Message(kInfo,"server ctx default options:\r\n[%s]",server_context_->global_options()->OptionsToString().c_str());
std::vector<SystemServerContext*> server_contexts;
server_contexts.push_back(server_context_);
-
+
//Statistics* statistics =
// driver_factory_->MakeGlobalSharedMemStatistics(*(SystemRewriteOptions*)server_context_->global_options());
GoogleString error_message;
@@ -70,9 +70,9 @@ namespace net_instaweb {
//return NGX_ERROR;
CHECK(false);
}
-
+
AtsRewriteDriverFactory::InitStats(global_statistics);
-
+
driver_factory()->RootInit();
driver_factory()->ChildInit();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc b/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc
index 3a3b90f..d2c1fc1 100644
--- a/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc
+++ b/plugins/experimental/ats_pagespeed/ats_resource_intercept.cc
@@ -112,7 +112,7 @@ resource_intercept(TSCont cont, TSEvent event, void *edata)
// response will already have a size for internal pages at this point.
// resources, however, will have to be fetched.
// TODO(oschaaf): this is extremely ugly.
- if (intercept_ctx->response->size() == 0) {
+ if (intercept_ctx->response->size() == 0) {
// TODO(oschaaf): unused - must we close / clean this up?
TSVIO downstream_vio = TSVConnWrite(
intercept_ctx->vconn, cont, intercept_ctx->resp_reader, 0x7fffffff);
@@ -120,7 +120,7 @@ resource_intercept(TSCont cont, TSEvent event, void *edata)
AtsServerContext* server_context = intercept_ctx->request_ctx->server_context;
// TODO:(oschaaf) host/port
- SystemRequestContext* system_request_context =
+ SystemRequestContext* system_request_context =
new SystemRequestContext(server_context->thread_system()->NewMutex(),
server_context->timer(),
"www.foo.com",// TODO(oschaaf): compute these
@@ -140,7 +140,7 @@ resource_intercept(TSCont cont, TSEvent event, void *edata)
if (host != NULL && strlen(host) > 0) {
intercept_ctx->request_ctx->options = get_host_options(host);
}
-
+
// TODO(oschaaf): directory options should be coming from configuration!
bool ok = ps_determine_options(server_context,
intercept_ctx->request_ctx->options,
@@ -148,10 +148,10 @@ resource_intercept(TSCont cont, TSEvent event, void *edata)
intercept_ctx->request_ctx->base_fetch->response_headers(),
&options,
intercept_ctx->request_ctx->gurl);
-
+
// Take ownership of custom_options.
scoped_ptr<RewriteOptions> custom_options(options);
-
+
if (!ok) {
TSError("Failure while determining request options for psol resource");
// options = server_context->global_options();
@@ -173,7 +173,7 @@ resource_intercept(TSCont cont, TSEvent event, void *edata)
TSDebug("ats-speed", "resource intercept writing out a %d bytes response", (int)numBytesToWrite);
numBytesWritten = TSIOBufferWrite(intercept_ctx->resp_buffer,
intercept_ctx->response->c_str(), numBytesToWrite);
-
+
if (numBytesWritten == numBytesToWrite) {
TSVConnWrite(intercept_ctx->vconn, cont, intercept_ctx->resp_reader, numBytesToWrite);
} else {
@@ -227,7 +227,7 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
if (ctx == NULL) {
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
return 0;
- } else if (ctx->in_place && !cache_hit(txn) && !ctx->resource_request) {
+ } else if (ctx->in_place && !cache_hit(txn) && !ctx->resource_request) {
ctx->base_fetch->set_ctx(ctx);
ctx->base_fetch->set_ipro_callback((void*)resource_intercept);
ctx->driver->FetchInPlaceResource(
@@ -237,7 +237,7 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
return 0;
} else if (!ctx->resource_request) {
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
- return 0;
+ return 0;
}
// TODO(oschaaf): FIXME: Ownership of ctx has become too mucky.
// This is because I realised too late that the intercepts
@@ -248,7 +248,7 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
return 0;
}
-
+
if (cache_hit(txn)) {
ats_ctx_destroy(ctx);
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
@@ -263,8 +263,8 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
ContentType content_type = kContentTypeHtml;
StringPiece cache_control = HttpAttributes::kNoCache;
const char* error_message = NULL;
- StringPiece request_uri_path = ctx->gurl->PathAndLeaf();
-
+ StringPiece request_uri_path = ctx->gurl->PathAndLeaf();
+
if (false && ctx->gurl->PathSansQuery() == "/robots.txt") {
content_type = kContentTypeText;
writer.Write("User-agent: *\n", server_context->message_handler());
@@ -280,7 +280,7 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
}
// TODO(oschaaf): /pagespeed_admin handling
- } else {
+ } else {
// Optimized resource are highly cacheable (1 year expiry)
// TODO(oschaaf): configuration
TSHttpTxnRespCacheableSet(txn, 1);
@@ -293,7 +293,7 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
return 0;
}
-
+
TSCont interceptCont = TSContCreate(resource_intercept, TSMutexCreate());
InterceptCtx *intercept_ctx = new InterceptCtx();
intercept_ctx->request_ctx = ctx;
@@ -301,12 +301,12 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
copy_request_headers_to_psol(reqp, req_hdr_loc, intercept_ctx->request_headers);
TSHandleMLocRelease(reqp, TS_NULL_MLOC, req_hdr_loc);
-
+
TSContDataSet(interceptCont, intercept_ctx);
TSHttpTxnServerIntercept(interceptCont, txn);
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
return 0;
- }
+ }
if (error_message != NULL) {
status = HttpStatus::kNotFound;
@@ -334,9 +334,9 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
GoogleString header;
StringWriter header_writer(&header);
response_headers.WriteAsHttp(&header_writer, server_context->message_handler());
-
+
TSCont interceptCont = TSContCreate(resource_intercept, TSMutexCreate());
- InterceptCtx *intercept_ctx = new InterceptCtx();
+ InterceptCtx *intercept_ctx = new InterceptCtx();
intercept_ctx->request_ctx = ctx;
header.append(output);
TSHttpTxnRespCacheableSet(txn, 0);
@@ -344,7 +344,7 @@ read_cache_header_callback(TSCont cont, TSEvent event, void *edata)
TSContDataSet(interceptCont, intercept_ctx);
TSHttpTxnServerIntercept(interceptCont, txn);
intercept_ctx->response->append(header);
-
+
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
return 0;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_resource_intercept.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_resource_intercept.h b/plugins/experimental/ats_pagespeed/ats_resource_intercept.h
index b6dcbe2..82dec7d 100644
--- a/plugins/experimental/ats_pagespeed/ats_resource_intercept.h
+++ b/plugins/experimental/ats_pagespeed/ats_resource_intercept.h
@@ -48,7 +48,7 @@ struct InterceptCtx
GoogleString* response;
TransformCtx* request_ctx;
RequestHeaders* request_headers;
-
+
InterceptCtx()
: vconn(NULL)
, req_buffer(NULL)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc b/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc
index b270f3a..445891d 100644
--- a/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc
+++ b/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.cc
@@ -64,7 +64,7 @@ namespace net_instaweb {
const ProcessContext& process_context,
AtsThreadSystem* thread_system,
StringPiece hostname, int port)
- : SystemRewriteDriverFactory(process_context,
+ : SystemRewriteDriverFactory(process_context,
thread_system, NULL /*default shared mem runtime*/,
"" /*hostname, not used*/, -1/*port, not used*/)
, ats_message_handler_(new AtsMessageHandler(thread_system->NewMutex()))
@@ -76,7 +76,7 @@ namespace net_instaweb {
default_options()->set_beacon_url("/ats_pagespeed_beacon");
default_options()->set_enabled(RewriteOptions::kEnabledOn);
default_options()->SetRewriteLevel(RewriteOptions::kCoreFilters);
-
+
SystemRewriteOptions* system_options = dynamic_cast<SystemRewriteOptions*>(
default_options());
system_options->set_log_dir("/tmp/ps_log/");
@@ -90,7 +90,7 @@ namespace net_instaweb {
system_options->set_lru_cache_kb_per_process(1024*500);//500 MB
system_options->set_flush_html(true);
-
+
AtsRewriteOptions* ats_options = (AtsRewriteOptions*)system_options;
std::vector<std::string> args;
args.push_back("RateLimitBackgroundFetches");
@@ -98,7 +98,7 @@ namespace net_instaweb {
global_settings settings;
const char* msg = ats_options->ParseAndSetOptions(args, ats_message_handler_, settings);
CHECK(!msg);
-
+
set_message_buffer_size(1024*128);
set_message_handler(ats_message_handler_);
set_html_parse_message_handler(ats_html_parse_message_handler_);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.h b/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.h
index ea0cb27..293e246 100644
--- a/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.h
+++ b/plugins/experimental/ats_pagespeed/ats_rewrite_driver_factory.h
@@ -50,7 +50,7 @@ namespace net_instaweb {
class StaticAssetManager;
//class SystemCaches;
-class AtsRewriteDriverFactory : public SystemRewriteDriverFactory {
+class AtsRewriteDriverFactory : public SystemRewriteDriverFactory {
public:
explicit AtsRewriteDriverFactory(const ProcessContext& process_context,
AtsThreadSystem* thread_system,
@@ -71,7 +71,7 @@ class AtsRewriteDriverFactory : public SystemRewriteDriverFactory {
}
//virtual void InitStaticAssetManager(StaticAssetManager* static_js_manager);
-
+
// Initializes all the statistics objects created transitively by
// AtsRewriteDriverFactory, including nginx-specific and
// platform-independent statistics.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/gzip/configuration.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/gzip/configuration.cc b/plugins/experimental/ats_pagespeed/gzip/configuration.cc
index b1c499d..dd4c4e8 100644
--- a/plugins/experimental/ats_pagespeed/gzip/configuration.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/configuration.cc
@@ -130,7 +130,7 @@ namespace Gzip {
bool HostConfiguration::ContentTypeIsCompressible(const char * content_type, int content_type_length) {
string scontent_type(content_type, content_type_length);
bool is_match = false;
-
+
for (size_t i = 0; i < compressible_content_types_.size(); i++) {
const char* match_string = compressible_content_types_[i].c_str();
bool exclude = match_string[0] == '!';
@@ -168,7 +168,7 @@ namespace Gzip {
current_host_configuration->add_compressible_content_type("*javascript*");
current_host_configuration->add_compressible_content_type("image/svg+xml");
-
+
if (pathstring.empty()) {
return c;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/gzip/configuration.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/gzip/configuration.h b/plugins/experimental/ats_pagespeed/gzip/configuration.h
index b38cb64..da11b35 100644
--- a/plugins/experimental/ats_pagespeed/gzip/configuration.h
+++ b/plugins/experimental/ats_pagespeed/gzip/configuration.h
@@ -29,7 +29,7 @@
#include <vector>
#include "debug_macros.h"
-namespace Gzip {
+namespace Gzip {
class HostConfiguration {
public: //todo -> only configuration should be able to construct hostconfig
explicit HostConfiguration(const std::string & host)
@@ -40,11 +40,11 @@ namespace Gzip {
{}
inline bool enabled() { return enabled_; }
- inline void set_enabled(bool x) { enabled_ = x; }
+ inline void set_enabled(bool x) { enabled_ = x; }
inline bool cache() { return cache_; }
- inline void set_cache(bool x) { cache_ = x; }
+ inline void set_cache(bool x) { cache_ = x; }
inline bool remove_accept_encoding() { return remove_accept_encoding_; }
- inline void set_remove_accept_encoding(bool x) { remove_accept_encoding_ = x; }
+ inline void set_remove_accept_encoding(bool x) { remove_accept_encoding_ = x; }
inline std::string host() { return host_; }
void add_disallow(const std::string & disallow);
void add_compressible_content_type(const std::string & content_type);
@@ -65,7 +65,7 @@ namespace Gzip {
friend class HostConfiguration;
public:
static Configuration * Parse(const char * path);
- HostConfiguration * Find(const char * host, int host_length);
+ HostConfiguration * Find(const char * host, int host_length);
inline HostConfiguration * GlobalConfiguration() {
return host_configurations_[0];
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/gzip/gzip.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/gzip/gzip.cc b/plugins/experimental/ats_pagespeed/gzip/gzip.cc
index 057437f..ee92872 100644
--- a/plugins/experimental/ats_pagespeed/gzip/gzip.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/gzip.cc
@@ -43,9 +43,9 @@ using namespace Gzip;
// from mod_deflate:
// ZLIB's compression algorithm uses a
-// 0-9 based scale that GZIP does where '1' is 'Best speed'
-// and '9' is 'Best compression'. Testing has proved level '6'
-// to be about the best level to use in an HTTP Server.
+// 0-9 based scale that GZIP does where '1' is 'Best speed'
+// and '9' is 'Best compression'. Testing has proved level '6'
+// to be about the best level to use in an HTTP Server.
const int ZLIB_COMPRESSION_LEVEL = 6;
@@ -152,7 +152,7 @@ gzip_vary_header(TSMBuffer bufp, TSMLoc hdr_loc)
ce_loc = TSMimeHdrFieldFind(bufp, hdr_loc, "Vary", sizeof("Vary") - 1);
if (ce_loc) {
- int idx, count, len;
+ int idx, count, len;
const char *value;
count = TSMimeHdrFieldValuesCount(bufp, hdr_loc, ce_loc);
@@ -558,7 +558,7 @@ gzip_transformable(TSHttpTxn txnp, int server, HostConfiguration * host_configur
value = TSMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, 0, &len);
int rv = host_configuration->ContentTypeIsCompressible(value, len);
- if (!rv) {
+ if (!rv) {
info("content-type [%.*s] not compressible", len, value);
}
TSHandleMLocRelease(bufp, hdr_loc, field_loc);
@@ -600,7 +600,7 @@ gzip_transform_add(TSHttpTxn txnp, int /* server ATS_UNUSED */, HostConfiguratio
}
TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
}
-
+
TSHttpTxnTransformedRespCache(txnp, cache);
}
@@ -636,7 +636,7 @@ cache_transformable(TSHttpTxn txnp)
return 0;
}
-HostConfiguration *
+HostConfiguration *
find_host_configuration(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer bufp, TSMLoc locp)
{
TSMLoc fieldp = TSMimeHdrFieldFind(bufp, locp, TS_MIME_FIELD_HOST, TS_MIME_LEN_HOST);
@@ -646,7 +646,7 @@ find_host_configuration(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer bufp, TSMLoc
const char *strv = TSMimeHdrFieldValueStringGet(bufp, locp, fieldp, -1, &strl);
TSHandleMLocRelease(bufp, locp, fieldp);
- HostConfiguration * host_configuration = config->Find(strv, strl);
+ HostConfiguration * host_configuration = config->Find(strv, strl);
return host_configuration;
}
@@ -677,7 +677,7 @@ transform_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
TSHttpTxnArgSet(txnp, arg_idx_url_disallowed, (void *) &GZIP_ONE);
info("url [%.*s] not allowed", url_len, url);
} else {
- normalize_accept_encoding(txnp, req_buf, req_loc);
+ normalize_accept_encoding(txnp, req_buf, req_loc);
}
TSfree(url);
TSHandleMLocRelease(req_buf, TS_NULL_MLOC, req_loc);
@@ -691,7 +691,7 @@ transform_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
//os: the accept encoding header needs to be restored..
//otherwise the next request won't get a cache hit on this
HostConfiguration * hc = (HostConfiguration*)TSHttpTxnArgGet(txnp, arg_idx_host_configuration);
- if (hc != NULL) {
+ if (hc != NULL) {
if (hc->remove_accept_encoding()) {
TSMBuffer req_buf;
TSMLoc req_loc;
@@ -731,7 +731,7 @@ transform_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
{
int allowed = !TSHttpTxnArgGet(txnp, arg_idx_url_disallowed);
HostConfiguration * hc = (HostConfiguration*)TSHttpTxnArgGet(txnp, arg_idx_host_configuration);
- if ( hc != NULL ) {
+ if ( hc != NULL ) {
if (allowed && cache_transformable(txnp) && gzip_transformable(txnp, 0, hc, &compress_type)) {
gzip_transform_add(txnp, 0, hc, compress_type);
}
@@ -780,7 +780,7 @@ TSPluginInit(int argc, const char *argv[])
if (argc > 2) {
fatal("the gzip plugin does not accept more than 1 plugin argument");
- } else if (argc == 2) {
+ } else if (argc == 2) {
config_path = std::string(argv[1]);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/gzip/misc.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/gzip/misc.cc b/plugins/experimental/ats_pagespeed/gzip/misc.cc
index 0ea6911..bb7e213 100644
--- a/plugins/experimental/ats_pagespeed/gzip/misc.cc
+++ b/plugins/experimental/ats_pagespeed/gzip/misc.cc
@@ -48,8 +48,8 @@ normalize_accept_encoding(TSHttpTxn /* txnp ATS_UNUSED */, TSMBuffer reqp, TSMLo
int deflate = 0;
int gzip = 0;
- //remove the accept encoding field(s),
- //while finding out if gzip or deflate is supported.
+ //remove the accept encoding field(s),
+ //while finding out if gzip or deflate is supported.
while (field) {
TSMLoc tmp;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/background_fetch/background_fetch.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/background_fetch/background_fetch.cc b/plugins/experimental/background_fetch/background_fetch.cc
index 69ae162..4b00179 100644
--- a/plugins/experimental/background_fetch/background_fetch.cc
+++ b/plugins/experimental/background_fetch/background_fetch.cc
@@ -674,7 +674,7 @@ check_client_ip_configured(TSHttpTxn txnp, const char* cfg_ip)
if ((strlen(cfg_ip) == strlen(ip_buf)) && !strcmp(cfg_ip, ip_buf)) {
TSDebug(PLUGIN_NAME,"bg fetch for ip %s, configured ip %s", ip_buf, cfg_ip);
- return true;
+ return true;
}
return false;
@@ -819,7 +819,7 @@ cont_handle_response(TSCont contp, TSEvent /* event ATS_UNUSED */, void* edata)
{
// ToDo: If we want to support per-remap configurations, we have to pass along the data here
TSHttpTxn txnp = static_cast<TSHttpTxn>(edata);
- BgFetchRuleMap *ri = static_cast<BgFetchRuleMap*>(TSContDataGet(contp));
+ BgFetchRuleMap *ri = static_cast<BgFetchRuleMap*>(TSContDataGet(contp));
if (ri == NULL) {
// something wrong..
@@ -939,7 +939,7 @@ TSRemapNewInstance(int argc, char* argv[], void** ih, char* /* errbuf */, int /
TSError("%s:Unable to create remap instance", PLUGIN_NAME);
return TS_ERROR;
}
-
+
if (gConfig == NULL) {
TSDebug(PLUGIN_NAME, "creating gConfig");
gConfig = new BGFetchConfig();
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/buffer_upload/buffer_upload.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/buffer_upload/buffer_upload.cc b/plugins/experimental/buffer_upload/buffer_upload.cc
index d7f13e1..1957ab8 100644
--- a/plugins/experimental/buffer_upload/buffer_upload.cc
+++ b/plugins/experimental/buffer_upload/buffer_upload.cc
@@ -24,7 +24,7 @@
/* buffer_upload.c - plugin for buffering POST data on proxy server
* before connecting to origin server. It supports two types of buffering:
* memory-only buffering and disk buffering
- *
+ *
*/
#include <stdio.h>
@@ -45,7 +45,7 @@
#define DEBUG_TAG "buffer_upload-dbg"
/**************************************************
- Log macros for error code return verification
+ Log macros for error code return verification
**************************************************/
#define PLUGIN_NAME "buffer_upload"
//#define LOG_SET_FUNCTION_NAME(NAME) const char * FUNCTION_NAME = NAME
@@ -275,7 +275,7 @@ pvc_process_accept(TSCont contp, int event, void *edata, pvc_state * my_state)
my_state->req_reader = TSIOBufferReaderAlloc(my_state->req_buffer);
// set the maximum memory buffer size for request (both request header and post data), default is 32K
// only apply to memory buffer mode
- if (uconfig->use_disk_buffer == 0) {
+ if (uconfig->use_disk_buffer == 0) {
TSIOBufferWaterMarkSet(my_state->req_buffer, uconfig->mem_buffer_size);
}
my_state->resp_buffer = TSIOBufferCreate();
@@ -951,7 +951,7 @@ create_directory()
}
}
dir = opendir(".");
- if (dir == NULL)
+ if (dir == NULL)
goto error_out;
while ((d = readdir(dir))) {
remove(d->d_name);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/custom_redirect/custom_redirect.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/custom_redirect/custom_redirect.cc b/plugins/experimental/custom_redirect/custom_redirect.cc
index 5af9a83..9750693 100644
--- a/plugins/experimental/custom_redirect/custom_redirect.cc
+++ b/plugins/experimental/custom_redirect/custom_redirect.cc
@@ -102,11 +102,11 @@ plugin_main_handler (TSCont contp, TSEvent event, void *edata)
handle_response(txnp, contp);
break;
}
-
-
+
+
default:
{
- TSDebug( "[custom_redirect]", "default event");
+ TSDebug( "[custom_redirect]", "default event");
break;
}
}
@@ -134,14 +134,14 @@ TSPluginInit (int argc, const char *argv[])
info.plugin_name = (char*)"";
info.vendor_name = (char*)"Apache Software Foundation";
info.support_email = (char*)"dev@trafficserver.apache.org";
-*/
+*/
/* This plugin supports following types of url redirect here:
- *
- * 1. User can specify a particular redirect-url header name in the plugin command line,
+ *
+ * 1. User can specify a particular redirect-url header name in the plugin command line,
* in which case plugin will just look for that header in response and redirect to it.
*
*OR:
- * 2. User can also specify a return error code, in which case if the code matches with
+ * 2. User can also specify a return error code, in which case if the code matches with
* the response, plugin will look for the standard "Location" header and redirect to it
*
*OR:
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/combo_handler.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/combo_handler.cc b/plugins/experimental/esi/combo_handler.cc
index c98be63..ff6003e 100644
--- a/plugins/experimental/esi/combo_handler.cc
+++ b/plugins/experimental/esi/combo_handler.cc
@@ -279,7 +279,7 @@ handleReadRequestHeader(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edat
TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
return 0;
}
-
+
LOG_DEBUG("combo is enabled for this channel");
LOG_DEBUG("handling TS_EVENT_HTTP_OS_DNS event...");
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/esi.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/esi.cc b/plugins/experimental/esi/esi.cc
index ce355b5..10f6f16 100644
--- a/plugins/experimental/esi/esi.cc
+++ b/plugins/experimental/esi/esi.cc
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#include "ink_defs.h"
+#include "ink_defs.h"
#include <stdio.h>
#include <stdlib.h>
@@ -125,7 +125,7 @@ struct ContData
ContData(TSCont contptr, TSHttpTxn tx)
: curr_state(READING_ESI_DOC), input_vio(NULL), output_vio(NULL),
output_buffer(NULL), output_reader(NULL),
- esi_vars(NULL), data_fetcher(NULL), esi_proc(NULL), esi_gzip(NULL), esi_gunzip(NULL),
+ esi_vars(NULL), data_fetcher(NULL), esi_proc(NULL), esi_gzip(NULL), esi_gunzip(NULL),
contp(contptr), txnp(tx), request_url(NULL),
input_type(DATA_TYPE_RAW_ESI), packed_node_list(""),
gzipped_data(""), gzip_output(false),
@@ -245,7 +245,7 @@ ContData::init()
createDebugTag(PARSER_DEBUG_TAG, contp, fetcher_tag),
createDebugTag(EXPR_DEBUG_TAG, contp, expr_tag),
&TSDebug, &TSError, *data_fetcher, *esi_vars, *gHandlerManager);
-
+
esi_gzip = new EsiGzip(createDebugTag(GZIP_DEBUG_TAG, contp, gzip_tag), &TSDebug, &TSError);
esi_gunzip = new EsiGunzip(createDebugTag(GUNZIP_DEBUG_TAG, contp, gunzip_tag), &TSDebug, &TSError);
@@ -721,7 +721,7 @@ transformData(TSCont contp)
if (cont_data->input_type != DATA_TYPE_PACKED_ESI) {
bool gunzip_complete = true;
if (cont_data->input_type == DATA_TYPE_GZIPPED_ESI) {
- gunzip_complete = cont_data->esi_gunzip->stream_finish();
+ gunzip_complete = cont_data->esi_gunzip->stream_finish();
}
if (cont_data->esi_proc->completeParse() && gunzip_complete) {
if (cont_data->option_info->packed_node_support && cont_data->os_response_cacheable
@@ -826,7 +826,7 @@ transformData(TSCont contp)
} else {
TSError("[%s] ESI processor failed to process document; will return empty document", __FUNCTION__);
out_data.assign("");
-
+
if(!cont_data->xform_closed) {
TSVIONBytesSet(cont_data->output_vio, 0);
TSVIOReenable(cont_data->output_vio);
@@ -856,7 +856,7 @@ transformData(TSCont contp)
}
}
}
- if(!cont_data->xform_closed) {
+ if(!cont_data->xform_closed) {
// should not set any fixed length
if(cont_data->curr_state == ContData::PROCESSING_COMPLETE) {
if(cont_data->gzip_output) {
@@ -864,8 +864,8 @@ transformData(TSCont contp)
int downstream_length;
if(!cont_data->esi_gzip->stream_finish(cdata, downstream_length)) {
TSError("[%s] Error while finishing gzip", __FUNCTION__);
- return 0;
- } else {
+ return 0;
+ } else {
if(TSVIOBufferGet(cont_data->output_vio) == NULL) {
TSError("[%s] Error while writing bytes to downstream VC", __FUNCTION__);
return 0;
@@ -877,7 +877,7 @@ transformData(TSCont contp)
TSDebug(cont_data->debug_tag,
"[%s] ESI processed overall/gzip: %d",
__FUNCTION__, downstream_length );
- TSVIONBytesSet(cont_data->output_vio, downstream_length);
+ TSVIONBytesSet(cont_data->output_vio, downstream_length);
}
} else {
TSDebug(cont_data->debug_tag,
@@ -885,8 +885,8 @@ transformData(TSCont contp)
__FUNCTION__, overall_len );
TSVIONBytesSet(cont_data->output_vio, overall_len);
}
- }
-
+ }
+
// Reenable the output connection so it can read the data we've produced.
TSVIOReenable(cont_data->output_vio);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/fetcher/FetchedDataProcessor.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/fetcher/FetchedDataProcessor.h b/plugins/experimental/esi/fetcher/FetchedDataProcessor.h
index eaff189..e5b33ce 100644
--- a/plugins/experimental/esi/fetcher/FetchedDataProcessor.h
+++ b/plugins/experimental/esi/fetcher/FetchedDataProcessor.h
@@ -25,13 +25,13 @@
#define _FETCHED_DATA_PROCESSOR_H
-class FetchedDataProcessor {
+class FetchedDataProcessor {
public:
FetchedDataProcessor() { };
- virtual void processData(const char *reqeust_url, int request_url_len,
+ virtual void processData(const char *reqeust_url, int request_url_len,
const char *response_data, int response_data_len) = 0;
virtual ~FetchedDataProcessor() { };
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.cc b/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.cc
index 7de78cf..a44cc3d 100644
--- a/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.cc
+++ b/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.cc
@@ -55,16 +55,16 @@ HttpDataFetcherImpl::HttpDataFetcherImpl(TSCont contp,sockaddr const* client_add
}
HttpDataFetcherImpl::~HttpDataFetcherImpl()
-{
- clear();
- TSHttpParserDestroy(_http_parser);
+{
+ clear();
+ TSHttpParserDestroy(_http_parser);
}
bool
HttpDataFetcherImpl::addFetchRequest(const string &url, FetchedDataProcessor *callback_obj /* = 0 */)
{
// do we already have a request for this?
- std::pair<UrlToContentMap::iterator, bool> insert_result =
+ std::pair<UrlToContentMap::iterator, bool> insert_result =
_pages.insert(UrlToContentMap::value_type(url, RequestData()));
if (callback_obj) {
((insert_result.first)->second).callback_objects.push_back(callback_obj);
@@ -75,7 +75,7 @@ HttpDataFetcherImpl::addFetchRequest(const string &url, FetchedDataProcessor *ca
return true;
}
- char buff[1024];
+ char buff[1024];
char *http_req;
int length;
@@ -102,7 +102,7 @@ HttpDataFetcherImpl::addFetchRequest(const string &url, FetchedDataProcessor *ca
if (http_req != buff) {
free(http_req);
}
-
+
TSDebug(_debug_tag, "[%s] Successfully added fetch request for URL [%s]", __FUNCTION__, url.data());
_page_entry_lookup.push_back(insert_result.first);
++_n_pending_requests;
@@ -160,7 +160,7 @@ HttpDataFetcherImpl::handleFetchEvent(TSEvent event, void *edata)
req_data.hdr_loc = TSHttpHdrCreate(req_data.bufp);
TSHttpHdrTypeSet(req_data.bufp, req_data.hdr_loc, TS_HTTP_TYPE_RESPONSE);
TSHttpParserClear(_http_parser);
-
+
if (TSHttpHdrParseResp(_http_parser, req_data.bufp, req_data.hdr_loc, &startptr, endptr) == TS_PARSE_DONE) {
req_data.resp_status = TSHttpHdrStatusGet(req_data.bufp, req_data.hdr_loc);
valid_data_received = true;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h b/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h
index 29dccaa..44860b3 100644
--- a/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h
+++ b/plugins/experimental/esi/fetcher/HttpDataFetcherImpl.h
@@ -41,11 +41,11 @@ public:
HttpDataFetcherImpl(TSCont contp, sockaddr const* client_addr, const char *debug_tag);
void useHeader(const EsiLib::HttpHeader &header);
-
+
void useHeaders(const EsiLib::HttpHeaderList &headers);
bool addFetchRequest(const std::string &url, FetchedDataProcessor *callback_obj = 0);
-
+
bool handleFetchEvent(TSEvent event, void *edata);
bool isFetchEvent(TSEvent event) const {
@@ -88,12 +88,12 @@ public:
~HttpDataFetcherImpl();
private:
-
+
TSCont _contp;
char _debug_tag[64];
typedef std::list<FetchedDataProcessor *> CallbackObjectList;
-
+
// used to track a request that was made
struct RequestData {
std::string response;
@@ -130,7 +130,7 @@ private:
std::string _headers_str;
-
+
inline void _release(RequestData &req_data);
sockaddr const* _client_addr;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/ComponentBase.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/ComponentBase.h b/plugins/experimental/esi/lib/ComponentBase.h
index 487a6c9..c746a48 100644
--- a/plugins/experimental/esi/lib/ComponentBase.h
+++ b/plugins/experimental/esi/lib/ComponentBase.h
@@ -41,16 +41,16 @@ public:
typedef void (*Error)(const char *, ...);
protected:
-
- ComponentBase(const char *debug_tag, Debug debug_func, Error error_func)
+
+ ComponentBase(const char *debug_tag, Debug debug_func, Error error_func)
: _debugLog(debug_func), _errorLog(error_func) {
snprintf(_debug_tag, sizeof(_debug_tag), "%s", debug_tag);
};
-
+
char _debug_tag[DEBUG_TAG_MAX_SIZE];
Debug _debugLog;
Error _errorLog;
-
+
virtual ~ComponentBase() { };
};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/DocNode.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/DocNode.cc b/plugins/experimental/esi/lib/DocNode.cc
index c35f28a..bffcba1 100644
--- a/plugins/experimental/esi/lib/DocNode.cc
+++ b/plugins/experimental/esi/lib/DocNode.cc
@@ -43,7 +43,7 @@ const char *DocNode::type_names_[] = { "UNKNOWN",
"SPECIAL_INCLUDE"
};
-// helper functions
+// helper functions
inline void
packString(const char *str, int32_t str_len, string &buffer) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/DocNode.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/DocNode.h b/plugins/experimental/esi/lib/DocNode.h
index fa1986f..a6198a1 100644
--- a/plugins/experimental/esi/lib/DocNode.h
+++ b/plugins/experimental/esi/lib/DocNode.h
@@ -50,9 +50,9 @@ public:
pack(buffer);
return buffer;
}
-
+
bool unpack(const char *data, int data_len);
-
+
inline bool unpack(const std::string &data) {
return unpack(data.data(), data.size());
}
@@ -60,7 +60,7 @@ public:
private:
void packToBuffer(std::string &buffer) const;
-
+
friend class DocNode; // to use the method above
};
@@ -68,7 +68,7 @@ private:
class DocNode
{
-
+
public:
enum TYPE {
TYPE_UNKNOWN = 0,
@@ -87,7 +87,7 @@ public:
TYPE_SPECIAL_INCLUDE = 13,
};
- // Use with care - only types defined above will have valid names
+ // Use with care - only types defined above will have valid names
static const char *type_names_[];
TYPE type;
@@ -98,7 +98,7 @@ public:
DocNodeList child_nodes;
- DocNode(TYPE _type = TYPE_UNKNOWN, const char *_data = 0, int32_t _data_len = 0)
+ DocNode(TYPE _type = TYPE_UNKNOWN, const char *_data = 0, int32_t _data_len = 0)
: type(_type), data(_data), data_len(_data_len) { };
void pack(std::string &buffer) const;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/EsiGunzip.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/EsiGunzip.cc b/plugins/experimental/esi/lib/EsiGunzip.cc
index 2c3042b..4e80d38 100644
--- a/plugins/experimental/esi/lib/EsiGunzip.cc
+++ b/plugins/experimental/esi/lib/EsiGunzip.cc
@@ -32,13 +32,13 @@ using namespace EsiLib;
EsiGunzip::EsiGunzip(const char *debug_tag,
ComponentBase::Debug debug_func, ComponentBase::Error error_func)
: ComponentBase(debug_tag, debug_func, error_func),
- _downstream_length(0),
+ _downstream_length(0),
_total_data_length(0) {
_init = false;
_success = true;
}
-bool
+bool
EsiGunzip::stream_finish() {
if(_init) {
if (inflateEnd(&_zstrm) != Z_OK) {
@@ -58,7 +58,7 @@ EsiGunzip::stream_decode(const char *data, int data_len, std::string &udata) {
BufferList buf_list;
if(!_init) {
-
+
_zstrm.zalloc = Z_NULL;
_zstrm.zfree = Z_NULL;
_zstrm.opaque = Z_NULL;
@@ -105,13 +105,13 @@ EsiGunzip::stream_decode(const char *data, int data_len, std::string &udata) {
// avoid data copy for temporary
buf_list.push_back(string());
string &curr_buf = buf_list.back();
- curr_buf.assign(raw_buf, curr_buf_size);
+ curr_buf.assign(raw_buf, curr_buf_size);
if (inflate_result == Z_STREAM_END) {
break;
}
} while (_zstrm.avail_in > 0);
-
+
_total_data_length += data_len;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/EsiGunzip.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/EsiGunzip.h b/plugins/experimental/esi/lib/EsiGunzip.h
index b69b6b0..9314f6c 100644
--- a/plugins/experimental/esi/lib/EsiGunzip.h
+++ b/plugins/experimental/esi/lib/EsiGunzip.h
@@ -1,62 +1,62 @@
-/** @file
-
- A brief file description
-
- @section license License
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- */
-
-#ifndef _ESI_GUNZIP_H
-#define _ESI_GUNZIP_H
-
-#include "ComponentBase.h"
-#include <zlib.h>
-#include <string>
-
-class EsiGunzip : private EsiLib::ComponentBase
-{
-
-public:
-
- EsiGunzip(const char *debug_tag,
- EsiLib::ComponentBase::Debug debug_func, EsiLib::ComponentBase::Error error_func);
-
- virtual ~EsiGunzip();
-
- bool stream_decode(const char *data, int data_len, std::string &udata);
-
- inline bool stream_decode(std::string data, std::string &udata) {
- return stream_decode(data.data(), data.size(), udata);
- }
-
- bool stream_finish();
-
-private:
-
- int _downstream_length;
- int _total_data_length;
- z_stream _zstrm;
-
- bool _init;
- bool _success;
-};
-
-
-#endif // _ESI_GUNZIP_H
-
-
+/** @file
+
+ A brief file description
+
+ @section license License
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#ifndef _ESI_GUNZIP_H
+#define _ESI_GUNZIP_H
+
+#include "ComponentBase.h"
+#include <zlib.h>
+#include <string>
+
+class EsiGunzip : private EsiLib::ComponentBase
+{
+
+public:
+
+ EsiGunzip(const char *debug_tag,
+ EsiLib::ComponentBase::Debug debug_func, EsiLib::ComponentBase::Error error_func);
+
+ virtual ~EsiGunzip();
+
+ bool stream_decode(const char *data, int data_len, std::string &udata);
+
+ inline bool stream_decode(std::string data, std::string &udata) {
+ return stream_decode(data.data(), data.size(), udata);
+ }
+
+ bool stream_finish();
+
+private:
+
+ int _downstream_length;
+ int _total_data_length;
+ z_stream _zstrm;
+
+ bool _init;
+ bool _success;
+};
+
+
+#endif // _ESI_GUNZIP_H
+
+
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/EsiGzip.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/EsiGzip.cc b/plugins/experimental/esi/lib/EsiGzip.cc
index c7d5534..e6fb56c 100644
--- a/plugins/experimental/esi/lib/EsiGzip.cc
+++ b/plugins/experimental/esi/lib/EsiGzip.cc
@@ -32,7 +32,7 @@ using namespace EsiLib;
EsiGzip::EsiGzip(const char *debug_tag,
ComponentBase::Debug debug_func, ComponentBase::Error error_func)
: ComponentBase(debug_tag, debug_func, error_func),
- _downstream_length(0),
+ _downstream_length(0),
_total_data_length(0) {
}
@@ -83,7 +83,7 @@ EsiGzip::stream_encode(const char *data, int data_len, std::string &cdata) {
_crc = crc32(0, Z_NULL, 0);
}
-
+
_zstrm.zalloc = Z_NULL;
_zstrm.zfree = Z_NULL;
_zstrm.opaque = Z_NULL;
@@ -110,7 +110,7 @@ EsiGzip::stream_encode(const char *data, int data_len, std::string &cdata) {
_total_data_length += data_len;
}
- deflateEnd(&_zstrm);
+ deflateEnd(&_zstrm);
return true;
}
@@ -128,7 +128,7 @@ bool EsiGzip::stream_finish(std::string &cdata, int&downstream_length) {
}
_zstrm.next_in = reinterpret_cast<Bytef *>(buf);
- _zstrm.avail_in = 0;
+ _zstrm.avail_in = 0;
// required for the "finish" loop as no data has been given so far
int deflate_result = runDeflateLoop(_zstrm, Z_FINISH, cdata);
deflateEnd(&_zstrm);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/EsiParser.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/EsiParser.cc b/plugins/experimental/esi/lib/EsiParser.cc
index 22b6856..cf0c2c6 100644
--- a/plugins/experimental/esi/lib/EsiParser.cc
+++ b/plugins/experimental/esi/lib/EsiParser.cc
@@ -57,9 +57,9 @@ const EsiParser::EsiNodeInfo EsiParser::ESI_NODES[] = {
const EsiParser::EsiNodeInfo EsiParser::HTML_COMMENT_NODE_INFO(DocNode::TYPE_HTML_COMMENT,
"<!--esi", 7, "-->", 3);
-EsiParser::EsiParser(const char *debug_tag,
- ComponentBase::Debug debug_func,
- ComponentBase::Error error_func)
+EsiParser::EsiParser(const char *debug_tag,
+ ComponentBase::Debug debug_func,
+ ComponentBase::Error error_func)
: ComponentBase(debug_tag, debug_func, error_func), _parse_start_pos(-1) {
// do this so that object doesn't move around in memory;
// (because we return pointers into this object)
@@ -118,7 +118,7 @@ EsiParser::_completeParse(string &data, int &parse_start_pos, size_t &orig_outpu
return true;
}
if (!_parse(data, parse_start_pos, node_list, true)) {
- _errorLog("[%s] Failed to complete parse of data of total size %d starting with [%.5s]...",
+ _errorLog("[%s] Failed to complete parse of data of total size %d starting with [%.5s]...",
__FUNCTION__, data.size(), (data.size() ? data.data() : "(null)"));
node_list.resize(orig_output_list_size);
return false;
@@ -130,7 +130,7 @@ EsiParser::MATCH_TYPE
EsiParser::_searchData(const string &data, size_t start_pos, const char *str, int str_len, size_t &pos) const {
const char *data_ptr = data.data() + start_pos;
int data_len = data.size() - start_pos;
- int i_data = 0, i_str = 0;
+ int i_data = 0, i_str = 0;
while (i_data < data_len) {
if (data_ptr[i_data] == str[i_str]) {
@@ -147,12 +147,12 @@ EsiParser::_searchData(const string &data, size_t start_pos, const char *str, in
if (i_str == str_len) {
pos = start_pos + i_data + 1 - i_str;
- _debugLog(_debug_tag, "[%s] Found full match of %.*s in [%.5s...] at position %d",
+ _debugLog(_debug_tag, "[%s] Found full match of %.*s in [%.5s...] at position %d",
__FUNCTION__, str_len, str, data_ptr, pos);
return COMPLETE_MATCH;
} else if (i_str) {
pos = start_pos + i_data - i_str;
- _debugLog(_debug_tag, "[%s] Found partial match of %.*s in [%.5s...] at position %d",
+ _debugLog(_debug_tag, "[%s] Found partial match of %.*s in [%.5s...] at position %d",
__FUNCTION__, str_len, str, data_ptr, pos);
return PARTIAL_MATCH;
} else {
@@ -169,20 +169,20 @@ EsiParser::_compareData(const string &data, size_t pos, const char *str, int str
if (data[i_data] == str[i_str]) {
++i_str;
if (i_str == str_len) {
- _debugLog(_debug_tag, "[%s] string [%.*s] is equal to data at position %d",
+ _debugLog(_debug_tag, "[%s] string [%.*s] is equal to data at position %d",
__FUNCTION__, str_len, str, pos);
return COMPLETE_MATCH;
}
}
else {
/*
- _debugLog(_debug_tag, "[%s] string [%.*s] is not equal to data at position %d",
+ _debugLog(_debug_tag, "[%s] string [%.*s] is not equal to data at position %d",
__FUNCTION__, str_len, str, pos);
*/
return NO_MATCH;
}
}
- _debugLog(_debug_tag, "[%s] string [%.*s] is partially equal to data at position %d",
+ _debugLog(_debug_tag, "[%s] string [%.*s] is partially equal to data at position %d",
__FUNCTION__, str_len, str, pos);
return PARTIAL_MATCH;
}
@@ -299,13 +299,13 @@ EsiParser::_parse(const string &data, int &parse_start_pos,
// we have a complete match of the opening tag
if ((curr_pos - parse_start_pos) > 0) {
// add text till here as a PRE node
- _debugLog(_debug_tag, "[%s], Adding data of size %d before (newly found) ESI tag as PRE node",
+ _debugLog(_debug_tag, "[%s], Adding data of size %d before (newly found) ESI tag as PRE node",
__FUNCTION__, curr_pos - parse_start_pos);
- node_list.push_back(DocNode(DocNode::TYPE_PRE,
+ node_list.push_back(DocNode(DocNode::TYPE_PRE,
data_start_ptr + parse_start_pos, curr_pos - parse_start_pos));
parse_start_pos = curr_pos;
}
-
+
if (is_html_comment_node) {
_debugLog(_debug_tag, "[%s] Found html comment tag at position %d", __FUNCTION__, curr_pos);
data_ptr = data_start_ptr + curr_pos;
@@ -314,7 +314,7 @@ EsiParser::_parse(const string &data, int &parse_start_pos,
} else {
curr_pos += ESI_TAG_PREFIX_LEN;
data_ptr = data_start_ptr + curr_pos;
-
+
for (node_info = ESI_NODES; node_info->type != DocNode::TYPE_UNKNOWN; ++node_info) {
search_result = _compareData(data, curr_pos, node_info->tag_suffix, node_info->tag_suffix_len);
if (search_result == COMPLETE_MATCH) {
@@ -354,7 +354,7 @@ EsiParser::_parse(const string &data, int &parse_start_pos,
if ((search_result == NO_MATCH) || (search_result == PARTIAL_MATCH)) {
if (last_chunk) {
- _errorLog("[%s] ESI tag starting with [%.10s]... has no matching closing tag [%.*s]", __FUNCTION__,
+ _errorLog("[%s] ESI tag starting with [%.10s]... has no matching closing tag [%.*s]", __FUNCTION__,
data_ptr - ESI_TAG_PREFIX_LEN, node_info->closing_tag_len, node_info->closing_tag);
goto lFail;
}
@@ -414,7 +414,7 @@ EsiParser::_parse(const string &data, int &parse_start_pos,
}
if (!parse_result) {
- _errorLog("[%s] Cannot handle ESI tag [%.*s]", __FUNCTION__,
+ _errorLog("[%s] Cannot handle ESI tag [%.*s]", __FUNCTION__,
node_info->tag_suffix_len, node_info->tag_suffix);
goto lFail;
}
@@ -431,9 +431,9 @@ EsiParser::_parse(const string &data, int &parse_start_pos,
break;
}
if (last_chunk && (parse_start_pos < static_cast<int>(data_size))) {
- _debugLog(_debug_tag, "[%s] Adding trailing text of size %d starting at [%.5s] as a PRE node",
+ _debugLog(_debug_tag, "[%s] Adding trailing text of size %d starting at [%.5s] as a PRE node",
__FUNCTION__, data_size - parse_start_pos, data_start_ptr + parse_start_pos);
- node_list.push_back(DocNode(DocNode::TYPE_PRE,
+ node_list.push_back(DocNode(DocNode::TYPE_PRE,
data_start_ptr + parse_start_pos, data_size - parse_start_pos));
}
_debugLog(_debug_tag, "[%s] Added %d node(s) during parse", __FUNCTION__, node_list.size() - orig_list_size);
@@ -542,7 +542,7 @@ EsiParser::_processTryTag(const string &data, size_t curr_pos, size_t end_pos,
_errorLog("[%s] Cannot have non-whitespace raw text as top level node in try block", __FUNCTION__);
return false;
}
- _debugLog(_debug_tag, "[%s] Ignoring top-level whitespace raw text", __FUNCTION__);
+ _debugLog(_debug_tag, "[%s] Ignoring top-level whitespace raw text", __FUNCTION__);
temp_iter = iter;
++temp_iter;
try_node.child_nodes.erase(iter);
@@ -590,7 +590,7 @@ EsiParser::_processChooseTag(const string &data, size_t curr_pos, size_t end_pos
__FUNCTION__, DocNode::type_names_[iter->type]);
return false;
}
- _debugLog(_debug_tag, "[%s] Ignoring top-level whitespace raw text", __FUNCTION__);
+ _debugLog(_debug_tag, "[%s] Ignoring top-level whitespace raw text", __FUNCTION__);
temp_iter = iter;
++temp_iter;
choose_node.child_nodes.erase(iter);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/EsiParser.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/EsiParser.h b/plugins/experimental/esi/lib/EsiParser.h
index 2dffc59..65dcff6 100644
--- a/plugins/experimental/esi/lib/EsiParser.h
+++ b/plugins/experimental/esi/lib/EsiParser.h
@@ -52,14 +52,14 @@ public:
};
/** completes the parse including data from previous chunk(s);
- * adds newly found nodes to list. optionally a final or the
+ * adds newly found nodes to list. optionally a final or the
* only chunk can be provided.
*
* Output nodes contain pointers to internal data; use with care. */
bool completeParse(EsiLib::DocNodeList &node_list, const char *data = 0, int data_len = -1) {
return _completeParse(_data, _parse_start_pos, _orig_output_list_size, node_list, data, data_len);
}
-
+
/** convenient alternative to method above */
bool completeParse(EsiLib::DocNodeList &node_list, const std::string &data) {
return completeParse(node_list, data.data(), data.size());
@@ -78,24 +78,24 @@ public:
private:
- struct EsiNodeInfo
+ struct EsiNodeInfo
{
EsiLib::DocNode::TYPE type;
const char *tag_suffix;
int tag_suffix_len;
const char *closing_tag;
- int closing_tag_len;
+ int closing_tag_len;
EsiNodeInfo(EsiLib::DocNode::TYPE t, const char *s, int s_len, const char *ct, int ct_len)
: type(t), tag_suffix(s), tag_suffix_len(s_len), closing_tag(ct), closing_tag_len(ct_len) { };
};
-
+
std::string _data;
int _parse_start_pos;
size_t _orig_output_list_size;
static const EsiNodeInfo ESI_NODES[];
static const EsiNodeInfo HTML_COMMENT_NODE_INFO;
-
+
static const char *ESI_TAG_PREFIX;
static const int ESI_TAG_PREFIX_LEN;
@@ -106,18 +106,18 @@ private:
static const unsigned int MAX_DOC_SIZE;
enum MATCH_TYPE { NO_MATCH, COMPLETE_MATCH, PARTIAL_MATCH };
-
+
MATCH_TYPE _searchData(const std::string &data, size_t start_pos, const char *str, int str_len,
size_t &pos) const;
MATCH_TYPE _compareData(const std::string &data, size_t pos, const char *str, int str_len) const;
-
+
MATCH_TYPE _findOpeningTag(const std::string &data, size_t start_pos,
size_t &opening_tag_pos, bool &is_html_comment_node) const;
bool _parse(const std::string &data, int &parse_start_pos, EsiLib::DocNodeList &node_list,
bool last_chunk = false) const;
-
+
bool _processIncludeTag(const std::string &data, size_t curr_pos, size_t end_pos,
EsiLib::DocNodeList &node_list) const;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/EsiProcessor.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/EsiProcessor.cc b/plugins/experimental/esi/lib/EsiProcessor.cc
index 74213d0..9cd8307 100644
--- a/plugins/experimental/esi/lib/EsiProcessor.cc
+++ b/plugins/experimental/esi/lib/EsiProcessor.cc
@@ -78,7 +78,7 @@ EsiProcessor::addParseData(const char *data, int data_len) {
_debugLog(_debug_tag, "[%s] Can only parse in parse stage", __FUNCTION__);
return false;
}
-
+
if (!_parser.parseChunk(data, _node_list, data_len)) {
_errorLog("[%s] Failed to parse chunk; Stopping processor...", __FUNCTION__);
error();
@@ -149,7 +149,7 @@ EsiProcessor::_handleParseComplete() {
_debugLog(_debug_tag, "[%s] Parsed ESI document with %d nodes", __FUNCTION__, _node_list.size());
_curr_state = WAITING_TO_PROCESS;
-
+
return true;
}
@@ -172,7 +172,7 @@ EsiProcessor::_getIncludeStatus(const DocNode &node) {
}
const string &processed_url = iter->second;
DataStatus status = _fetcher.getRequestStatus(processed_url);
- _debugLog(_debug_tag, "[%s] Got status %d successfully for URL [%.*s]", __FUNCTION__, status,
+ _debugLog(_debug_tag, "[%s] Got status %d successfully for URL [%.*s]", __FUNCTION__, status,
processed_url.size(), processed_url.data());
return status;
} else if (node.type == DocNode::TYPE_SPECIAL_INCLUDE) {
@@ -183,7 +183,7 @@ EsiProcessor::_getIncludeStatus(const DocNode &node) {
}
}
int include_data_id = attr_iter->value_len;
- SpecialIncludeHandler *handler =
+ SpecialIncludeHandler *handler =
reinterpret_cast<SpecialIncludeHandler *>(const_cast<char *>(attr_iter->value));
DataStatus status = handler->getIncludeStatus(include_data_id);
_debugLog(_debug_tag, "[%s] Successfully got status for special include with id %d",
@@ -228,12 +228,12 @@ EsiProcessor::_getIncludeData(const DocNode &node, const char **content_ptr /* =
result = (_fetcher.getRequestStatus(processed_url) == STATUS_DATA_AVAILABLE);
}
if (!result) {
- _errorLog("[%s] Couldn't get content for URL [%.*s]",
+ _errorLog("[%s] Couldn't get content for URL [%.*s]",
__FUNCTION__, processed_url.size(), processed_url.data());
Stats::increment(Stats::N_INCLUDE_ERRS);
return false;
}
- _debugLog(_debug_tag, "[%s] Got content successfully for URL [%.*s]", __FUNCTION__,
+ _debugLog(_debug_tag, "[%s] Got content successfully for URL [%.*s]", __FUNCTION__,
processed_url.size(), processed_url.data());
return true;
} else if (node.type == DocNode::TYPE_SPECIAL_INCLUDE) {
@@ -244,7 +244,7 @@ EsiProcessor::_getIncludeData(const DocNode &node, const char **content_ptr /* =
}
}
int include_data_id = attr_iter->value_len;
- SpecialIncludeHandler *handler =
+ SpecialIncludeHandler *handler =
reinterpret_cast<SpecialIncludeHandler *>(const_cast<char *>(attr_iter->value));
bool result;
if (content_ptr && content_len_ptr) {
@@ -287,7 +287,7 @@ EsiProcessor::process(const char *&data, int &data_len) {
for (node_iter = try_iter->attempt_nodes.begin(); node_iter != try_iter->attempt_nodes.end(); ++node_iter) {
if ((node_iter->type == DocNode::TYPE_INCLUDE) ||
(node_iter->type == DocNode::TYPE_SPECIAL_INCLUDE)) {
- const Attribute &url = (*node_iter).attr_list.front();
+ const Attribute &url = (*node_iter).attr_list.front();
string raw_url(url.value, url.value_len);
attemptUrls.push_back(_expression.expand(raw_url));
if (!_getIncludeData(*node_iter)) {
@@ -297,27 +297,27 @@ EsiProcessor::process(const char *&data, int &data_len) {
}
}
}
-
+
/* FAILURE CACHE */
FailureData* data=static_cast<FailureData*>(pthread_getspecific(threadKey));
_debugLog("plugin_esi_failureInfo","[%s]Fetched data related to thread specfic %p",__FUNCTION__,data);
-
+
for (iter=try_iter->attempt_nodes.begin(); iter != try_iter->attempt_nodes.end(); ++iter) {
if ((iter->type == DocNode::TYPE_INCLUDE) || iter->type == DocNode::TYPE_SPECIAL_INCLUDE)
{
if(!attempt_succeeded && iter==node_iter)
continue;
- const Attribute &url = (*iter).attr_list.front();
+ const Attribute &url = (*iter).attr_list.front();
string raw_url(url.value, url.value_len);
attemptUrls.push_back(_expression.expand(raw_url));
}
}
-
+
if(attemptUrls.size()>0 && data)
- {
+ {
FailureData::iterator it =data->find(attemptUrls[0]);
FailureInfo* info;
-
+
if(it == data->end())
{
_debugLog("plugin_esi_failureInfo","[%s]Inserting object for the attempt URLS",__FUNCTION__);
@@ -327,7 +327,7 @@ EsiProcessor::process(const char *&data, int &data_len) {
_debugLog("plugin_esi_failureInfo", "[%s] Urls [%.*s]",__FUNCTION__,attemptUrls[i].size(),attemptUrls[i].data());
(*data)[attemptUrls[i]]=info;
}
-
+
info->registerSuccFail(attempt_succeeded);
} else {
@@ -335,15 +335,15 @@ EsiProcessor::process(const char *&data, int &data_len) {
//Should be registered only if attemp was made
//and it failed
if(_reqAdded)
- info->registerSuccFail(attempt_succeeded);
-
+ info->registerSuccFail(attempt_succeeded);
+
}
}
if (attempt_succeeded) {
_debugLog(_debug_tag, "[%s] attempt section succeded; using attempt section", __FUNCTION__);
_node_list.splice(try_iter->pos, try_iter->attempt_nodes);
} else {
- _debugLog(_debug_tag, "[%s] attempt section errored; trying except section", __FUNCTION__);
+ _debugLog(_debug_tag, "[%s] attempt section errored; trying except section", __FUNCTION__);
int n_prescanned_nodes = 0;
if (!_preprocess(try_iter->except_nodes, n_prescanned_nodes)) {
_errorLog("[%s] Failed to preprocess except nodes", __FUNCTION__);
@@ -351,7 +351,7 @@ EsiProcessor::process(const char *&data, int &data_len) {
return FAILURE;
}
_node_list.splice(try_iter->pos, try_iter->except_nodes);
- if (_fetcher.getNumPendingRequests()) {
+ if (_fetcher.getNumPendingRequests()) {
_debugLog(_debug_tag, "[%s] New fetch requests were triggered by except block; "
"Returning NEED_MORE_DATA...", __FUNCTION__);
return NEED_MORE_DATA;
@@ -414,13 +414,13 @@ EsiProcessor::flush(string &data, int &overall_len) {
if(attempt_pending) {
break;
}
-
+
++_n_try_blocks_processed;
attempt_succeeded = true;
for (node_iter = try_iter->attempt_nodes.begin(); node_iter != try_iter->attempt_nodes.end(); ++node_iter) {
if ((node_iter->type == DocNode::TYPE_INCLUDE) ||
(node_iter->type == DocNode::TYPE_SPECIAL_INCLUDE)) {
- const Attribute &url = (*node_iter).attr_list.front();
+ const Attribute &url = (*node_iter).attr_list.front();
string raw_url(url.value, url.value_len);
attemptUrls.push_back(_expression.expand(raw_url));
if (_getIncludeStatus(*node_iter) != STATUS_DATA_AVAILABLE) {
@@ -430,27 +430,27 @@ EsiProcessor::flush(string &data, int &overall_len) {
}
}
}
-
+
/* FAILURE CACHE */
FailureData* fdata=static_cast<FailureData*>(pthread_getspecific(threadKey));
_debugLog("plugin_esi_failureInfo","[%s]Fetched data related to thread specfic %p",__FUNCTION__,fdata);
-
+
for (iter=try_iter->attempt_nodes.begin(); iter != try_iter->attempt_nodes.end(); ++iter) {
if ((iter->type == DocNode::TYPE_INCLUDE) || iter->type == DocNode::TYPE_SPECIAL_INCLUDE)
{
if(!attempt_succeeded && iter==node_iter)
continue;
- const Attribute &url = (*iter).attr_list.front();
+ const Attribute &url = (*iter).attr_list.front();
string raw_url(url.value, url.value_len);
attemptUrls.push_back(_expression.expand(raw_url));
}
}
-
+
if(attemptUrls.size()>0 && fdata)
- {
+ {
FailureData::iterator it =fdata->find(attemptUrls[0]);
FailureInfo* info;
-
+
if(it == fdata->end())
{
_debugLog("plugin_esi_failureInfo","[%s]Inserting object for the attempt URLS",__FUNCTION__);
@@ -460,7 +460,7 @@ EsiProcessor::flush(string &data, int &overall_len) {
_debugLog("plugin_esi_failureInfo", "[%s] Urls [%.*s]",__FUNCTION__,attemptUrls[i].size(),attemptUrls[i].data());
(*fdata)[attemptUrls[i]]=info;
}
-
+
info->registerSuccFail(attempt_succeeded);
} else {
@@ -468,8 +468,8 @@ EsiProcessor::flush(string &data, int &overall_len) {
//Should be registered only if attemp was made
//and it failed
if(_reqAdded)
- info->registerSuccFail(attempt_succeeded);
-
+ info->registerSuccFail(attempt_succeeded);
+
}
}
if (attempt_succeeded) {
@@ -477,14 +477,14 @@ EsiProcessor::flush(string &data, int &overall_len) {
_n_prescanned_nodes = _n_prescanned_nodes + try_iter->attempt_nodes.size();
_node_list.splice(try_iter->pos, try_iter->attempt_nodes);
} else {
- _debugLog(_debug_tag, "[%s] attempt section errored; trying except section", __FUNCTION__);
+ _debugLog(_debug_tag, "[%s] attempt section errored; trying except section", __FUNCTION__);
int n_prescanned_nodes = 0;
if (!_preprocess(try_iter->except_nodes, n_prescanned_nodes)) {
_errorLog("[%s] Failed to preprocess except nodes", __FUNCTION__);
}
_n_prescanned_nodes = _n_prescanned_nodes + try_iter->except_nodes.size();
_node_list.splice(try_iter->pos, try_iter->except_nodes);
- if (_fetcher.getNumPendingRequests()) {
+ if (_fetcher.getNumPendingRequests()) {
_debugLog(_debug_tag, "[%s] New fetch requests were triggered by except block; "
"Returning NEED_MORE_DATA...", __FUNCTION__);
}
@@ -514,7 +514,7 @@ EsiProcessor::flush(string &data, int &overall_len) {
++_n_processed_try_nodes;
}
}
-
+
_debugLog(_debug_tag, "[%s] really Processing ESI node [%s] with data of size %d starting with [%.10s...]", __FUNCTION__, DocNode::type_names_[doc_node.type], doc_node.data_len, (doc_node.data_len ? doc_node.data: "(null)"));
if (doc_node.type == DocNode::TYPE_PRE) {
@@ -697,10 +697,10 @@ EsiProcessor::_preprocess(DocNodeList &node_list, int &n_prescanned_nodes) {
DocNodeList::iterator list_iter = node_list.begin();
StringHash::iterator hash_iter;
string raw_url;
-
+
// skip previously examined nodes
for (int i = 0; i < n_prescanned_nodes; ++i, ++list_iter);
-
+
for (; list_iter != node_list.end(); ++list_iter, ++n_prescanned_nodes) {
switch (list_iter->type) {
case DocNode::TYPE_CHOOSE:
@@ -773,7 +773,7 @@ EsiProcessor::_preprocess(DocNodeList &node_list, int &n_prescanned_nodes) {
FailureInfo* info;
if(it != threadData->end()) {
- info=it->second;
+ info=it->second;
fetch=_reqAdded=info->isAttemptReq();
_debugLog(_debug_tag,"[%s] Fetch result is %d",__FUNCTION__,fetch);
}
[2/5] trafficserver git commit: Remove trailing whitespace
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/EsiProcessor.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/EsiProcessor.h b/plugins/experimental/esi/lib/EsiProcessor.h
index 16004c6..fbbf547 100644
--- a/plugins/experimental/esi/lib/EsiProcessor.h
+++ b/plugins/experimental/esi/lib/EsiProcessor.h
@@ -48,48 +48,48 @@ public:
EsiLib::ComponentBase::Debug debug_func, EsiLib::ComponentBase::Error error_func,
HttpDataFetcher &fetcher, EsiLib::Variables &variables,
const EsiLib::HandlerManager &handler_mgr);
-
+
/** Initializes the processor with the context of the request to be processed */
bool start();
/** Adds data to be parsed */
bool addParseData(const char *data, int data_len = -1);
- /** convenient alternative to method above */
+ /** convenient alternative to method above */
bool addParseData(const std::string &data) {
return addParseData(data.data(), data.size());
}
-
+
/** Tells processor to wrap-up parsing; a final or the only piece of
* data can be optionally provided */
bool completeParse(const char *data = 0, int data_len = -1);
-
- /** convenient alternative to method above */
+
+ /** convenient alternative to method above */
bool completeParse(const std::string &data) {
return completeParse(data.data(), data.size());
}
-
+
enum ReturnCode { FAILURE, SUCCESS, NEED_MORE_DATA };
-
- /** Processes the currently parsed ESI document and returns processed
- * data in supplied out-parameters. Should be called when fetcher has
- * finished pulling in all data.
- *
+
+ /** Processes the currently parsed ESI document and returns processed
+ * data in supplied out-parameters. Should be called when fetcher has
+ * finished pulling in all data.
+ *
* try/attempt/except construct can generate new fetch requests
* during processing. Only in such cases is NEED_MORE_DATA returned;
* else FAILURE/SUCCESS is returned. */
ReturnCode process(const char *&data, int &data_len);
- /** Process the ESI document and flush processed data as much as
- * possible. Can be called when fetcher hasn't finished pulling
+ /** Process the ESI document and flush processed data as much as
+ * possible. Can be called when fetcher hasn't finished pulling
* in all data. */
ReturnCode flush(std:: string &data, int &overall_len);
-
+
/** returns packed version of document currently being processed */
void packNodeList(std::string &buffer, bool retain_buffer_data) {
return _node_list.pack(buffer, retain_buffer_data);
}
-
+
/** Unpacks previously parsed and packed ESI node list from given
* buffer and preps for process(); Unpacked document will point to
* data in argument (i.e., caller space) */
@@ -101,12 +101,12 @@ public:
}
/** Clears state from current request */
- void stop();
+ void stop();
virtual ~EsiProcessor();
private:
-
+
enum EXEC_STATE { STOPPED, PARSING, WAITING_TO_PROCESS, PROCESSED, ERRORED };
EXEC_STATE _curr_state;
@@ -124,7 +124,7 @@ private:
bool _reqAdded;
bool _usePackedNodeList;
-
+
bool _processEsiNode(const EsiLib::DocNodeList::iterator &iter);
bool _handleParseComplete();
bool _getIncludeData(const EsiLib::DocNode &node, const char **content_ptr = 0, int *content_len_ptr = 0);
@@ -144,7 +144,7 @@ private:
EsiLib::DocNodeList &attempt_nodes;
EsiLib::DocNodeList &except_nodes;
EsiLib::DocNodeList::iterator pos;
- TryBlock(EsiLib::DocNodeList &att, EsiLib::DocNodeList &exc, EsiLib::DocNodeList::iterator p)
+ TryBlock(EsiLib::DocNodeList &att, EsiLib::DocNodeList &exc, EsiLib::DocNodeList::iterator p)
: attempt_nodes(att), except_nodes(exc), pos(p) { };
};
typedef std::list<TryBlock> TryBlockList;
@@ -153,7 +153,7 @@ private:
const EsiLib::HandlerManager &_handler_manager;
- static const char *INCLUDE_DATA_ID_ATTR;
+ static const char *INCLUDE_DATA_ID_ATTR;
typedef std::map<std::string, EsiLib::SpecialIncludeHandler *> IncludeHandlerMap;
IncludeHandlerMap _include_handlers;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/Expression.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/Expression.cc b/plugins/experimental/esi/lib/Expression.cc
index 9e3674b..fc94b3a 100644
--- a/plugins/experimental/esi/lib/Expression.cc
+++ b/plugins/experimental/esi/lib/Expression.cc
@@ -29,7 +29,7 @@ using namespace EsiLib;
const string Expression::EMPTY_STRING("");
const string Expression::TRUE_STRING("true");
-const Expression::OperatorString Expression::OPERATOR_STRINGS[N_OPERATORS] = {
+const Expression::OperatorString Expression::OPERATOR_STRINGS[N_OPERATORS] = {
Expression::OperatorString("==", 2),
Expression::OperatorString("!=", 2),
Expression::OperatorString("<=", 2),
@@ -38,14 +38,14 @@ const Expression::OperatorString Expression::OPERATOR_STRINGS[N_OPERATORS] = {
Expression::OperatorString(">", 1),
Expression::OperatorString("!", 1),
Expression::OperatorString("|", 1),
- Expression::OperatorString("&", 1)
+ Expression::OperatorString("&", 1)
};
-Expression::Expression(const char *debug_tag, ComponentBase::Debug debug_func,
- ComponentBase::Error error_func, Variables &variables)
+Expression::Expression(const char *debug_tag, ComponentBase::Debug debug_func,
+ ComponentBase::Error error_func, Variables &variables)
: ComponentBase(debug_tag, debug_func, error_func), _variables(variables), _value("") {
}
-
+
inline bool
Expression::_stripQuotes(const char *&expr, int &expr_len) const {
char quote_char = 0;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/Expression.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/Expression.h b/plugins/experimental/esi/lib/Expression.h
index ad982dc..af3482b 100644
--- a/plugins/experimental/esi/lib/Expression.h
+++ b/plugins/experimental/esi/lib/Expression.h
@@ -31,7 +31,7 @@
#include "ComponentBase.h"
#include "Variables.h"
-namespace EsiLib {
+namespace EsiLib {
class Expression : private ComponentBase {
@@ -39,7 +39,7 @@ public:
Expression(const char *debug_tag, ComponentBase::Debug debug_func, ComponentBase::Error error_func,
Variables &variables);
-
+
/** substitutes variables (if any) in given expression */
const std::string &expand(const char *expr, int expr_len = -1);
@@ -66,7 +66,7 @@ private:
Variables &_variables;
std::string _value;
- // these are arranged in parse priority format indices correspond to op strings array
+ // these are arranged in parse priority format indices correspond to op strings array
enum Operator { OP_EQ, OP_NEQ, OP_LTEQ, OP_GTEQ, OP_LT, OP_GT, OP_NOT, OP_OR, OP_AND, N_OPERATORS };
struct OperatorString {
@@ -74,15 +74,15 @@ private:
int str_len;
OperatorString(const char *s = 0, int s_len = -1) : str(s), str_len(s_len) { };
};
-
+
static const OperatorString OPERATOR_STRINGS[N_OPERATORS];
inline void _trimWhiteSpace(const char *&expr, int &expr_len) const;
-
+
inline bool _stripQuotes(const char *&expr, int &expr_len) const;
-
+
inline int _findOperator(const char *expr, int expr_len, Operator &op) const;
-
+
inline bool _isBinaryOperator(Operator &op) const {
return ((op == OP_EQ) || (op == OP_NEQ) || (op == OP_LT) || (op == OP_GT) ||
(op == OP_LTEQ) || (op == OP_GTEQ) || (op == OP_OR) || (op == OP_AND));
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/FailureInfo.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/FailureInfo.cc b/plugins/experimental/esi/lib/FailureInfo.cc
index 24954ab..2541f8c 100644
--- a/plugins/experimental/esi/lib/FailureInfo.cc
+++ b/plugins/experimental/esi/lib/FailureInfo.cc
@@ -37,7 +37,7 @@ void FailureInfo::registerSuccFail(bool isSuccess)
{
++_windowMarker;
_windowMarker%=_totalSlots;
-
+
if(_windowMarker==_totalSlots-1)
{
++_windowsPassed;
@@ -52,7 +52,7 @@ void FailureInfo::registerSuccFail(bool isSuccess)
_avgOverWindow+=avg/_windowsPassed;
_debugLog(_debug_tag,"[%s] current average over window is %lf",__FUNCTION__,_avgOverWindow);
}
-
+
gettimeofday(&_start,NULL);
}
@@ -60,13 +60,13 @@ void FailureInfo::registerSuccFail(bool isSuccess)
{
_statistics[_windowMarker].second++;
}
-
+
else
{
_statistics[_windowMarker].first++;
}
}
-
+
bool FailureInfo::isAttemptReq()
{
double avg=0;
@@ -75,11 +75,11 @@ bool FailureInfo::isAttemptReq()
if(_statistics[i].first >0)
{
avg+=_statistics[i].first/(_statistics[i].first+_statistics[i].second);
-
+
}
}
-
- if(avg) {
+
+ if(avg) {
//Average it out for time being
avg=avg/_totalSlots;
double prob;
@@ -91,10 +91,10 @@ bool FailureInfo::isAttemptReq()
double mapFactor=( ( (avg*1000-LOWER_CUT_OFF)*(avg*1000-LOWER_CUT_OFF) ) / (HIGHER_CUT_OFF-LOWER_CUT_OFF ) )+LOWER_CUT_OFF;
prob=mapFactor/1000;
}
-
+
if(static_cast<int>(prob))
prob=_avgOverWindow;
-
+
_debugLog(_debug_tag,"[%s] Calculated probability is %lf",__FUNCTION__,prob);
int decision=rand()%100;
@@ -103,7 +103,7 @@ bool FailureInfo::isAttemptReq()
return (_requestMade=false);
}
}
-
+
_debugLog(_debug_tag,"[%s] fetch request will be added for an attempt request",__FUNCTION__);
return true;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/FailureInfo.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/FailureInfo.h b/plugins/experimental/esi/lib/FailureInfo.h
index 8f4705b..b97bddb 100644
--- a/plugins/experimental/esi/lib/FailureInfo.h
+++ b/plugins/experimental/esi/lib/FailureInfo.h
@@ -98,12 +98,12 @@ private:
/* Keep track of the number of windows filled prev*/
size_t _windowsPassed;
-
+
/*Used as a deciding factor between attempt/except
* incase prob is complete truth
*/
double _avgOverWindow;
-
+
public:
/*Was a reqeust made*/
bool _requestMade;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/HttpHeader.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/HttpHeader.h b/plugins/experimental/esi/lib/HttpHeader.h
index bdef5ce..e5773ab 100644
--- a/plugins/experimental/esi/lib/HttpHeader.h
+++ b/plugins/experimental/esi/lib/HttpHeader.h
@@ -34,7 +34,7 @@ struct HttpHeader {
int name_len;
const char *value;
int value_len;
- HttpHeader(const char *n = 0, int n_len = -1, const char *v = 0, int v_len = -1)
+ HttpHeader(const char *n = 0, int n_len = -1, const char *v = 0, int v_len = -1)
: name(n), name_len(n_len), value(v), value_len(v_len) { };
};
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/IncludeHandlerFactory.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/IncludeHandlerFactory.h b/plugins/experimental/esi/lib/IncludeHandlerFactory.h
index 2845d49..abf8c6e 100644
--- a/plugins/experimental/esi/lib/IncludeHandlerFactory.h
+++ b/plugins/experimental/esi/lib/IncludeHandlerFactory.h
@@ -36,7 +36,7 @@ EsiLib::SpecialIncludeHandler *createSpecialIncludeHandler(EsiLib::Variables &es
EsiLib::Expression &esi_expr,
HttpDataFetcher &fetcher,
const std::string &id);
-
+
#ifdef __cplusplus
}
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/Stats.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/Stats.h b/plugins/experimental/esi/lib/Stats.h
index 0d8dd67..44f54d3 100644
--- a/plugins/experimental/esi/lib/Stats.h
+++ b/plugins/experimental/esi/lib/Stats.h
@@ -60,6 +60,6 @@ void increment(STAT st, int step = 1);
};
};
-
+
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/Utils.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/Utils.cc b/plugins/experimental/esi/lib/Utils.cc
index 047fbe6..86c3196 100644
--- a/plugins/experimental/esi/lib/Utils.cc
+++ b/plugins/experimental/esi/lib/Utils.cc
@@ -183,7 +183,7 @@ Utils::parseAttributes(const char *data, int data_len, AttributeList &attr_list,
attr.value = 0;
inside_quotes = false;
} else if (data[i] == '"') {
- if (!escape_on) {
+ if (!escape_on) {
inside_quotes = !inside_quotes;
}
} else if ((data[i] == '=') && !attr.value && !inside_quotes) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/Utils.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/Utils.h b/plugins/experimental/esi/lib/Utils.h
index 6308e7c..9b562c5 100644
--- a/plugins/experimental/esi/lib/Utils.h
+++ b/plugins/experimental/esi/lib/Utils.h
@@ -21,7 +21,7 @@
limitations under the License.
*/
-#ifndef _ESI_UTILS_H
+#ifndef _ESI_UTILS_H
#define _ESI_UTILS_H
@@ -49,7 +49,7 @@ namespace Utils {
// to data inside data string
bool getAttribute(const std::string &data, const std::string &attr, size_t curr_pos, size_t end_pos,
Attribute &attr_info, size_t *term_pos = 0, char terminator = 0);
-
+
// less specialized version of method above
inline bool getAttribute(const std::string &data, const char *attr, Attribute &attr_info) {
return getAttribute(data, std::string(attr), 0, data.size(), attr_info);
@@ -98,10 +98,10 @@ namespace Utils {
// parses given lines (assumes <key><whitespace><value> format) and
// stores them in supplied map; Lines beginning with '#' are ignored
void parseKeyValueConfig(const std::list<std::string> &lines, KeyValueMap &kvMap);
-
+
inline std::string unescape(const char *str, int len = -1) {
std::string retval("");
- if (str) {
+ if (str) {
for (int i = 0; (((len == -1) && (str[i] != '\0')) || (i < len)); ++i) {
if (str[i] != '\\') {
retval += str[i];
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/Variables.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/Variables.cc b/plugins/experimental/esi/lib/Variables.cc
index 0bf93dd..dc59f13 100644
--- a/plugins/experimental/esi/lib/Variables.cc
+++ b/plugins/experimental/esi/lib/Variables.cc
@@ -67,11 +67,11 @@ Variables::_toUpperCase(string &str) const {
return str;
}
-inline int
+inline int
Variables::_searchHeaders(const string headers[], const char *name, int name_len) const {
int curr_header_size;
for (int i = 0; (curr_header_size = static_cast<int>(headers[i].size())); ++i) {
- if ((name_len == curr_header_size) &&
+ if ((name_len == curr_header_size) &&
(strncasecmp(headers[i].data(), name, curr_header_size) == 0)) {
return i;
}
@@ -221,7 +221,7 @@ Variables::getValue(const string &name) const {
_toUpperCase(search_key);
StringHash::const_iterator iter = _simple_data.find(search_key);
if (iter != _simple_data.end()) {
- _debugLog(_debug_tag, "[%s] Found value [%.*s] for variable [%.*s] in simple data",
+ _debugLog(_debug_tag, "[%s] Found value [%.*s] for variable [%.*s] in simple data",
__FUNCTION__, iter->second.size(), iter->second.data(), name.size(), name.data());
return iter->second;
}
@@ -251,21 +251,21 @@ Variables::getValue(const string &name) const {
__FUNCTION__, search_key.size(), search_key.data());
return (iter == _dict_data[dict_index].end()) ? EMPTY_STRING : TRUE_STRING;
}
-
+
if (iter != _dict_data[dict_index].end()) {
_debugLog(_debug_tag, "[%s] Found variable [%.*s] in %s dictionary with value [%.*s]",
- __FUNCTION__, search_key.size(), search_key.data(), NORM_SPECIAL_HEADERS[dict_index].c_str(),
+ __FUNCTION__, search_key.size(), search_key.data(), NORM_SPECIAL_HEADERS[dict_index].c_str(),
iter->second.size(), iter->second.data());
return iter->second;
}
size_t cookie_part_divider = (dict_index == HTTP_COOKIE) ? search_key.find(';') : search_key.size();
if (cookie_part_divider && (cookie_part_divider < (search_key.size() - 1))) {
- _debugLog(_debug_tag, "[%s] Cookie variable [%s] refers to sub cookie",
+ _debugLog(_debug_tag, "[%s] Cookie variable [%s] refers to sub cookie",
__FUNCTION__, search_key.c_str());
return _getSubCookieValue(search_key, cookie_part_divider);
}
-
+
_debugLog(_debug_tag, "[%s] Found no value for dict variable [%s]", __FUNCTION__, name.c_str());
return EMPTY_STRING;
}
@@ -309,14 +309,14 @@ Variables::_getSubCookieValue(const string &cookie_str, size_t cookie_part_divid
// that; hence this shortcut
string &non_const_cookie_str = const_cast<string &>(cookie_str);
StringHash::const_iterator it_part;
-
+
non_const_cookie_str[cookie_part_divider] = '\0'; // make sure cookie name is NULL terminated
const char *cookie_name = non_const_cookie_str.data(); /* above NULL will take effect */
const char *part_name = non_const_cookie_str.c_str() + cookie_part_divider + 1;
StringKeyHash<StringHash>::const_iterator it_cookie = _sub_cookies.find(cookie_name);
if (it_cookie == _sub_cookies.end()) {
- _debugLog(_debug_tag, "[%s] Could not find value for cookie [%s]",
+ _debugLog(_debug_tag, "[%s] Could not find value for cookie [%s]",
__FUNCTION__, cookie_name);
goto fail;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/Variables.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/Variables.h b/plugins/experimental/esi/lib/Variables.h
index 6462662..19f37f2 100644
--- a/plugins/experimental/esi/lib/Variables.h
+++ b/plugins/experimental/esi/lib/Variables.h
@@ -41,7 +41,7 @@ public:
Variables(const char *debug_tag, ComponentBase::Debug debug_func, ComponentBase::Error error_func)
: ComponentBase(debug_tag, debug_func, error_func), _headers_parsed(false), _query_string(""),
_query_string_parsed(false), _cookie_jar_created(false) { };
-
+
/** currently 'host', 'referer', 'accept-language', 'cookie' and 'user-agent' headers are parsed */
void populate(const HttpHeader &header);
@@ -130,7 +130,7 @@ private:
typedef std::list<std::string> HeaderValueList;
HeaderValueList _cached_simple_headers[N_SIMPLE_HEADERS];
HeaderValueList _cached_special_headers[N_SPECIAL_HEADERS];
-
+
std::string _cookie_str;
bool _headers_parsed;
std::string _query_string;
@@ -138,7 +138,7 @@ private:
void _parseHeader(const char *name, int name_len, const char *value, int value_len);
void _parseQueryString(const char *query_string, int query_string_len);
-
+
StringKeyHash<StringHash> _sub_cookies;
bool _cookie_jar_created;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/gzip.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/gzip.cc b/plugins/experimental/esi/lib/gzip.cc
index 9a38ce4..df7272f 100644
--- a/plugins/experimental/esi/lib/gzip.cc
+++ b/plugins/experimental/esi/lib/gzip.cc
@@ -173,7 +173,7 @@ EsiLib::gunzip(const char *data, int data_len, BufferList &buf_list) {
// avoid data copy for temporary
buf_list.push_back(string());
string &curr_buf = buf_list.back();
- curr_buf.assign(raw_buf, curr_buf_size);
+ curr_buf.assign(raw_buf, curr_buf_size);
if (inflate_result == Z_STREAM_END) {
break;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/lib/gzip.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/lib/gzip.h b/plugins/experimental/esi/lib/gzip.h
index 13906b8..5ac116a 100644
--- a/plugins/experimental/esi/lib/gzip.h
+++ b/plugins/experimental/esi/lib/gzip.h
@@ -23,7 +23,7 @@
#ifndef _GZIP_H
-#define _GZIP_H
+#define _GZIP_H
#include <string>
#include <list>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/serverIntercept.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/serverIntercept.cc b/plugins/experimental/esi/serverIntercept.cc
index c8b46f5..9ff27a0 100644
--- a/plugins/experimental/esi/serverIntercept.cc
+++ b/plugins/experimental/esi/serverIntercept.cc
@@ -69,7 +69,7 @@ struct SContData {
bool req_hdr_parsed;
bool initialized;
- SContData(TSCont cont)
+ SContData(TSCont cont)
: net_vc(0), contp(cont), input(), output(), body(""), req_content_len(0), req_hdr_bufp(0), req_hdr_loc(0),
req_hdr_parsed(false), initialized(false) {
http_parser = TSHttpParserCreate();
@@ -81,7 +81,7 @@ struct SContData {
~SContData() {
TSDebug(DEBUG_TAG, "[%s] Destroying continuation data", __FUNCTION__);
- TSHttpParserDestroy(http_parser);
+ TSHttpParserDestroy(http_parser);
if (req_hdr_loc) {
TSHandleMLocRelease(req_hdr_bufp, TS_NULL_MLOC, req_hdr_loc);
}
@@ -98,7 +98,7 @@ SContData::init(TSVConn vconn)
TSError("[%s] SContData already initialized!", __FUNCTION__);
return false;
}
-
+
net_vc = vconn;
input.buffer = TSIOBufferCreate();
@@ -129,7 +129,7 @@ handleRead(SContData *cont_data, bool &read_complete) {
TSError("[%s] Error while getting number of bytes available", __FUNCTION__);
return false;
}
-
+
TSDebug(DEBUG_TAG, "[%s] Parsed header, avail: %d", __FUNCTION__, avail);
int consumed = 0;
@@ -178,11 +178,11 @@ handleRead(SContData *cont_data, bool &read_complete) {
block = TSIOBufferBlockNext(block);
}
}
-
+
TSIOBufferReaderConsume(cont_data->input.reader, consumed);
TSDebug(DEBUG_TAG, "[%s] Consumed %d bytes from input vio, avail: %d", __FUNCTION__, consumed, avail);
-
+
// Modify the input VIO to reflect how much data we've completed.
TSVIONDoneSet(cont_data->input.vio, TSVIONDoneGet(cont_data->input.vio) + consumed);
@@ -201,7 +201,7 @@ handleRead(SContData *cont_data, bool &read_complete) {
static bool
processRequest(SContData *cont_data) {
string reply_header("HTTP/1.1 200 OK\r\n");
-
+
TSMLoc field_loc = TSMimeHdrFieldGet(cont_data->req_hdr_bufp, cont_data->req_hdr_loc, 0);
while (field_loc) {
TSMLoc next_field_loc;
@@ -245,7 +245,7 @@ processRequest(SContData *cont_data) {
TSHandleMLocRelease(cont_data->req_hdr_bufp, cont_data->req_hdr_loc, field_loc);
field_loc = next_field_loc;
}
-
+
int body_size = static_cast<int>(cont_data->body.size());
if (cont_data->req_content_len != body_size) {
TSError("[%s] Read only %d bytes of body; expecting %d bytes", __FUNCTION__, body_size,
@@ -270,7 +270,7 @@ processRequest(SContData *cont_data) {
int total_bytes_written = reply_header.size() + body_size;
TSDebug(DEBUG_TAG, "[%s] Wrote reply of size %d", __FUNCTION__, total_bytes_written);
TSVIONBytesSet(cont_data->output.vio, total_bytes_written);
-
+
TSVIOReenable(cont_data->output.vio);
return true;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/test/StubIncludeHandler.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/test/StubIncludeHandler.cc b/plugins/experimental/esi/test/StubIncludeHandler.cc
index 4c6798d..8076b60 100644
--- a/plugins/experimental/esi/test/StubIncludeHandler.cc
+++ b/plugins/experimental/esi/test/StubIncludeHandler.cc
@@ -46,7 +46,7 @@ void
StubIncludeHandler::handleParseComplete() {
parseCompleteCalled = true;
}
-
+
bool
StubIncludeHandler::getData(int include_id, const char *&data, int &data_len) {
TestHttpDataFetcher &test_fetcher = dynamic_cast<TestHttpDataFetcher &>(_http_fetcher);
@@ -65,7 +65,7 @@ StubIncludeHandler::getFooter(const char *&footer, int &footer_len) {
footer = FOOTER;
footer_len = FOOTER_SIZE;
}
-
+
StubIncludeHandler::~StubIncludeHandler() {
for (std::list<char *>::iterator iter = heap_strings.begin(); iter != heap_strings.end(); ++iter) {
delete[] *iter;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/test/StubIncludeHandler.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/test/StubIncludeHandler.h b/plugins/experimental/esi/test/StubIncludeHandler.h
index 576834b..74118fe 100644
--- a/plugins/experimental/esi/test/StubIncludeHandler.h
+++ b/plugins/experimental/esi/test/StubIncludeHandler.h
@@ -32,7 +32,7 @@ class StubIncludeHandler : public EsiLib::SpecialIncludeHandler {
public:
- StubIncludeHandler(EsiLib::Variables &esi_vars, EsiLib::Expression &esi_expr,
+ StubIncludeHandler(EsiLib::Variables &esi_vars, EsiLib::Expression &esi_expr,
HttpDataFetcher &http_fetcher)
: EsiLib::SpecialIncludeHandler(esi_vars, esi_expr, http_fetcher),
parseCompleteCalled(false), n_includes(0) {
@@ -42,13 +42,13 @@ public:
bool parseCompleteCalled;
void handleParseComplete();
-
+
bool getData(int include_id, const char *&data, int &data_len);
void getFooter(const char *&footer, int &footer_len);
-
+
~StubIncludeHandler();
-
+
static bool includeResult;
static const char *const DATA_PREFIX;
static const int DATA_PREFIX_SIZE;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/test/TestHttpDataFetcher.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/test/TestHttpDataFetcher.h b/plugins/experimental/esi/test/TestHttpDataFetcher.h
index 1df387e..62c403a 100644
--- a/plugins/experimental/esi/test/TestHttpDataFetcher.h
+++ b/plugins/experimental/esi/test/TestHttpDataFetcher.h
@@ -30,11 +30,11 @@
class TestHttpDataFetcher : public HttpDataFetcher
{
-
+
public:
-
+
TestHttpDataFetcher() : _n_pending_requests(0), _return_data(true) { }
-
+
bool addFetchRequest(const std::string &url, FetchedDataProcessor *callback_obj = 0) {
++_n_pending_requests;
return true;
@@ -73,7 +73,7 @@ private:
int _n_pending_requests;
std::string _data;
bool _return_data;
-
+
};
#endif
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/test/docnode_test.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/test/docnode_test.cc b/plugins/experimental/esi/test/docnode_test.cc
index 19967d8..1bc6bde 100644
--- a/plugins/experimental/esi/test/docnode_test.cc
+++ b/plugins/experimental/esi/test/docnode_test.cc
@@ -144,11 +144,11 @@ void checkNodeList2(const DocNodeList &node_list) {
pthread_key_t threadKey;
-int main()
+int main()
{
pthread_key_create(&threadKey, NULL);
Utils::init(&Debug, &Error);
-
+
{
cout << endl << "==================== Test 1" << endl;
EsiParser parser("parser_test", &Debug, &Error);
@@ -173,14 +173,14 @@ int main()
assert(node_list3.unpack(packed) == true);
assert(node_list3.size() == 0);
*(reinterpret_cast<int *>(&packed[0])) = 3;
-
+
DocNodeList node_list4;
assert(node_list4.unpack(packed) == true);
assert(node_list4.size() == 3);
checkNodeList1(node_list4);
}
- {
+ {
cout << endl << "==================== Test 2" << endl;
EsiParser parser("parser_test", &Debug, &Error);
string input_data("<esi:choose>"
@@ -217,7 +217,7 @@ int main()
"</esi:try>"
"</esi:otherwise>"
"</esi:choose>");
-
+
DocNodeList node_list;
assert(parser.completeParse(node_list, input_data) == true);
checkNodeList2(node_list);
@@ -242,7 +242,7 @@ int main()
assert(node_list2.unpack(packed3.data() + 5, packed3.size() - 5) == true);
checkNodeList2(node_list2);
}
-
+
cout << "All tests passed" << endl;
return 0;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/test/parser_test.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/test/parser_test.cc b/plugins/experimental/esi/test/parser_test.cc
index a2e5eb0..715df84 100644
--- a/plugins/experimental/esi/test/parser_test.cc
+++ b/plugins/experimental/esi/test/parser_test.cc
@@ -46,11 +46,11 @@ void check_node_attr(const Attribute &attr, const char *name, const char *value)
pthread_key_t threadKey;
-int main()
+int main()
{
pthread_key_create(&threadKey, NULL);
Utils::init(&Debug, &Error);
-
+
{
cout << endl << "==================== Test 1: No src attr test " << endl;
EsiParser parser("parser_test", &Debug, &Error);
@@ -72,7 +72,7 @@ int main()
assert(parser.completeParse(node_list) == false);
assert(node_list.size() == 0);
}
-
+
{
cout << endl << "==================== Test 3: Valid src test " << endl;
EsiParser parser("parser_test", &Debug, &Error);
@@ -631,7 +631,7 @@ int main()
{
cout << endl << "==================== Test 30: choose tag " << endl;
EsiParser parser("parser_test", &Debug, &Error);
- string input_data =
+ string input_data =
"<esi:choose>"
"<esi:when test=blah><esi:include src=url /></esi:when>"
"</esi:choose>";
@@ -663,7 +663,7 @@ int main()
cout << endl << "==================== Test 31: when tag " << endl;
EsiParser parser("parser_test", &Debug, &Error);
string input_data = "<esi:when test=blah><esi:include src=url /></esi:when>";
-
+
DocNodeList node_list;
assert(parser.parseChunk(input_data, node_list) == true);
assert(parser.completeParse(node_list) == true);
@@ -680,7 +680,7 @@ int main()
cout << endl << "==================== Test 32: otherwise tag " << endl;
EsiParser parser("parser_test", &Debug, &Error);
string input_data = "<esi:otherwise><esi:include src=url /></esi:otherwise>";
-
+
DocNodeList node_list;
assert(parser.parseChunk(input_data, node_list) == true);
assert(parser.completeParse(node_list) == true);
@@ -695,12 +695,12 @@ int main()
{
cout << endl << "==================== Test 33: try tag " << endl;
EsiParser parser("parser_test", &Debug, &Error);
- string input_data =
+ string input_data =
"<esi:try>"
"<esi:attempt><esi:include src=url1 /></esi:attempt>"
"<esi:except><esi:include src=url2 /></esi:except>"
"</esi:try>";
-
+
DocNodeList node_list;
assert(parser.parseChunk(input_data, node_list) == true);
assert(parser.completeParse(node_list) == true);
@@ -742,7 +742,7 @@ int main()
string input_data =
"<esi:attempt><esi:include src=url1 /></esi:attempt>"
"<esi:except><esi:include src=url2 /></esi:except>";
-
+
DocNodeList node_list;
assert(parser.parseChunk(input_data, node_list) == true);
assert(parser.completeParse(node_list) == true);
@@ -823,7 +823,7 @@ int main()
assert(list_iter->type == DocNode::TYPE_PRE);
assert(list_iter->data_len == static_cast<int>(strlen("foo")));
assert(strncmp(list_iter->data, "foo", list_iter->data_len) == 0);
-
+
++list_iter;
assert(list_iter->type == DocNode::TYPE_TRY);
DocNodeList &child_nodes = list_iter->child_nodes;
@@ -849,10 +849,10 @@ int main()
{
cout << endl << "==================== Test 37: html comment tag " << endl;
EsiParser parser("parser_test", &Debug, &Error);
- string input_data =
- "foo <esi:comment text=\"blah\"/><!--esi <p><esi:vars>Hello, $(HTTP_COOKIE{name})!</esi:vars></p>-->"
+ string input_data =
+ "foo <esi:comment text=\"blah\"/><!--esi <p><esi:vars>Hello, $(HTTP_COOKIE{name})!</esi:vars></p>-->"
"<esi:include src=url /> bar";
-
+
DocNodeList node_list;
assert(parser.parseChunk(input_data, node_list) == true);
assert(parser.completeParse(node_list) == true);
@@ -898,9 +898,9 @@ int main()
"<!--esi blah--><esi:com",
"ment text=\"bleh\" /> <esi:remove> </esi:remove><!--esi bleh -->",
"<!--esi blooh--><esi:include src=url3/>",
- 0
+ 0
};
-
+
DocNodeList node_list;
for (int i = 0; lines[i]; ++i) {
assert(parser.parseChunk(lines[i], node_list) == true);
@@ -1059,7 +1059,7 @@ int main()
assert(parser.completeParse(node_list) == false);
assert(node_list.size() == 0);
}
-
+
{
cout << endl << "==================== Test 42: Valid special include " << endl;
EsiParser parser("parser_test", &Debug, &Error);
@@ -1080,7 +1080,7 @@ int main()
{
cout << endl << "===================== Test 43) choose-when" << endl;
EsiParser parser("parser_test", &Debug, &Error);
- string
+ string
input_data1("<esi:choose>"
"<esi:when test=cond1>"
"<esi:include src=foo />"
@@ -1166,7 +1166,7 @@ int main()
"<esi:include src=otherwise />"
"</esi:otherwise>"
"</esi:choose>");
-
+
DocNodeList node_list;
assert(parser.parseChunk(input_data, node_list) == false);
assert(parser.completeParse(node_list) == false);
@@ -1334,7 +1334,7 @@ int main()
assert(list_iter->child_nodes.size() == 0);
assert(list_iter->attr_list.size() == 1);
check_node_attr(list_iter->attr_list.front(), "src", "pre");
-
+
++list_iter;
assert(list_iter->type == DocNode::TYPE_PRE);
assert(list_iter->child_nodes.size() == 0);
@@ -1353,34 +1353,34 @@ int main()
assert(list_iter2->child_nodes.size() == 2);
assert(list_iter2->attr_list.size() == 0);
assert(list_iter2->data_len == 0);
-
+
list_iter3 = list_iter2->child_nodes.begin();
assert(list_iter3->type == DocNode::TYPE_PRE);
assert(list_iter3->child_nodes.size() == 0);
assert(list_iter3->attr_list.size() == 0);
assert(list_iter3->data_len == static_cast<int>(strlen("bar")));
assert(strncmp(list_iter3->data, "bar", list_iter3->data_len) == 0);
-
+
++list_iter3;
assert(list_iter3->type == DocNode::TYPE_INCLUDE);
assert(list_iter3->child_nodes.size() == 0);
assert(list_iter3->attr_list.size() == 1);
assert(list_iter3->data_len == 0);
check_node_attr(list_iter3->attr_list.front(), "src", "attempt");
-
+
++list_iter2;
assert(list_iter2->type == DocNode::TYPE_EXCEPT);
assert(list_iter2->child_nodes.size() == 1);
assert(list_iter2->attr_list.size() == 0);
assert(list_iter2->data_len == 0);
-
+
list_iter3 = list_iter2->child_nodes.begin();
assert(list_iter3->type == DocNode::TYPE_INCLUDE);
assert(list_iter3->child_nodes.size() == 0);
assert(list_iter3->attr_list.size() == 1);
assert(list_iter3->data_len == 0);
check_node_attr(list_iter3->attr_list.front(), "src", "except");
-
+
++list_iter;
assert(list_iter->type == DocNode::TYPE_PRE);
assert(list_iter->child_nodes.size() == 0);
@@ -1442,7 +1442,7 @@ int main()
assert(parser.completeParse(node_list) == false);
assert(node_list.size() == 0);
}
-
+
{
cout << endl << "===================== Test 57) choose/try combo" << endl;
EsiParser parser("parser_test", &Debug, &Error);
@@ -1585,7 +1585,7 @@ int main()
assert(attr_iter->value_len == 6);
assert(strncmp(attr_iter->value, "c >= d", attr_iter->value_len) == 0);
}
-
+
cout << endl << "All tests passed!" << endl;
return 0;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/test/processor_test.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/test/processor_test.cc b/plugins/experimental/esi/test/processor_test.cc
index cb9cf12..be6b15b 100644
--- a/plugins/experimental/esi/test/processor_test.cc
+++ b/plugins/experimental/esi/test/processor_test.cc
@@ -41,7 +41,7 @@ pthread_key_t threadKey;
static const int FETCHER_STATIC_DATA_SIZE = 30;
-int main()
+int main()
{
Variables esi_vars("vars", &Debug, &Error);
HandlerManager handler_mgr("handler_mgr", &Debug, &Error);
@@ -107,7 +107,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("foo<esi:blah/>bar");
-
+
const char *output_data;
int output_data_len = 10;
@@ -122,7 +122,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("foo<esi:comment text=\"bleh\"/>bar");
-
+
const char *output_data;
int output_data_len=0;
@@ -139,7 +139,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("<esi:comment text=\"bleh\"/>bar");
-
+
const char *output_data;
int output_data_len=0;
@@ -156,7 +156,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("foo<esi:comment text=\"bleh\"/>");
-
+
const char *output_data;
int output_data_len=0;
@@ -173,7 +173,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("foo\n<esi:comment text=\"\nbleh\"/>\nbar");
-
+
const char *output_data;
int output_data_len=0;
@@ -190,7 +190,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("foo\n<esi:remove><img src=\"http://www.example.com\"></esi:remove>\nbar");
-
+
const char *output_data;
int output_data_len=0;
@@ -208,7 +208,7 @@ int main()
handler_mgr);
string input_data("foo\n<esi:remove><img src=\"http://www.example.com\"></esi:remove>\nbar"
"foo2\n<esi:comment text=\"bleh\"/>\nbar2");
-
+
const char *output_data;
int output_data_len=0;
@@ -237,7 +237,7 @@ int main()
assert(esi_proc.completeParse() == true);
assert(esi_proc.process(output_data, output_data_len) == EsiProcessor::SUCCESS);
assert(output_data_len == 54);
- assert(strncmp(output_data, "foo1bar1\nfoo1bar1\nfoo2bar2\nfoo2bar2\nfoo3bar3\nfoo3bar3\n",
+ assert(strncmp(output_data, "foo1bar1\nfoo1bar1\nfoo2bar2\nfoo2bar2\nfoo3bar3\nfoo3bar3\n",
output_data_len) == 0);
}
@@ -247,7 +247,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("foo <esi:include src=url1/> bar");
-
+
const char *output_data;
int output_data_len=0;
@@ -257,7 +257,7 @@ int main()
assert(output_data_len == 8 + 4 + FETCHER_STATIC_DATA_SIZE);
assert(strncmp(output_data, "foo >>>>> Content for URL [url1] <<<<< bar", output_data_len) == 0);
}
-
+
{
cout << endl << "===================== Test 11) include tag with no URL" << endl;
TestHttpDataFetcher data_fetcher;
@@ -284,7 +284,7 @@ int main()
string input_data("foo1 <esi:include src=url1/> bar1\n"
"foo2 <esi:include src=url2/> bar2\n"
"<esi:include src=\"blah bleh\"/>");
-
+
const char *output_data;
int output_data_len=0;
@@ -293,12 +293,12 @@ int main()
assert(esi_proc.process(output_data, output_data_len) == EsiProcessor::SUCCESS);
assert(output_data_len == 11 + 4 + FETCHER_STATIC_DATA_SIZE + 11 + 4 + FETCHER_STATIC_DATA_SIZE +
9 + FETCHER_STATIC_DATA_SIZE);
- assert(strncmp(output_data,
+ assert(strncmp(output_data,
"foo1 >>>>> Content for URL [url1] <<<<< bar1\n"
"foo2 >>>>> Content for URL [url2] <<<<< bar2\n"
">>>>> Content for URL [blah bleh] <<<<<", output_data_len) == 0);
}
-
+
{
cout << endl << "===================== Test 14) remove, comment and include tags" << endl;
TestHttpDataFetcher data_fetcher;
@@ -309,7 +309,7 @@ int main()
"<esi:include src=\"blah bleh\"/>"
"<esi:comment text=\"bleh\"/>"
"<esi:remove> <a href=> </esi:remove>");
-
+
const char *output_data;
int output_data_len=0;
@@ -318,7 +318,7 @@ int main()
assert(esi_proc.process(output_data, output_data_len) == EsiProcessor::SUCCESS);
assert(output_data_len == 11 + 4 + FETCHER_STATIC_DATA_SIZE + 11 + 4 + FETCHER_STATIC_DATA_SIZE +
9 + FETCHER_STATIC_DATA_SIZE);
- assert(strncmp(output_data,
+ assert(strncmp(output_data,
"foo1 >>>>> Content for URL [url1] <<<<< bar1\n"
"foo2 >>>>> Content for URL [url2] <<<<< bar2\n"
">>>>> Content for URL [blah bleh] <<<<<", output_data_len) == 0);
@@ -335,7 +335,7 @@ int main()
char line4[] = "<esi:comment text=\"bleh\"/>";
char line5[] = "<esi:remove> <a href=>";
char line6[] = "</esi:remove>";
-
+
const char *output_data;
int output_data_len=0;
@@ -349,12 +349,12 @@ int main()
assert(esi_proc.process(output_data, output_data_len) == EsiProcessor::SUCCESS);
assert(output_data_len == 11 + 4 + FETCHER_STATIC_DATA_SIZE + 11 + 4 + FETCHER_STATIC_DATA_SIZE +
9 + FETCHER_STATIC_DATA_SIZE);
- assert(strncmp(output_data,
+ assert(strncmp(output_data,
"foo1 >>>>> Content for URL [url1] <<<<< bar1\n"
"foo2 >>>>> Content for URL [url2] <<<<< bar2\n"
">>>>> Content for URL [blah bleh] <<<<<", output_data_len) == 0);
}
-
+
{
cout << endl << "===================== Test 16) one-shot parse" << endl;
TestHttpDataFetcher data_fetcher;
@@ -365,7 +365,7 @@ int main()
"<esi:include src=\"blah bleh\"/>"
"<esi:comment text=\"bleh\"/>"
"<esi:remove> <a href=> </esi:remove>");
-
+
const char *output_data;
int output_data_len=0;
@@ -373,7 +373,7 @@ int main()
assert(esi_proc.process(output_data, output_data_len) == EsiProcessor::SUCCESS);
assert(output_data_len == 11 + 4 + FETCHER_STATIC_DATA_SIZE + 11 + 4 + FETCHER_STATIC_DATA_SIZE +
9 + FETCHER_STATIC_DATA_SIZE);
- assert(strncmp(output_data,
+ assert(strncmp(output_data,
"foo1 >>>>> Content for URL [url1] <<<<< bar1\n"
"foo2 >>>>> Content for URL [url2] <<<<< bar2\n"
">>>>> Content for URL [blah bleh] <<<<<", output_data_len) == 0);
@@ -390,7 +390,7 @@ int main()
char line4[] = "<esi:comment text=\"bleh\"/>";
char line5[] = "<esi:remove> <a href=>";
char line6[] = "</esi:remove>";
-
+
const char *output_data;
int output_data_len=0;
@@ -403,7 +403,7 @@ int main()
assert(esi_proc.process(output_data, output_data_len) == EsiProcessor::SUCCESS);
assert(output_data_len == 11 + 4 + FETCHER_STATIC_DATA_SIZE + 11 + 4 + FETCHER_STATIC_DATA_SIZE +
9 + FETCHER_STATIC_DATA_SIZE);
- assert(strncmp(output_data,
+ assert(strncmp(output_data,
"foo1 >>>>> Content for URL [url1] <<<<< bar1\n"
"foo2 >>>>> Content for URL [url2] <<<<< bar2\n"
">>>>> Content for URL [blah bleh] <<<<<", output_data_len) == 0);
@@ -415,7 +415,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("foo <esi:include src=url1/> bar");
-
+
const char *output_data;
int output_data_len=0;
@@ -432,7 +432,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("foo <esi:include src=url1/> bar");
-
+
const char *output_data;
int output_data_len=0;
@@ -453,7 +453,7 @@ int main()
"<esi:include src=\"blah bleh\"/>"
"<esi:comment text=bleh />"
"<esi:remove> <a href=> </esi:remove>");
-
+
const char *output_data;
int output_data_len=0;
@@ -461,7 +461,7 @@ int main()
assert(esi_proc.process(output_data, output_data_len) == EsiProcessor::SUCCESS);
assert(output_data_len == 11 + 4 + FETCHER_STATIC_DATA_SIZE + 11 + 4 + FETCHER_STATIC_DATA_SIZE +
9 + FETCHER_STATIC_DATA_SIZE);
- assert(strncmp(output_data,
+ assert(strncmp(output_data,
"foo1 >>>>> Content for URL [url1] <<<<< bar1\n"
"foo2 >>>>> Content for URL [url2] <<<<< bar2\n"
">>>>> Content for URL [blah bleh] <<<<<", output_data_len) == 0);
@@ -473,7 +473,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("foo <esi:include src=$(HTTP_HOST) /> bar");
-
+
const char *output_data;
int output_data_len=0;
@@ -489,7 +489,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("foo <esi:vars>HTTP_HOST</esi:vars> bar");
-
+
const char *output_data;
int output_data_len=0;
@@ -506,7 +506,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("foo <esi:vars>$(HTTP_HOST)</esi:vars> bar");
-
+
const char *output_data;
int output_data_len=0;
@@ -523,7 +523,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("foo <esi:vars>$(HTTP_HOST</esi:vars> bar");
-
+
const char *output_data;
int output_data_len=0;
@@ -533,7 +533,7 @@ int main()
assert(output_data_len == 8);
assert(strncmp(output_data, "foo bar", output_data_len) == 0);
}
-
+
{
cout << endl << "===================== Test 25) choose-when" << endl;
TestHttpDataFetcher data_fetcher;
@@ -552,7 +552,7 @@ int main()
"</esi:choose>");
const char *output_data;
int output_data_len=0;
-
+
assert(esi_proc.completeParse(input_data) == true);
assert(esi_proc.process(output_data, output_data_len) == EsiProcessor::SUCCESS);
assert(output_data_len == FETCHER_STATIC_DATA_SIZE + 3);
@@ -571,7 +571,7 @@ int main()
"</esi:choose>");
const char *output_data;
int output_data_len=0;
-
+
assert(esi_proc.completeParse(input_data) == true);
assert(esi_proc.process(output_data, output_data_len) == EsiProcessor::SUCCESS);
assert(output_data_len == FETCHER_STATIC_DATA_SIZE + 9);
@@ -754,7 +754,7 @@ int main()
"</esi:choose>");
const char *output_data;
int output_data_len=0;
-
+
assert(esi_proc.completeParse(input_data) == true);
assert(esi_proc.process(output_data, output_data_len) == EsiProcessor::SUCCESS);
assert(output_data_len == 1 + FETCHER_STATIC_DATA_SIZE + 3);
@@ -940,7 +940,7 @@ int main()
// this is to make the StubHandler return failure
data_fetcher.setReturnData(false);
-
+
// this is to decrement HttpDataFetcher's pending request count - argument content doesn't matter
data_fetcher.getContent("blah", output_data, output_data_len);
@@ -956,7 +956,7 @@ int main()
EsiProcessor esi_proc("processor", "parser", "expression", &Debug, &Error, data_fetcher, esi_vars,
handler_mgr);
string input_data("<esi:comment text=\"bleh\"/>");
-
+
const char *output_data;
int output_data_len=0;
@@ -998,7 +998,7 @@ int main()
esi_proc.stop();
node_list.clear();
- input_data =
+ input_data =
"<esi:choose>\n\t"
"<esi:when test=foo>"
"\t<esi:include src=foo />"
@@ -1039,7 +1039,7 @@ int main()
string packedNodeList = node_list.pack();
-
+
const char *output_data;
int output_data_len=0;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/test/sampleProb.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/test/sampleProb.cc b/plugins/experimental/esi/test/sampleProb.cc
index a303e0d..41198ff 100644
--- a/plugins/experimental/esi/test/sampleProb.cc
+++ b/plugins/experimental/esi/test/sampleProb.cc
@@ -51,17 +51,17 @@ public:
_windowPassed=0;
};
- ~FailureInfo()
+ ~FailureInfo()
{
}
-
+
//Whenever the window time expires u start filling the count
//by taking a mod
//so what u get is over a window of 200 ms and 10 rounds
//the no of failures
//Introduce a variable which will be a function of
- //failure and which will lead to points in graph
- //according to which the probability of serving the
+ //failure and which will lead to points in graph
+ //according to which the probability of serving the
// data from cache or contacting the origin server
// will be decided
std::vector <std::pair < double,double > > _passFail;
@@ -69,7 +69,7 @@ public:
int _marker;
int _totalSlot;
-
+
struct timeval _start;
double _avgOverWindow;
@@ -89,12 +89,12 @@ void registerSuccFail(string URL,FailureData& data,bool isSuccess)
it=data.find(URL);
vector < pair < double , double > > & passFail=it->second->_passFail;
marker=it->second->_marker;
-
-
- startTime=it->second->_start;
-
+
+
+ startTime=it->second->_start;
+
gettimeofday(&currTime,NULL);
-
+
timersub(&currTime,&startTime,&result);
@@ -118,20 +118,20 @@ void registerSuccFail(string URL,FailureData& data,bool isSuccess)
it->second->_marker=marker;
gettimeofday(&it->second->_start,NULL);
}
-
+
if(isSuccess)
{
passFail[marker].second++;
}
-
+
else
{
passFail[marker].first++;
}
}
-
+
bool isAttemptReq(string URL,FailureData& data)
{
FailureData::iterator it;
@@ -150,19 +150,19 @@ bool isAttemptReq(string URL,FailureData& data)
//cout<<"Prob of faillure:"<<passFail[i].first/(passFail[i].first+passFail[i].second)<<endl;
}
}
-
+
if(avg)
- {
+ {
avg=avg/it->second->_totalSlot;
double prob;
-
+
if(avg*1000<lowerCutOff)
{
prob=avg;
}
-
-
+
+
else
{
double mapFactor=( ( (avg*1000-lowerCutOff)*(avg*1000-lowerCutOff) ) / ( higherCutOff-lowerCutOff ) )+lowerCutOff;
@@ -175,13 +175,13 @@ bool isAttemptReq(string URL,FailureData& data)
prob=it->second->_avgOverWindow;
cout<<"Average"<<prob<<endl;
}
-
+
int decision=rand()%100;
-
+
if(decision<prob*100)
return false;
-
+
return true;
}
return true;
@@ -203,7 +203,7 @@ int main(int argc,char**argv)
FailureData data;
int noOfAttempt=0,noOfExcept=0;
- int count=atoi(argv[1]);
+ int count=atoi(argv[1]);
while(count--)
{
int decision=rand()%100;
@@ -213,16 +213,16 @@ int main(int argc,char**argv)
noOfAttempt++;
if(decision>=atoi(argv[2]) && 0)
registerSuccFail(fetchURL,data,true);
-
+
else
registerSuccFail(fetchURL,data,false);
}
else
noOfExcept++;
-
+
}
cout<<" SERVED FROM ATTEMPT "<<noOfAttempt<<" TOTAL "<<atoi(argv[1])<<endl;
cout<<" SERVED FROM EXCEPT "<<noOfExcept<<" TOTAL "<<atoi(argv[1])<<endl;
-
+
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/test/utils_test.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/test/utils_test.cc b/plugins/experimental/esi/test/utils_test.cc
index 469d5a8..a083785 100644
--- a/plugins/experimental/esi/test/utils_test.cc
+++ b/plugins/experimental/esi/test/utils_test.cc
@@ -48,7 +48,7 @@ void checkAttributes(const char *check_id, const AttributeList &attr_list, const
pthread_key_t threadKey;
-int main()
+int main()
{
pthread_key_create(&threadKey, NULL);
Utils::init(&Debug, &Error);
@@ -89,7 +89,7 @@ int main()
Utils::parseAttributes(str7, attr_list, "&");
const char *expected_strs7[] = { "key1", "val1", 0 };
checkAttributes("test7", attr_list, expected_strs7);
-
+
const char *escaped_sequence = "{\\\"site-attribute\\\":\\\"content=no_expandable; ajax_cert_expandable\\\"}";
string str8("pos=\"FPM1\" spaceid=96584352 extra_mime=\"");
str8.append(escaped_sequence);
@@ -116,4 +116,4 @@ int main()
cout << endl << "All tests passed!" << endl;
return 0;
}
-
+
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/esi/test/vars_test.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/test/vars_test.cc b/plugins/experimental/esi/test/vars_test.cc
index c420bc3..2739338 100644
--- a/plugins/experimental/esi/test/vars_test.cc
+++ b/plugins/experimental/esi/test/vars_test.cc
@@ -66,7 +66,7 @@ fakeDebug(const char *tag, const char *fmt, ...) {
gFakeDebugLog.append(buf);
}
-int main()
+int main()
{
pthread_key_create(&threadKey, NULL);
Utils::init(&Debug, &Error);
@@ -121,7 +121,7 @@ int main()
esi_vars.populate(HttpHeader("hosT", -1, "localhost", -1));
assert(esi_vars.getValue("HTTP_HOST") == "localhost");
- esi_vars.populate(HttpHeader("User-agent", -1,
+ esi_vars.populate(HttpHeader("User-agent", -1,
"Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.6) "
"Gecko/20091201 Firefox/3.5.6 (.NETgecko CLR 3.5.30729)", -1));
@@ -365,7 +365,7 @@ int main()
{
cout << endl << "===================== Test 4" << endl;
Variables esi_vars("vars_test", &Debug, &Error);
- string cookie_str("FPS=dl; mb=d=OPsv7rvU4FFaAOoIRi75BBuqdMdbMLFuDwQmk6nKrCgno7L4xuN44zm7QBQJRmQSh8ken6GSVk8-&v=1; C=mg=1; Y=v=1&n=fmaptagvuff50&l=fc0d94i7/o&p=m2f0000313000400&r=8j&lg=en-US&intl=us; F=a=4KvLV9IMvTJnIAqCk25y9Use6hnPALtUf3n78PihlcIqvmzoW.Ax8UyW8_oxtgFNrrdmooqZmPa7WsX4gE.6sI69wuNwRKrRPFT29h9lhwuxxLz0RuQedVXhJhc323Q-&b=8gQZ"); // TODO - might need to
+ string cookie_str("FPS=dl; mb=d=OPsv7rvU4FFaAOoIRi75BBuqdMdbMLFuDwQmk6nKrCgno7L4xuN44zm7QBQJRmQSh8ken6GSVk8-&v=1; C=mg=1; Y=v=1&n=fmaptagvuff50&l=fc0d94i7/o&p=m2f0000313000400&r=8j&lg=en-US&intl=us; F=a=4KvLV9IMvTJnIAqCk25y9Use6hnPALtUf3n78PihlcIqvmzoW.Ax8UyW8_oxtgFNrrdmooqZmPa7WsX4gE.6sI69wuNwRKrRPFT29h9lhwuxxLz0RuQedVXhJhc323Q-&b=8gQZ"); // TODO - might need to
esi_vars.populate(HttpHeader("Cookie", -1, cookie_str.data(), cookie_str.size()));
assert(esi_vars.getValue("HTTP_COOKIE{FPS}") == "dl");
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/geoip_acl/acl.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/geoip_acl/acl.cc b/plugins/experimental/geoip_acl/acl.cc
index 90bbe79..dde623a 100644
--- a/plugins/experimental/geoip_acl/acl.cc
+++ b/plugins/experimental/geoip_acl/acl.cc
@@ -95,7 +95,7 @@ RegexAcl::compile(const std::string& str, const char* filename, int lineno)
{
const char* error;
int erroffset;
-
+
_regex_s = str;
_rex = pcre_compile(_regex_s.c_str(), 0, &error, &erroffset, NULL);
@@ -224,7 +224,7 @@ CountryAcl::eval(TSRemapRequestInfo *rri, TSHttpTxn txnp) const
if ((iso <= 0) || (!_iso_country_codes[iso]))
return !_allow;
-
+
return _allow;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/geoip_acl/geoip_acl.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/geoip_acl/geoip_acl.cc b/plugins/experimental/geoip_acl/geoip_acl.cc
index 87e4d03..1382abd 100644
--- a/plugins/experimental/geoip_acl/geoip_acl.cc
+++ b/plugins/experimental/geoip_acl/geoip_acl.cc
@@ -18,7 +18,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////
-//
+//
// Main entry points for the plugin hooks etc.
//
#include <ts/ts.h>
@@ -110,7 +110,7 @@ TSRemapDoRemap(void* ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
return TSREMAP_NO_REMAP;
}
-
+
/*
local variables:
mode: C++
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/geoip_acl/lulu.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/geoip_acl/lulu.h b/plugins/experimental/geoip_acl/lulu.h
index 0ede84b..b7394d4 100644
--- a/plugins/experimental/geoip_acl/lulu.h
+++ b/plugins/experimental/geoip_acl/lulu.h
@@ -18,7 +18,7 @@
//////////////////////////////////////////////////////////////////////////////////////////////
-//
+//
// Implement the classes for the various types of hash keys we support.
//
#ifndef __LULU_H__
@@ -35,7 +35,7 @@ static const char* PLUGIN_NAME = "geoip_acl";
#endif // __LULU_H__
-
+
/*
local variables:
mode: C++
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/hipes/hipes.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/hipes/hipes.cc b/plugins/experimental/hipes/hipes.cc
index 03908b7..04cbd95 100644
--- a/plugins/experimental/hipes/hipes.cc
+++ b/plugins/experimental/hipes/hipes.cc
@@ -41,13 +41,13 @@ escapify_url(const char *src, int src_len, char* dst, int dst_len)
{
// This bitmap is generated using the gen_escape.c prog.
static unsigned char codes_to_escape[32] = {
- 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xF9, 0x00, 0x3F,
- 0x80, 0x00, 0x00, 0x1E,
- 0x80, 0x00, 0x00, 0x1F,
- 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xF9, 0x00, 0x3F,
+ 0x80, 0x00, 0x00, 0x1E,
+ 0x80, 0x00, 0x00, 0x1F,
+ 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF,
+ 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF
};
@@ -306,11 +306,11 @@ TSRemapDoRemap(void* ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
len = 8 + h_conf->hipes_server.size() + strlen(port) + (param_len - (slash - param) - 1);
} else {
len = 8 + h_conf->hipes_server.size() + (param_len - (slash - param) - 1);
- }
+ }
if (len > MAX_PATH_SIZE) {
TSHttpTxnSetHttpRetStatus(rh, TS_HTTP_STATUS_REQUEST_URI_TOO_LONG);
return TSREMAP_NO_REMAP;
- }
+ }
if(h_conf->hipes_port != 80) {
snprintf(svc_url, MAX_PATH_SIZE, "http://%s%s/%.*s", h_conf->hipes_server.c_str(), port, len, slash + 1);
} else {
@@ -320,7 +320,7 @@ TSRemapDoRemap(void* ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
len = escapify_url(svc_url, len, svc_url_esc, MAX_PATH_SIZE);
if (len < 0) {
- TSHttpTxnSetHttpRetStatus(rh, TS_HTTP_STATUS_BAD_REQUEST);
+ TSHttpTxnSetHttpRetStatus(rh, TS_HTTP_STATUS_BAD_REQUEST);
return TSREMAP_NO_REMAP;
}
TSDebug(PLUGIN_NAME, "Escaped service URL is %s(%d)", svc_url_esc, len);
@@ -435,7 +435,7 @@ TSRemapDoRemap(void* ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
// If we redirect, just generate a 302 URL, otherwise update the RRI struct properly.
if (do_redirect) {
- int len;
+ int len;
if (h_conf->ssl) {
// https://<host>:<port>/<path>?<query?\0
@@ -493,10 +493,10 @@ TSRemapDoRemap(void* ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
redirect_url_size = pos - redirect_url + 1;
TSDebug(PLUGIN_NAME, "Redirecting to %.*s", redirect_url_size, redirect_url);
- const char *start = redirect_url;
+ const char *start = redirect_url;
const char *end = start + redirect_url_size;
rri->redirect = 1;
- TSUrlParse(rri->requestBufp, rri->requestUrl, &start, end);
+ TSUrlParse(rri->requestBufp, rri->requestUrl, &start, end);
TSHttpTxnSetHttpRetStatus(rh, TS_HTTP_STATUS_MOVED_TEMPORARILY);
}
} else { // Not a redirect, so proceed normally
@@ -519,7 +519,7 @@ TSRemapDoRemap(void* ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
}
// Set server ...
- TSUrlHostSet(rri->requestBufp, rri->requestUrl, h_conf->svc_server.c_str(), h_conf->svc_server.size());
+ TSUrlHostSet(rri->requestBufp, rri->requestUrl, h_conf->svc_server.c_str(), h_conf->svc_server.size());
TSDebug(PLUGIN_NAME, "New server is %.*s", (int) h_conf->svc_server.size(), h_conf->svc_server.c_str());
// ... and port
@@ -546,7 +546,7 @@ TSRemapDoRemap(void* ih, TSHttpTxn rh, TSRemapRequestInfo *rri)
}
-
+
/*
local variables:
mode: C++
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/mysql_remap/lib/dictionary.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/mysql_remap/lib/dictionary.c b/plugins/experimental/mysql_remap/lib/dictionary.c
index 11a56a2..c76cf70 100644
--- a/plugins/experimental/mysql_remap/lib/dictionary.c
+++ b/plugins/experimental/mysql_remap/lib/dictionary.c
@@ -67,7 +67,7 @@
static void * mem_double(void * ptr, int size)
{
void * newptr ;
-
+
newptr = calloc(2*size, 1);
if (newptr==NULL) {
return NULL ;
@@ -253,7 +253,7 @@ int dictionary_set(dictionary * d, char * key, char * val)
unsigned hash ;
if (d==NULL || key==NULL) return -1 ;
-
+
/* Compute hash for this key */
hash = dictionary_hash(key) ;
/* Find if value is already in dictionary */
@@ -397,7 +397,7 @@ int main(int argc, char *argv[])
/* Allocate dictionary */
printf("allocating...\n");
d = dictionary_new(0);
-
+
/* Set values in dictionary */
printf("setting %d values...\n", NVALS);
for (i=0 ; i<NVALS ; i++) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/mysql_remap/lib/iniparser.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/mysql_remap/lib/iniparser.c b/plugins/experimental/mysql_remap/lib/iniparser.c
index 14b8e3c..234435e 100644
--- a/plugins/experimental/mysql_remap/lib/iniparser.c
+++ b/plugins/experimental/mysql_remap/lib/iniparser.c
@@ -105,9 +105,9 @@ static char * strstrip(char * s)
{
static char l[ASCIILINESZ+1];
char * last ;
-
+
if (s==NULL) return NULL ;
-
+
while (isspace((int)*s) && *s) s++;
memset(l, 0, ASCIILINESZ+1);
strcpy(l, s);
@@ -480,7 +480,7 @@ static line_status iniparser_line(
char * section,
char * key,
char * value)
-{
+{
line_status sta ;
char line[ASCIILINESZ+1];
int len ;
@@ -494,7 +494,7 @@ static line_status iniparser_line(
sta = LINE_EMPTY ;
} else if (line[0]=='#') {
/* Comment line */
- sta = LINE_COMMENT ;
+ sta = LINE_COMMENT ;
} else if (line[0]=='[' && line[len-1]==']') {
/* Section name */
sscanf(line, "[%[^]]", section);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/s3_auth/s3_auth.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/s3_auth/s3_auth.cc b/plugins/experimental/s3_auth/s3_auth.cc
index 38bb397..744a287 100644
--- a/plugins/experimental/s3_auth/s3_auth.cc
+++ b/plugins/experimental/s3_auth/s3_auth.cc
@@ -258,7 +258,7 @@ S3Request::set_header(const char* header, int header_len, const char* val, int v
// Date + "\n" +
// CanonicalizedAmzHeaders +
// CanonicalizedResource;
-//
+//
// ToDo:
// -----
// 1) UTF8
@@ -511,7 +511,7 @@ TSRemapDoRemap(void* ih, TSHttpTxn txnp, TSRemapRequestInfo */* rri */)
}
-
+
/*
local variables:
mode: C++
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ssl_cert_loader/ats-util.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ssl_cert_loader/ats-util.h b/plugins/experimental/ssl_cert_loader/ats-util.h
index 0ee4a8d..892ed8f 100644
--- a/plugins/experimental/ssl_cert_loader/ats-util.h
+++ b/plugins/experimental/ssl_cert_loader/ats-util.h
@@ -51,7 +51,7 @@
foo *bar[ZOMG]; // array of pointers.
ink_zero(bar); // zero all pointers in the array.
@endcode
-
+
*/
template <typename T> inline void
ink_zero(
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ssl_cert_loader/domain-tree.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ssl_cert_loader/domain-tree.cc b/plugins/experimental/ssl_cert_loader/domain-tree.cc
index c1f51c9..31e8fd7 100644
--- a/plugins/experimental/ssl_cert_loader/domain-tree.cc
+++ b/plugins/experimental/ssl_cert_loader/domain-tree.cc
@@ -1,4 +1,4 @@
-/** @file
+/** @file
SSL dynamic certificate loader
Loads certificates into a hash table as they are requested
@@ -27,7 +27,7 @@
// return true if comparable. Return type of compare in relative parameter
// 0 if eq. < 0 if node key is broader. > 0 if parameter key is broader
-bool
+bool
DomainNameTree::DomainNameNode::compare(std::string key, int &relative)
{
size_t star_loc = key.find("*");
@@ -42,14 +42,14 @@ DomainNameTree::DomainNameNode::compare(std::string key, int &relative)
return this->prunedCompare(key, relative, is_wild);
}
-bool
+bool
DomainNameTree::DomainNameNode::prunedCompare(std::string key, int &relative, bool is_wild)
{
if (key == this->key) {
relative = 0;
return true;
} else {
- if (this->is_wild) {
+ if (this->is_wild) {
size_t loc = key.find(this->key);
if (this->key == "") { // Match all
@@ -75,7 +75,7 @@ DomainNameTree::DomainNameNode::prunedCompare(std::string key, int &relative, bo
if ((this->key.length() - key.length()) == loc) {
relative = 1;
return true;
- }
+ }
}
}
}
@@ -95,7 +95,7 @@ DomainNameTree::DomainNameNode *DomainNameTree::find(std::string key, bool best_
key = key.substr(star_loc+1);
is_wild = true;
}
-
+
bool set_iter = false;
std::deque<DomainNameNode *>::iterator sibPtr;
DomainNameNode *current_node = root;
@@ -169,7 +169,7 @@ DomainNameTree::insert(std::string key, void *payload, int order)
new_node->parent = node->parent;
new_node->children.push_back(node);
- // Replace the node with new_node in the child list of the parent;
+ // Replace the node with new_node in the child list of the parent;
for (std::deque<DomainNameNode *>::iterator iter = node->parent->children.begin();
iter != node->parent->children.end(); ++iter) {
if (*(iter) == node) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ssl_cert_loader/domain-tree.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ssl_cert_loader/domain-tree.h b/plugins/experimental/ssl_cert_loader/domain-tree.h
index 0efcb24..392fb6d 100644
--- a/plugins/experimental/ssl_cert_loader/domain-tree.h
+++ b/plugins/experimental/ssl_cert_loader/domain-tree.h
@@ -27,15 +27,15 @@
class DomainNameTree {
public:
-
+
class DomainNameNode {
public:
DomainNameNode()
- : order(-1), payload(NULL), parent(NULL), is_wild(false)
+ : order(-1), payload(NULL), parent(NULL), is_wild(false)
{ }
DomainNameNode(std::string key, void *payload, int order, bool is_wild)
- : key(key), order(order), payload(payload), parent(NULL), is_wild(is_wild)
+ : key(key), order(order), payload(payload), parent(NULL), is_wild(is_wild)
{ }
DomainNameNode *match(std::string value);
@@ -68,7 +68,7 @@ public:
root->key = "";
root->order = 0x7FFFFFFF;
root->is_wild = true;
- tree_mutex = TSMutexCreate();
+ tree_mutex = TSMutexCreate();
}
~DomainNameTree()
@@ -82,7 +82,7 @@ public:
DomainNameNode *retval = this->find(key, true);
TSMutexUnlock(this->tree_mutex);
return retval;
- }
+ }
DomainNameNode *findFirstMatch(std::string key)
{
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
index 7bf72cc..c7a5843 100644
--- a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
+++ b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc
@@ -55,8 +55,8 @@ public:
class SslEntry {
public:
SslEntry()
- : ctx(NULL), op(TS_SSL_HOOK_OP_DEFAULT)
- {
+ : ctx(NULL), op(TS_SSL_HOOK_OP_DEFAULT)
+ {
this->mutex = TSMutexCreate();
}
@@ -68,7 +68,7 @@ public:
// If the CTX is not already created, use these
// files to load things up
std::string certFileName;
- std::string keyFileName;
+ std::string keyFileName;
TSMutex mutex;
std::deque<TSVConn> waitingVConns;
};
@@ -95,7 +95,7 @@ Parse_Addr_String(ts::ConstBuffer const &text, IpRange &range)
} else { // Assume it is a single address
newAddr.load(text);
range.first = newAddr;
- range.second = newAddr;
+ range.second = newAddr;
}
}
@@ -181,7 +181,7 @@ Load_Certificate(SslEntry const *entry, std::deque<std::string> &names)
// Fetch out the names associated with the certificate
if (cert != NULL) {
X509_NAME *name = X509_get_subject_name(cert);
- char subjectCn[256];
+ char subjectCn[256];
if (X509_NAME_get_text_by_NID(name, NID_commonName, subjectCn, sizeof(subjectCn)) >= 0) {
std::string tmp_name(subjectCn);
@@ -193,14 +193,14 @@ Load_Certificate(SslEntry const *entry, std::deque<std::string> &names)
unsigned count = sk_GENERAL_NAME_num(alt_names);
for (unsigned i = 0; i < count; i++) {
GENERAL_NAME *alt_name = sk_GENERAL_NAME_value(alt_names, i);
-
+
if (alt_name->type == GEN_DNS) {
// Current name is a DNS name, let's check it
char *name_ptr = (char *) ASN1_STRING_data(alt_name->d.dNSName);
std::string tmp_name(name_ptr);
names.push_back(tmp_name);
}
- }
+ }
sk_GENERAL_NAME_pop_free(alt_names, GENERAL_NAME_free);
}
}
@@ -217,23 +217,23 @@ Load_Certificate(SslEntry const *entry, std::deque<std::string> &names)
SslEntry *
Load_Certificate_Entry(ParsedSslValues const &values, std::deque<std::string> &names)
{
- SslEntry *retval = NULL;
+ SslEntry *retval = NULL;
std::string cert_file_path;
std::string priv_file_path;
retval = new SslEntry();
- if (values.server_cert_name.length() > 0) {
+ if (values.server_cert_name.length() > 0) {
if (values.server_cert_name[0] != '/') {
- cert_file_path = std::string(TSConfigDirGet()) + '/' + values.server_cert_name;
- } else {
+ cert_file_path = std::string(TSConfigDirGet()) + '/' + values.server_cert_name;
+ } else {
cert_file_path = values.server_cert_name;
}
retval->certFileName = cert_file_path;
}
if (values.server_priv_key_file.length() > 0) {
if (values.server_priv_key_file[0] != '/') {
- priv_file_path = std::string(TSConfigDirGet()) + '/' + values.server_priv_key_file;
- } else {
+ priv_file_path = std::string(TSConfigDirGet()) + '/' + values.server_priv_key_file;
+ } else {
priv_file_path = values.server_priv_key_file;
}
retval->keyFileName = priv_file_path;
@@ -241,7 +241,7 @@ Load_Certificate_Entry(ParsedSslValues const &values, std::deque<std::string> &n
// Must go ahead and load the cert to get the names
if (values.server_name.length() == 0 &&
values.server_ips.size() == 0) {
- retval->ctx = Load_Certificate(retval, names);
+ retval->ctx = Load_Certificate(retval, names);
}
if (values.action.length() > 0) {
if (values.action == "tunnel") {
@@ -287,21 +287,21 @@ Parse_Config(Value &parent, ParsedSslValues &orig_values)
val = parent.find("child-match");
if (val) {
- Parse_Config_Rules(val, cur_values);
+ Parse_Config_Rules(val, cur_values);
} else { // We are terminal, enter a match case
- TSDebug(PN, "Terminal SSL Config: server_priv_key_file=%s server_name=%s server_cert_name=%s action=%s",
- cur_values.server_priv_key_file.c_str(),
- cur_values.server_name.c_str(),
- cur_values.server_cert_name.c_str(),
- cur_values.action.c_str()
+ TSDebug(PN, "Terminal SSL Config: server_priv_key_file=%s server_name=%s server_cert_name=%s action=%s",
+ cur_values.server_priv_key_file.c_str(),
+ cur_values.server_name.c_str(),
+ cur_values.server_cert_name.c_str(),
+ cur_values.action.c_str()
);
// Load the certificate and create a context if appropriate
std::deque<std::string> cert_names;
SslEntry *entry = Load_Certificate_Entry(cur_values, cert_names);
-
+
// Store in appropriate table
if (cur_values.server_name.length() > 0) {
- Lookup.tree.insert(cur_values.server_name, entry, Parse_order++);
+ Lookup.tree.insert(cur_values.server_name, entry, Parse_order++);
}
if (cur_values.server_ips.size() > 0) {
for (size_t i = 0; i < cur_values.server_ips.size(); i++) {
@@ -347,7 +347,7 @@ Load_Certificate_Thread(void *arg)
entry->waitingVConns.pop_back();
TSSslConnection sslobj = TSVConnSSLConnectionGet(vc);
SSL *ssl = reinterpret_cast<SSL *>(sslobj);
- SSL_set_SSL_CTX(ssl, entry->ctx);
+ SSL_set_SSL_CTX(ssl, entry->ctx);
TSVConnReenable(vc);
}
TSMutexUnlock(entry->mutex);
@@ -408,24 +408,24 @@ CB_Pre_Accept(TSCont /*contp*/, TSEvent event, void *edata)
} else {
if (entry->ctx == NULL) {
if (entry->waitingVConns.begin() == entry->waitingVConns.end()) {
- entry->waitingVConns.push_back(ssl_vc);
+ entry->waitingVConns.push_back(ssl_vc);
TSMutexUnlock(entry->mutex);
-
+
TSThreadCreate(Load_Certificate_Thread, entry);
} else { // Just add yourself to the queue
- entry->waitingVConns.push_back(ssl_vc);
+ entry->waitingVConns.push_back(ssl_vc);
TSMutexUnlock(entry->mutex);
}
// Return before we reenable
return TS_SUCCESS;
} else { // if (entry->ctx != NULL) {
- SSL_set_SSL_CTX(ssl, entry->ctx);
+ SSL_set_SSL_CTX(ssl, entry->ctx);
TSDebug(PN, "Replace cert based on IP");
TSMutexUnlock(entry->mutex);
}
}
}
-
+
// All done, reactivate things
TSVConnReenable(ssl_vc);
@@ -459,17 +459,17 @@ CB_servername(TSCont /*contp*/, TSEvent /*event*/, void *edata)
if (entry->ctx == NULL) {
// Spawn off a thread to load a potentially expensive certificate
if (entry->waitingVConns.begin() == entry->waitingVConns.end()) {
- entry->waitingVConns.push_back(ssl_vc);
+ entry->waitingVConns.push_back(ssl_vc);
TSMutexUnlock(entry->mutex);
TSThreadCreate(Load_Certificate_Thread, entry);
} else { // Just add yourself to the queue
- entry->waitingVConns.push_back(ssl_vc);
+ entry->waitingVConns.push_back(ssl_vc);
TSMutexUnlock(entry->mutex);
}
// Won't reenable until the certificate has been loaded
return TS_SUCCESS;
} else { //if (entry->ctx != NULL) {
- SSL_set_SSL_CTX(ssl, entry->ctx);
+ SSL_set_SSL_CTX(ssl, entry->ctx);
TSDebug(PN, "Replace cert based on name %s", servername);
}
TSMutexUnlock(entry->mutex);
@@ -511,7 +511,7 @@ TSPluginInit(int argc, const char *argv[])
ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(optarg);
break;
}
- }
+ }
if (ConfigPath.length() == 0) {
static char const * const DEFAULT_CONFIG_PATH = "ssl_start.cfg";
ConfigPath = std::string(TSConfigDirGet()) + '/' + std::string(DEFAULT_CONFIG_PATH);
@@ -534,7 +534,7 @@ TSPluginInit(int argc, const char *argv[])
TSHttpHookAdd(TS_SSL_SNI_HOOK, cb_sni);
success = true;
}
-
+
if (!success) {
if (cb_pa) TSContDestroy(cb_pa);
if (cb_lc) TSContDestroy(cb_lc);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua.c b/plugins/experimental/ts_lua/ts_lua.c
index 49930b7..93d8abe 100644
--- a/plugins/experimental/ts_lua/ts_lua.c
+++ b/plugins/experimental/ts_lua/ts_lua.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -169,9 +169,9 @@ TSRemapDoRemap(void *ih, TSHttpTxn rh, TSRemapRequestInfo * rri)
if(http_ctx->has_hook) {
TSDebug(TS_LUA_DEBUG_TAG, "[%s] has txn hook -> adding txn close hook handler to release resources", __FUNCTION__);
TSHttpTxnHookAdd(rh, TS_HTTP_TXN_CLOSE_HOOK, contp);
- } else {
+ } else {
TSDebug(TS_LUA_DEBUG_TAG, "[%s] no txn hook -> release resources now", __FUNCTION__);
- ts_lua_destroy_http_ctx(http_ctx);
+ ts_lua_destroy_http_ctx(http_ctx);
TSContDestroy(contp);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_cached_response.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_cached_response.c b/plugins/experimental/ts_lua/ts_lua_cached_response.c
index 3de9925..abc30b7 100644
--- a/plugins/experimental/ts_lua/ts_lua_cached_response.c
+++ b/plugins/experimental/ts_lua/ts_lua_cached_response.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_cached_response.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_cached_response.h b/plugins/experimental/ts_lua/ts_lua_cached_response.h
index 6865ba5..72bdf8a 100644
--- a/plugins/experimental/ts_lua/ts_lua_cached_response.h
+++ b/plugins/experimental/ts_lua/ts_lua_cached_response.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_client_request.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_client_request.c b/plugins/experimental/ts_lua/ts_lua_client_request.c
index b17679c..9d6cd26 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_request.c
+++ b/plugins/experimental/ts_lua/ts_lua_client_request.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -373,7 +373,7 @@ ts_lua_client_request_get_url_host(lua_State * L)
char *key = "Host";
char *l_key = "host";
int key_len = 4;
-
+
TSMLoc field_loc;
@@ -388,7 +388,7 @@ ts_lua_client_request_get_url_host(lua_State * L)
field_loc = TSMimeHdrFieldFind(http_ctx->client_request_bufp, http_ctx->client_request_hdrp, l_key, key_len);
if(field_loc) {
host =
- TSMimeHdrFieldValueStringGet(http_ctx->client_request_bufp, http_ctx->client_request_hdrp, field_loc,
+ TSMimeHdrFieldValueStringGet(http_ctx->client_request_bufp, http_ctx->client_request_hdrp, field_loc,
-1, &len);
TSHandleMLocRelease(http_ctx->client_request_bufp, http_ctx->client_request_hdrp, field_loc);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_client_request.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_client_request.h b/plugins/experimental/ts_lua/ts_lua_client_request.h
index d279b19..936e1e4 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_request.h
+++ b/plugins/experimental/ts_lua/ts_lua_client_request.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_client_response.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_client_response.c b/plugins/experimental/ts_lua/ts_lua_client_response.c
index 7e22eef..ac98869 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_response.c
+++ b/plugins/experimental/ts_lua/ts_lua_client_response.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_client_response.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_client_response.h b/plugins/experimental/ts_lua/ts_lua_client_response.h
index eb20467..f9b530f 100644
--- a/plugins/experimental/ts_lua/ts_lua_client_response.h
+++ b/plugins/experimental/ts_lua/ts_lua_client_response.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_common.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_common.h b/plugins/experimental/ts_lua/ts_lua_common.h
index 6c245f3..1ba925d 100644
--- a/plugins/experimental/ts_lua/ts_lua_common.h
+++ b/plugins/experimental/ts_lua/ts_lua_common.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_context.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_context.c b/plugins/experimental/ts_lua/ts_lua_context.c
index 5d967a9..dd6952d 100644
--- a/plugins/experimental/ts_lua/ts_lua_context.c
+++ b/plugins/experimental/ts_lua/ts_lua_context.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_context.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_context.h b/plugins/experimental/ts_lua/ts_lua_context.h
index e77abfd..228bc7c 100644
--- a/plugins/experimental/ts_lua/ts_lua_context.h
+++ b/plugins/experimental/ts_lua/ts_lua_context.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_crypto.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_crypto.c b/plugins/experimental/ts_lua/ts_lua_crypto.c
index 77718d4..addd128 100644
--- a/plugins/experimental/ts_lua/ts_lua_crypto.c
+++ b/plugins/experimental/ts_lua/ts_lua_crypto.c
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ts_lua/ts_lua_crypto.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ts_lua/ts_lua_crypto.h b/plugins/experimental/ts_lua/ts_lua_crypto.h
index 6f0da12..bbe8d66 100644
--- a/plugins/experimental/ts_lua/ts_lua_crypto.h
+++ b/plugins/experimental/ts_lua/ts_lua_crypto.h
@@ -8,7 +8,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
[4/5] trafficserver git commit: Remove trailing whitespace
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/Map.h
----------------------------------------------------------------------
diff --git a/lib/ts/Map.h b/lib/ts/Map.h
index 11d27a0..6814f61 100644
--- a/lib/ts/Map.h
+++ b/lib/ts/Map.h
@@ -125,10 +125,10 @@ template <class K, class AHashFns, class C, class A = DefaultAlloc> class HashSe
class StringHashFns {
public:
- static uintptr_t hash(cchar *s) {
- uintptr_t h = 0;
+ static uintptr_t hash(cchar *s) {
+ uintptr_t h = 0;
// 31 changed to 27, to avoid prime2 in vec.cpp
- while (*s) h = h * 27 + (unsigned char)*s++;
+ while (*s) h = h * 27 + (unsigned char)*s++;
return h;
}
static int equal(cchar *a, cchar *b) { return !strcmp(a, b); }
@@ -136,8 +136,8 @@ class StringHashFns {
class CaseStringHashFns {
public:
- static uintptr_t hash(cchar *s) {
- uintptr_t h = 0;
+ static uintptr_t hash(cchar *s) {
+ uintptr_t h = 0;
// 31 changed to 27, to avoid prime2 in vec.cpp
while (*s) h = h * 27 + (unsigned char)toupper(*s++);
return h;
@@ -164,7 +164,7 @@ template <class C, class AHashFns, class A = DefaultAlloc> class ChainHash : pub
void get_elements(Vec<C> &elements);
};
-template <class K, class AHashFns, class C, class A = DefaultAlloc> class ChainHashMap :
+template <class K, class AHashFns, class C, class A = DefaultAlloc> class ChainHashMap :
public Map<uintptr_t, List<MapElem<K,C>,A>,A> {
public:
using Map<uintptr_t, List<MapElem<K,C>,A>,A>::n;
@@ -214,7 +214,7 @@ template <class C, class AHashFns, int N, class A = DefaultAlloc> class NBlockHa
/* use forv_Vec on BlockHashes */
#define DEFAULT_BLOCK_HASH_SIZE 4
-template <class C, class ABlockHashFns> class BlockHash :
+template <class C, class ABlockHashFns> class BlockHash :
public NBlockHash<C, ABlockHashFns, DEFAULT_BLOCK_HASH_SIZE> {};
typedef BlockHash<cchar *, StringHashFns> StringBlockHash;
@@ -235,7 +235,7 @@ template <class K, class C, class A = DefaultAlloc> class Env {
/* IMPLEMENTATION */
-template <class K, class C, class A> inline C
+template <class K, class C, class A> inline C
Map<K,C,A>::get(K akey) {
MapElem<K,C> e(akey, (C)0);
MapElem<K,C> *x = this->set_in(e);
@@ -389,7 +389,7 @@ HashSet<K, AHashFns, C, A>::put(C avalue) {
return put(avalue);
}
-template <class K, class AHashFns, class C, class A> inline MapElem<K,C> *
+template <class K, class AHashFns, class C, class A> inline MapElem<K,C> *
HashMap<K,AHashFns,C,A>::get_internal(K akey) {
if (!n)
return 0;
@@ -412,7 +412,7 @@ HashMap<K,AHashFns,C,A>::get_internal(K akey) {
return 0;
}
-template <class K, class AHashFns, class C, class A> inline C
+template <class K, class AHashFns, class C, class A> inline C
HashMap<K,AHashFns,C,A>::get(K akey) {
MapElem<K,C> *x = get_internal(akey);
if (!x)
@@ -594,7 +594,7 @@ ChainHashMap<K, AHashFns, C, A>::get(K akey) {
if (!x)
return 0;
List<MapElem<K,C>,A> *l = &x->value;
- if (l->head)
+ if (l->head)
for (ConsCell<MapElem<K,C>,A> *p = l->head; p; p = p->cdr)
if (AHashFns::equal(akey, p->car.key))
return p->car.value;
@@ -666,7 +666,7 @@ template <class K, class AHashFns, class C, class A> void
ChainHashMap<K, AHashFns, C, A>::get_keys(Vec<K> &keys) {
for (size_t i = 0; i < n; i++) {
List<MapElem<K,C> > *l = &v[i].value;
- if (l->head)
+ if (l->head)
for (ConsCell<MapElem<K,C>,A> *p = l->head; p; p = p->cdr)
keys.add(p->car.key);
}
@@ -676,7 +676,7 @@ template <class K, class AHashFns, class C, class A> void
ChainHashMap<K, AHashFns, C, A>::get_values(Vec<C> &values) {
for (size_t i = 0; i < n; i++) {
List<MapElem<K,C>,A> *l = &v[i].value;
- if (l->head)
+ if (l->head)
for (ConsCell<MapElem<K,C>,A> *p = l->head; p; p = p->cdr)
values.add(p->car.value);
}
@@ -688,9 +688,9 @@ StringChainHash<F,A>::canonicalize(cchar *s, cchar *e) {
cchar *a = s;
// 31 changed to 27, to avoid prime2 in vec.cpp
if (e)
- while (a != e) h = h * 27 + (unsigned char)*a++;
+ while (a != e) h = h * 27 + (unsigned char)*a++;
else
- while (*a) h = h * 27 + (unsigned char)*a++;
+ while (*a) h = h * 27 + (unsigned char)*a++;
MapElem<uintptr_t,List<cchar*, A> > me(h, (char*)0);
MapElem<uintptr_t,List<cchar*, A> > *x = this->set_in(me);
if (x) {
@@ -718,7 +718,7 @@ StringChainHash<F,A>::canonicalize(cchar *s, cchar *e) {
return s;
}
-template <class K, class C, class A> inline C
+template <class K, class C, class A> inline C
Env<K,C,A>::get(K akey) {
MapElem<K,List<C, A> *> e(akey, 0);
MapElem<K,List<C, A> *> *x = store.set_in(e);
@@ -754,7 +754,7 @@ Env<K,C,A>::pop() {
get_bucket(e->car)->pop();
}
-template <class C, class AHashFns, int N, class A> inline
+template <class C, class AHashFns, int N, class A> inline
NBlockHash<C, AHashFns, N, A>::NBlockHash() : n(1), i(0) {
memset(&e[0], 0, sizeof(e));
v = e;
@@ -901,18 +901,18 @@ template <class C, class AHashFns, int N, class A> inline int
NBlockHash<C, AHashFns, N, A>::count() {
int nelements = 0;
C *l = last();
- for (C *xx = first(); xx < l; xx++)
+ for (C *xx = first(); xx < l; xx++)
if (*xx)
nelements++;
return nelements;
}
-template <class C, class AHashFns, int N, class A> inline void
+template <class C, class AHashFns, int N, class A> inline void
NBlockHash<C, AHashFns, N, A>::copy(const NBlockHash<C, AHashFns, N, A> &hh) {
clear();
n = hh.n;
i = hh.i;
- if (hh.v == &hh.e[0]) {
+ if (hh.v == &hh.e[0]) {
memcpy(e, &hh.e[0], sizeof(e));
v = e;
} else {
@@ -924,13 +924,13 @@ NBlockHash<C, AHashFns, N, A>::copy(const NBlockHash<C, AHashFns, N, A> &hh) {
}
}
-template <class C, class AHashFns, int N, class A> inline void
+template <class C, class AHashFns, int N, class A> inline void
NBlockHash<C, AHashFns, N, A>::move(NBlockHash<C, AHashFns, N, A> &hh) {
clear();
n = hh.n;
i = hh.i;
v = hh.v;
- if (hh.v == &hh.e[0]) {
+ if (hh.v == &hh.e[0]) {
memcpy(e, &hh.e[0], sizeof(e));
v = e;
}
@@ -1066,7 +1066,7 @@ public:
LINK(Bucket, m_link);
/** Do the values in this bucket have different keys?
-
+
@internal This can have a false positive, but that's OK, better than the expense of being
exact. What we want is to avoid expanding to shorten the chain if it won't help, which it
won't if all the keys are the same.
@@ -1080,7 +1080,7 @@ public:
};
/** Information about locating a value in the hash table.
-
+
An instance of this returned when searching for a key in the table. It can then be used to
check if a matching key was found, and to iterate over equivalent keys. Note this iterator
will touch only values which have a matching key.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/TsBuffer.h
----------------------------------------------------------------------
diff --git a/lib/ts/TsBuffer.h b/lib/ts/TsBuffer.h
index 4ed8ccc..d4fac87 100644
--- a/lib/ts/TsBuffer.h
+++ b/lib/ts/TsBuffer.h
@@ -272,7 +272,7 @@ namespace ts {
*/
self splitOn(char c);
/** Get a trailing segment of the buffer.
-
+
@return A buffer that contains all data after @a p.
*/
self after(char const* p) const;
@@ -371,7 +371,7 @@ namespace ts {
}
return zret;
}
-
+
inline char const* ConstBuffer::find(char c) const {
return static_cast<char const*>(memchr(_ptr, c, _size));
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/Vec.cc
----------------------------------------------------------------------
diff --git a/lib/ts/Vec.cc b/lib/ts/Vec.cc
index 66d2dda..781e7dc 100644
--- a/lib/ts/Vec.cc
+++ b/lib/ts/Vec.cc
@@ -31,40 +31,40 @@ const uintptr_t prime2[] = {
4194301, 8388593, 16777213, 33554393, 67108859, 134217689,
268435399, 536870909
};
-
+
// primes generated with map_mult.c
const uintptr_t open_hash_primes[256] = {
-0x02D4AF27, 0x1865DFC7, 0x47C62B43, 0x35B4889B, 0x210459A1, 0x3CC51CC7, 0x02ADD945, 0x0607C4D7,
-0x558E6035, 0x0554224F, 0x5A281657, 0x1C458C7F, 0x7F8BE723, 0x20B9BA99, 0x7218AA35, 0x64B10C2B,
-0x548E8983, 0x5951218F, 0x7AADC871, 0x695FA5B1, 0x40D40FCB, 0x20E03CC9, 0x55E9920F, 0x554CE08B,
-0x7E78B1D7, 0x7D965DF9, 0x36A520A1, 0x1B0C6C11, 0x33385667, 0x2B0A7B9B, 0x0F35AE23, 0x0BD608FB,
-0x2284ADA3, 0x6E6C0687, 0x129B3EED, 0x7E86289D, 0x1143C24B, 0x1B6C7711, 0x1D87BB41, 0x4C7E635D,
-0x67577999, 0x0A0113C5, 0x6CF085B5, 0x14A4D0FB, 0x4E93E3A7, 0x5C87672B, 0x67F3CA17, 0x5F944339,
-0x4C16DFD7, 0x5310C0E3, 0x2FAD1447, 0x4AFB3187, 0x08468B7F, 0x49E56C51, 0x6280012F, 0x097D1A85,
-0x34CC9403, 0x71028BD7, 0x6DEDC7E9, 0x64093291, 0x6D78BB0B, 0x7A03B465, 0x2E044A43, 0x1AE58515,
-0x23E495CD, 0x46102A83, 0x51B78A59, 0x051D8181, 0x5352CAC9, 0x57D1312B, 0x2726ED57, 0x2E6BC515,
-0x70736281, 0x5938B619, 0x0D4B6ACB, 0x44AB5E2B, 0x0029A485, 0x002CE54F, 0x075B0591, 0x3EACFDA9,
-0x0AC03411, 0x53B00F73, 0x2066992D, 0x76E72223, 0x55F62A8D, 0x3FF92EE1, 0x17EE0EB3, 0x5E470AF1,
-0x7193EB7F, 0x37A2CCD3, 0x7B44F7AF, 0x0FED8B3F, 0x4CC05805, 0x7352BF79, 0x3B61F755, 0x523CF9A3,
-0x1AAFD219, 0x76035415, 0x5BE84287, 0x6D598909, 0x456537E9, 0x407EA83F, 0x23F6FFD5, 0x60256F39,
-0x5D8EE59F, 0x35265CEB, 0x1D4AD4EF, 0x676E2E0F, 0x2D47932D, 0x776BB33B, 0x6DE1902B, 0x2C3F8741,
-0x5B2DE8EF, 0x686DDB3B, 0x1D7C61C7, 0x1B061633, 0x3229EA51, 0x7FCB0E63, 0x5F22F4C9, 0x517A7199,
-0x2A8D7973, 0x10DCD257, 0x41D59B27, 0x2C61CA67, 0x2020174F, 0x71653B01, 0x2FE464DD, 0x3E7ED6C7,
-0x164D2A71, 0x5D4F3141, 0x5F7BABA7, 0x50E1C011, 0x140F5D77, 0x34E80809, 0x04AAC6B3, 0x29C42BAB,
-0x08F9B6F7, 0x461E62FD, 0x45C2660B, 0x08BF25A7, 0x5494EA7B, 0x0225EBB7, 0x3C5A47CF, 0x2701C333,
-0x457ED05B, 0x48CDDE55, 0x14083099, 0x7C69BDAB, 0x7BF163C9, 0x41EE1DAB, 0x258B1307, 0x0FFAD43B,
-0x6601D767, 0x214DBEC7, 0x2852CCF5, 0x0009B471, 0x190AC89D, 0x5BDFB907, 0x15D4E331, 0x15D22375,
-0x13F388D5, 0x12ACEDA5, 0x3835EA5D, 0x2587CA35, 0x06756643, 0x487C6F55, 0x65C295EB, 0x1029F2E1,
-0x10CEF39D, 0x14C2E415, 0x444825BB, 0x24BE0A2F, 0x1D2B7C01, 0x64AE3235, 0x5D2896E5, 0x61BBBD87,
-0x4A49E86D, 0x12C277FF, 0x72C81289, 0x5CF42A3D, 0x332FF177, 0x0DAECD23, 0x6000ED1D, 0x203CDDE1,
-0x40C62CAD, 0x19B9A855, 0x782020C3, 0x6127D5BB, 0x719889A7, 0x40E4FCCF, 0x2A3C8FF9, 0x07411C7F,
-0x3113306B, 0x4D7CA03F, 0x76119841, 0x54CEFBDF, 0x11548AB9, 0x4B0748EB, 0x569966B1, 0x45BC721B,
-0x3D5A376B, 0x0D8923E9, 0x6D95514D, 0x0F39A367, 0x2FDAD92F, 0x721F972F, 0x42D0E21D, 0x5C5952DB,
-0x7394D007, 0x02692C55, 0x7F92772F, 0x025F8025, 0x34347113, 0x560EA689, 0x0DCC21DF, 0x09ECC7F5,
-0x091F3993, 0x0E0B52AB, 0x497CAA55, 0x0A040A49, 0x6D8F0CC5, 0x54F41609, 0x6E0CB8DF, 0x3DCB64C3,
-0x16C365CD, 0x6D6B9FB5, 0x02B9382B, 0x6A5BFAF1, 0x1669D75F, 0x13CFD4FD, 0x0FDF316F, 0x21F3C463,
-0x6FC58ABF, 0x04E45BE7, 0x1911225B, 0x28CD1355, 0x222084E9, 0x672AD54B, 0x476FC267, 0x6864E16D,
-0x20AEF4FB, 0x603C5FB9, 0x55090595, 0x1113B705, 0x24E38493, 0x5291AF97, 0x5F5446D9, 0x13A6F639,
+0x02D4AF27, 0x1865DFC7, 0x47C62B43, 0x35B4889B, 0x210459A1, 0x3CC51CC7, 0x02ADD945, 0x0607C4D7,
+0x558E6035, 0x0554224F, 0x5A281657, 0x1C458C7F, 0x7F8BE723, 0x20B9BA99, 0x7218AA35, 0x64B10C2B,
+0x548E8983, 0x5951218F, 0x7AADC871, 0x695FA5B1, 0x40D40FCB, 0x20E03CC9, 0x55E9920F, 0x554CE08B,
+0x7E78B1D7, 0x7D965DF9, 0x36A520A1, 0x1B0C6C11, 0x33385667, 0x2B0A7B9B, 0x0F35AE23, 0x0BD608FB,
+0x2284ADA3, 0x6E6C0687, 0x129B3EED, 0x7E86289D, 0x1143C24B, 0x1B6C7711, 0x1D87BB41, 0x4C7E635D,
+0x67577999, 0x0A0113C5, 0x6CF085B5, 0x14A4D0FB, 0x4E93E3A7, 0x5C87672B, 0x67F3CA17, 0x5F944339,
+0x4C16DFD7, 0x5310C0E3, 0x2FAD1447, 0x4AFB3187, 0x08468B7F, 0x49E56C51, 0x6280012F, 0x097D1A85,
+0x34CC9403, 0x71028BD7, 0x6DEDC7E9, 0x64093291, 0x6D78BB0B, 0x7A03B465, 0x2E044A43, 0x1AE58515,
+0x23E495CD, 0x46102A83, 0x51B78A59, 0x051D8181, 0x5352CAC9, 0x57D1312B, 0x2726ED57, 0x2E6BC515,
+0x70736281, 0x5938B619, 0x0D4B6ACB, 0x44AB5E2B, 0x0029A485, 0x002CE54F, 0x075B0591, 0x3EACFDA9,
+0x0AC03411, 0x53B00F73, 0x2066992D, 0x76E72223, 0x55F62A8D, 0x3FF92EE1, 0x17EE0EB3, 0x5E470AF1,
+0x7193EB7F, 0x37A2CCD3, 0x7B44F7AF, 0x0FED8B3F, 0x4CC05805, 0x7352BF79, 0x3B61F755, 0x523CF9A3,
+0x1AAFD219, 0x76035415, 0x5BE84287, 0x6D598909, 0x456537E9, 0x407EA83F, 0x23F6FFD5, 0x60256F39,
+0x5D8EE59F, 0x35265CEB, 0x1D4AD4EF, 0x676E2E0F, 0x2D47932D, 0x776BB33B, 0x6DE1902B, 0x2C3F8741,
+0x5B2DE8EF, 0x686DDB3B, 0x1D7C61C7, 0x1B061633, 0x3229EA51, 0x7FCB0E63, 0x5F22F4C9, 0x517A7199,
+0x2A8D7973, 0x10DCD257, 0x41D59B27, 0x2C61CA67, 0x2020174F, 0x71653B01, 0x2FE464DD, 0x3E7ED6C7,
+0x164D2A71, 0x5D4F3141, 0x5F7BABA7, 0x50E1C011, 0x140F5D77, 0x34E80809, 0x04AAC6B3, 0x29C42BAB,
+0x08F9B6F7, 0x461E62FD, 0x45C2660B, 0x08BF25A7, 0x5494EA7B, 0x0225EBB7, 0x3C5A47CF, 0x2701C333,
+0x457ED05B, 0x48CDDE55, 0x14083099, 0x7C69BDAB, 0x7BF163C9, 0x41EE1DAB, 0x258B1307, 0x0FFAD43B,
+0x6601D767, 0x214DBEC7, 0x2852CCF5, 0x0009B471, 0x190AC89D, 0x5BDFB907, 0x15D4E331, 0x15D22375,
+0x13F388D5, 0x12ACEDA5, 0x3835EA5D, 0x2587CA35, 0x06756643, 0x487C6F55, 0x65C295EB, 0x1029F2E1,
+0x10CEF39D, 0x14C2E415, 0x444825BB, 0x24BE0A2F, 0x1D2B7C01, 0x64AE3235, 0x5D2896E5, 0x61BBBD87,
+0x4A49E86D, 0x12C277FF, 0x72C81289, 0x5CF42A3D, 0x332FF177, 0x0DAECD23, 0x6000ED1D, 0x203CDDE1,
+0x40C62CAD, 0x19B9A855, 0x782020C3, 0x6127D5BB, 0x719889A7, 0x40E4FCCF, 0x2A3C8FF9, 0x07411C7F,
+0x3113306B, 0x4D7CA03F, 0x76119841, 0x54CEFBDF, 0x11548AB9, 0x4B0748EB, 0x569966B1, 0x45BC721B,
+0x3D5A376B, 0x0D8923E9, 0x6D95514D, 0x0F39A367, 0x2FDAD92F, 0x721F972F, 0x42D0E21D, 0x5C5952DB,
+0x7394D007, 0x02692C55, 0x7F92772F, 0x025F8025, 0x34347113, 0x560EA689, 0x0DCC21DF, 0x09ECC7F5,
+0x091F3993, 0x0E0B52AB, 0x497CAA55, 0x0A040A49, 0x6D8F0CC5, 0x54F41609, 0x6E0CB8DF, 0x3DCB64C3,
+0x16C365CD, 0x6D6B9FB5, 0x02B9382B, 0x6A5BFAF1, 0x1669D75F, 0x13CFD4FD, 0x0FDF316F, 0x21F3C463,
+0x6FC58ABF, 0x04E45BE7, 0x1911225B, 0x28CD1355, 0x222084E9, 0x672AD54B, 0x476FC267, 0x6864E16D,
+0x20AEF4FB, 0x603C5FB9, 0x55090595, 0x1113B705, 0x24E38493, 0x5291AF97, 0x5F5446D9, 0x13A6F639,
0x3D501313, 0x37E02017, 0x236B0ED3, 0x60F246BF, 0x01E02501, 0x2D2F66BD, 0x6BF23609, 0x16729BAF
};
@@ -86,7 +86,7 @@ i_find(const Intervals *i, int x) {
l = m;
goto Lrecurse;
}
- if (x < i->v[m]) {
+ if (x < i->v[m]) {
h = m;
goto Lrecurse;
}
@@ -103,7 +103,7 @@ Intervals::in(int x) const {
}
// insert into interval with merge
-void
+void
Intervals::insert(int x) {
if (!n) {
add(x);
@@ -187,7 +187,7 @@ UnionFind::find(int n) {
return i;
}
-void
+void
UnionFind::unify(int n, int m) {
n = find(n);
m = find(m);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/Vec.h
----------------------------------------------------------------------
diff --git a/lib/ts/Vec.h b/lib/ts/Vec.h
index 88c04c8..b5b3a8d 100644
--- a/lib/ts/Vec.h
+++ b/lib/ts/Vec.h
@@ -48,7 +48,7 @@ class Vec {
size_t i; // size index for sets, reserve for vectors
C *v;
C e[VEC_INTEGRAL_SIZE];
-
+
Vec();
Vec<C,A,S>(const Vec<C,A,S> &vv);
Vec<C,A,S>(const C c);
@@ -57,7 +57,7 @@ class Vec {
C &operator[](int i) const { return v[i]; }
C get(size_t i) const;
- void add(C a);
+ void add(C a);
void push_back(C a) { add(a); } // std::vector name
bool add_exclusive(C a);
C& add();
@@ -113,7 +113,7 @@ class Vec {
int read(int fd);
void qsort(bool (*lt)(C,C));
void qsort(bool (*lt)(const C &, const C &));
-
+
private:
void move_internal(Vec<C,A,S> &v);
void copy_internal(const Vec<C,A,S> &v);
@@ -153,7 +153,7 @@ class Intervals : public Vec<int> {
class UnionFind : public Vec<int> {
public:
// set number of elements, initialized to singletons, may be called repeatedly to increase size
- void size(int n);
+ void size(int n);
// return representitive element
int find(int n);
// unify the sets containing the two elements
@@ -192,7 +192,7 @@ Vec<C,A,S>::get(size_t i) const {
}
}
-template <class C, class A, int S> inline void
+template <class C, class A, int S> inline void
Vec<C,A,S>::add(C a) {
if (n & (VEC_INTEGRAL_SIZE-1))
v[n++] = a;
@@ -286,7 +286,7 @@ Vec<C,A,S>::add_exclusive(C a) {
if (!in(a)) {
add(a);
return true;
- } else
+ } else
return false;
}
@@ -315,40 +315,40 @@ Vec<C,A,S>::index(C a) const {
return -1;
}
-template <class C, class A, int S> inline void
+template <class C, class A, int S> inline void
Vec<C,A,S>::move_internal(Vec<C,A,S> &vv) {
n = vv.n;
i = vv.i;
- if (vv.v == &vv.e[0]) {
+ if (vv.v == &vv.e[0]) {
memcpy(e, &vv.e[0], sizeof(e));
v = e;
} else
v = vv.v;
}
-template <class C, class A, int S> inline void
+template <class C, class A, int S> inline void
Vec<C,A,S>::move(Vec<C,A,S> &vv) {
- move_internal(vv);
+ move_internal(vv);
vv.v = 0;
vv.clear();
}
-template <class C, class A, int S> inline void
+template <class C, class A, int S> inline void
Vec<C,A,S>::copy(const Vec<C,A,S> &vv) {
n = vv.n;
i = vv.i;
- if (vv.v == &vv.e[0]) {
+ if (vv.v == &vv.e[0]) {
memcpy(e, &vv.e[0], sizeof(e));
v = e;
} else {
- if (vv.v)
+ if (vv.v)
copy_internal(vv);
else
v = 0;
}
}
-template <class C, class A, int S> inline void
+template <class C, class A, int S> inline void
Vec<C,A,S>::fill(size_t nn) {
for (size_t i = n; i < nn; i++)
add() = 0;
@@ -382,7 +382,7 @@ Vec<C,A,S>::prepend(const Vec<C> &vv) {
}
}
-template <class C, class A, int S> void
+template <class C, class A, int S> void
Vec<C,A,S>::add_internal(C a) {
addx();
v[n++] = a;
@@ -445,7 +445,7 @@ Vec<C,A,S>::set_union(Vec<C,A,S> &vv) {
}
}
return changed;
-}
+}
template <class C, class A, int S> int
Vec<C,A,S>::set_intersection(Vec<C,A,S> &vv) {
@@ -460,7 +460,7 @@ Vec<C,A,S>::set_intersection(Vec<C,A,S> &vv) {
changed = 1;
}
return changed;
-}
+}
template <class C, class A, int S> int
Vec<C,A,S>::some_intersection(Vec<C,A,S> &vv) {
@@ -469,7 +469,7 @@ Vec<C,A,S>::some_intersection(Vec<C,A,S> &vv) {
if (vv.set_in(v[i]))
return 1;
return 0;
-}
+}
template <class C, class A, int S> int
Vec<C,A,S>::some_disjunction(Vec<C,A,S> &vv) {
@@ -482,7 +482,7 @@ Vec<C,A,S>::some_disjunction(Vec<C,A,S> &vv) {
if (!set_in(vv.v[i]))
return 1;
return 0;
-}
+}
template <class C, class A, int S> void
Vec<C,A,S>::set_intersection(Vec<C,A,S> &vv, Vec<C,A,S> &result) {
@@ -490,7 +490,7 @@ Vec<C,A,S>::set_intersection(Vec<C,A,S> &vv, Vec<C,A,S> &result) {
if (v[i])
if (vv.set_in(v[i]))
result.set_add(v[i]);
-}
+}
template <class C, class A, int S> void
Vec<C,A,S>::set_disjunction(Vec<C,A,S> &vv, Vec<C,A,S> &result) {
@@ -502,7 +502,7 @@ Vec<C,A,S>::set_disjunction(Vec<C,A,S> &vv, Vec<C,A,S> &result) {
if (vv.v[i])
if (!set_in(vv.v[i]))
result.set_add(vv.v[i]);
-}
+}
template <class C, class A, int S> void
Vec<C,A,S>::set_difference(Vec<C,A,S> &vv, Vec<C,A,S> &result) {
@@ -510,7 +510,7 @@ Vec<C,A,S>::set_difference(Vec<C,A,S> &vv, Vec<C,A,S> &result) {
if (v[i])
if (!vv.set_in(v[i]))
result.set_add(v[i]);
-}
+}
template <class C, class A, int S> int
Vec<C,A,S>::some_difference(Vec<C,A,S> &vv) {
@@ -519,7 +519,7 @@ Vec<C,A,S>::some_difference(Vec<C,A,S> &vv) {
if (!vv.set_in(v[i]))
return 1;
return 0;
-}
+}
template <class C, class A, int S> size_t
Vec<C,A,S>::set_count() const {
@@ -530,7 +530,7 @@ Vec<C,A,S>::set_count() const {
}
}
return x;
-}
+}
template <class C, class A, int S> void
Vec<C,A,S>::set_to_vec() {
@@ -561,7 +561,7 @@ Vec<C,A,S>::vec_to_set() {
set_add(*c);
}
-template <class C, class A, int S> void
+template <class C, class A, int S> void
Vec<C,A,S>::remove_index(int index) {
if (n > 1)
memmove(&v[index], &v[index+1], (n - 1 - index) * sizeof(v[0]));
@@ -593,7 +593,7 @@ Vec<C,A,S>::insert(size_t index) {
return v[index];
}
-template <class C, class A, int S> void
+template <class C, class A, int S> void
Vec<C,A,S>::reverse() {
for (int i = 0; i < n/2; i++) {
C *s = &v[i], *e = &v[n - 1 - i];
@@ -612,7 +612,7 @@ Vec<C,A,S>::copy_internal(const Vec<C,A,S> &vv) {
nl = 1 << nl;
v = (C*)A::alloc(nl * sizeof(C));
memcpy(v, vv.v, n * sizeof(C));
- memset(v + n, 0, (nl - n) * sizeof(C));
+ memset(v + n, 0, (nl - n) * sizeof(C));
if (i > n) // reset reserve
i = 0;
}
@@ -628,7 +628,7 @@ Vec<C,A,S>::set_expand() {
memset(v, 0, n * sizeof(C));
}
-template <class C, class A, int S> inline void
+template <class C, class A, int S> inline void
Vec<C,A,S>::reserve(size_t x) {
if (x <= n)
return;
@@ -644,7 +644,7 @@ Vec<C,A,S>::reserve(size_t x) {
A::free(vv);
}
-template <class C, class A, int S> inline void
+template <class C, class A, int S> inline void
Vec<C,A,S>::addx() {
if (!v) {
v = e;
@@ -703,12 +703,12 @@ Vec<C,A,S>::delete_and_clear() {
clear();
}
-template <class C, class A, int S>
-inline Vec<C,A,S>::~Vec() {
- if (v && v != e) A::free(v);
+template <class C, class A, int S>
+inline Vec<C,A,S>::~Vec() {
+ if (v && v != e) A::free(v);
}
-template <class C, class A, int S>
+template <class C, class A, int S>
inline int marshal_size(Vec<C,A,S> &v) {
int l = sizeof(int) * 2;
for (int x = 0; x < v.n; x++)
@@ -716,7 +716,7 @@ inline int marshal_size(Vec<C,A,S> &v) {
return l;
}
-template <class C, class A, int S>
+template <class C, class A, int S>
inline int marshal(Vec<C,A,S> &v, char *buf) {
char *x = buf;
*(int*)x = v.n; x += sizeof(int);
@@ -726,7 +726,7 @@ inline int marshal(Vec<C,A,S> &v, char *buf) {
return x - buf;
}
-template <class C, class A, int S>
+template <class C, class A, int S>
inline int unmarshal(Vec<C,A,S> &v, char *buf) {
char *x = buf;
v.n = *(int*)x; x += sizeof(int);
@@ -741,7 +741,7 @@ inline int unmarshal(Vec<C,A,S> &v, char *buf) {
return x - buf;
}
-template <class C, class A, int S>
+template <class C, class A, int S>
inline int Vec<C,A,S>::write(int fd) {
int r = 0, t = 0;
if ((r = ::write(fd, this, sizeof(*this))) < 0) return r; t += r;
@@ -749,7 +749,7 @@ inline int Vec<C,A,S>::write(int fd) {
return t;
}
-template <class C, class A, int S>
+template <class C, class A, int S>
inline int Vec<C,A,S>::read(int fd) {
int r = 0, t = 0;
if ((r = ::read(fd, this, sizeof(*this))) < 0) return r; t += r;
@@ -759,7 +759,7 @@ inline int Vec<C,A,S>::read(int fd) {
return t;
}
-template <class C>
+template <class C>
inline void qsort_Vec(C *left, C *right, bool (*lt)(C,C)) {
Lagain:
if (right - left < 5) {
@@ -795,7 +795,7 @@ inline void qsort_Vec(C *left, C *right, bool (*lt)(C,C)) {
}
}
-template <class C>
+template <class C>
inline void qsort_VecRef(C *left, C *right, bool (*lt)(const C &, const C &)) {
Lagain:
if (right - left < 5) {
@@ -831,13 +831,13 @@ inline void qsort_VecRef(C *left, C *right, bool (*lt)(const C &, const C &)) {
}
}
-template <class C, class A, int S>
+template <class C, class A, int S>
inline void Vec<C,A,S>::qsort(bool (*lt)(C,C)) {
if (n)
qsort_Vec<C>(&v[0], end(), lt);
}
-template <class C, class A, int S>
+template <class C, class A, int S>
inline void Vec<C,A,S>::qsort(bool (*lt)(const C &, const C &)) {
if (n)
qsort_VecRef<C>(&v[0], end(), lt);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/ink_args.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_args.cc b/lib/ts/ink_args.cc
index 50d08c3..c6c0e65 100644
--- a/lib/ts/ink_args.cc
+++ b/lib/ts/ink_args.cc
@@ -246,7 +246,7 @@ usage(const ArgumentDescription * argument_descriptions, unsigned n_argument_des
if ('-' == argument_descriptions[i].key) fprintf(stderr, " ");
else fprintf(stderr, "-%c,", argument_descriptions[i].key);
-
+
fprintf(stderr, " --%-17s %s",
argument_descriptions[i].name,
argument_types_descriptions[argument_descriptions[i].type ?
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/ink_inet.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_inet.cc b/lib/ts/ink_inet.cc
index b20633b..a841a76 100644
--- a/lib/ts/ink_inet.cc
+++ b/lib/ts/ink_inet.cc
@@ -338,8 +338,8 @@ IpAddr::load(char const* text) {
return zret;
}
-int
-IpAddr::load(ts::ConstBuffer const& text)
+int
+IpAddr::load(ts::ConstBuffer const& text)
{
IpEndpoint ip;
int zret = ats_ip_pton(text, &ip.sa);
@@ -459,7 +459,7 @@ ats_ip_getbestaddrinfo(char const* host,
ai_hints.ai_family = AF_UNSPEC;
ai_hints.ai_flags = AI_ADDRCONFIG;
zret = getaddrinfo(addr_text.data(), 0, &ai_hints, &ai_result);
-
+
if (0 == zret) {
// Walk the returned addresses and pick the "best".
enum {
@@ -484,7 +484,7 @@ ats_ip_getbestaddrinfo(char const* host,
else if (ats_is_ip_private(ai_ip)) spot_type = PR;
else if (ats_is_ip_multicast(ai_ip)) spot_type = MC;
else spot_type = GL;
-
+
if (spot_type == NA) continue; // Next!
if (ats_is_ip4(ai_ip)) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/ink_inet.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_inet.h b/lib/ts/ink_inet.h
index 6c21e74..9181f38 100644
--- a/lib/ts/ink_inet.h
+++ b/lib/ts/ink_inet.h
@@ -626,7 +626,7 @@ inline bool ats_is_ip_any(sockaddr const* ip) {
(ats_is_ip6(ip) && IN6_IS_ADDR_UNSPECIFIED(&ats_ip6_addr_cast(ip)))
;
}
-
+
/// @name Address operators
//@{
@@ -1029,7 +1029,7 @@ ats_ip_getbestaddrinfo(
);
/** Generic IP address hash function.
-*/
+*/
uint32_t ats_ip_hash(sockaddr const* addr);
/** Convert address to string as a hexidecimal value.
@@ -1112,7 +1112,7 @@ struct IpAddr {
int load(
ts::ConstBuffer const& str ///< Text of IP address.
);
-
+
/** Output to a string.
@return The string @a dest.
*/
@@ -1303,7 +1303,7 @@ inline int ats_ip_pton(
inline IpEndpoint&
IpEndpoint::assign(IpAddr const& addr, in_port_t port) {
- ats_ip_set(&sa, addr, port);
+ ats_ip_set(&sa, addr, port);
return *this;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/ink_memory.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_memory.h b/lib/ts/ink_memory.h
index 304c7a9..23da1b9 100644
--- a/lib/ts/ink_memory.h
+++ b/lib/ts/ink_memory.h
@@ -164,7 +164,7 @@ make_iovec(PtrType (&array)[N]) {
foo *bar[ZOMG]; // array of pointers.
ink_zero(bar); // zero all pointers in the array.
@endcode
-
+
*/
template < typename T > inline void
ink_zero(T& t) {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/ink_rand.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_rand.cc b/lib/ts/ink_rand.cc
index 1736ee7..e9989e0 100644
--- a/lib/ts/ink_rand.cc
+++ b/lib/ts/ink_rand.cc
@@ -6,11 +6,11 @@
This is a 64-bit version of Mersenne Twister pseudorandom number
generator.
- Before using, initialize the state by using init_genrand64(seed)
+ Before using, initialize the state by using init_genrand64(seed)
or init_by_array64(init_key, key_length).
Copyright (C) 2004, Makoto Matsumoto and Takuji Nishimura,
- All rights reserved.
+ All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -23,8 +23,8 @@
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- 3. The names of its contributors may not be used to endorse or promote
- products derived from this software without specific prior written
+ 3. The names of its contributors may not be used to endorse or promote
+ products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -41,12 +41,12 @@
References:
T. Nishimura, ``Tables of 64-bit Mersenne Twisters''
- ACM Transactions on Modeling and
+ ACM Transactions on Modeling and
Computer Simulation 10. (2000) 348--357.
M. Matsumoto and T. Nishimura,
``Mersenne Twister: a 623-dimensionally equidistributed
uniform pseudorandom number generator''
- ACM Transactions on Modeling and
+ ACM Transactions on Modeling and
Computer Simulation 8. (Jan. 1998) 3--30.
Any feedback is very welcome.
@@ -71,7 +71,7 @@ InkRand::InkRand(uint64_t d) {
void InkRand::seed(uint64_t seed) {
mt[0] = seed;
- for (mti=1; mti<NN; mti++)
+ for (mti=1; mti<NN; mti++)
mt[mti] = (6364136223846793005ULL * (mt[mti-1] ^ (mt[mti-1] >> 62)) + mti);
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/ink_rand.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_rand.h b/lib/ts/ink_rand.h
index c0a0c27..f9b78bd 100644
--- a/lib/ts/ink_rand.h
+++ b/lib/ts/ink_rand.h
@@ -10,11 +10,11 @@
This is a 64-bit version of Mersenne Twister pseudorandom number
generator.
- Before using, initialize the state by using init_genrand64(seed)
+ Before using, initialize the state by using init_genrand64(seed)
or init_by_array64(init_key, key_length).
Copyright (C) 2004, Makoto Matsumoto and Takuji Nishimura,
- All rights reserved.
+ All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -27,8 +27,8 @@
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- 3. The names of its contributors may not be used to endorse or promote
- products derived from this software without specific prior written
+ 3. The names of its contributors may not be used to endorse or promote
+ products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -45,12 +45,12 @@
References:
T. Nishimura, ``Tables of 64-bit Mersenne Twisters''
- ACM Transactions on Modeling and
+ ACM Transactions on Modeling and
Computer Simulation 10. (2000) 348--357.
M. Matsumoto and T. Nishimura,
``Mersenne Twister: a 623-dimensionally equidistributed
uniform pseudorandom number generator''
- ACM Transactions on Modeling and
+ ACM Transactions on Modeling and
Computer Simulation 8. (Jan. 1998) 3--30.
Any feedback is very welcome.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/ink_res_init.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_res_init.cc b/lib/ts/ink_res_init.cc
index 71a922d..c9a0ed8 100644
--- a/lib/ts/ink_res_init.cc
+++ b/lib/ts/ink_res_init.cc
@@ -431,7 +431,7 @@ ink_res_init(
if (pHostListSize > INK_MAXNS) pHostListSize = INK_MAXNS;
for (
; nserv < pHostListSize
- && ats_is_ip(&pHostList[nserv].sa)
+ && ats_is_ip(&pHostList[nserv].sa)
; ++nserv
) {
ats_ip_copy(&statp->nsaddr_list[nserv].sa, &pHostList[nserv].sa);
@@ -624,7 +624,7 @@ parse_host_res_preference(char const* value, HostResPreferenceOrder order) {
if (np < N_HOST_RES_PREFERENCE_ORDER) // was N_HOST_RES_PREFERENCE)
order[np] = HOST_RES_PREFER_NONE;
}
-}
+}
int
ts_host_res_order_to_string(HostResPreferenceOrder const& order, char* out, int size)
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/ink_sock.cc
----------------------------------------------------------------------
diff --git a/lib/ts/ink_sock.cc b/lib/ts/ink_sock.cc
index 055cd38..a57efe5 100644
--- a/lib/ts/ink_sock.cc
+++ b/lib/ts/ink_sock.cc
@@ -192,8 +192,8 @@ safe_getsockname(int s, struct sockaddr *name, int *namelen)
return r;
}
-int
-safe_getpeername(int s, struct sockaddr *name, int *namelen)
+int
+safe_getpeername(int s, struct sockaddr *name, int *namelen)
{
int r;
do {
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/ts/test_Map.cc
----------------------------------------------------------------------
diff --git a/lib/ts/test_Map.cc b/lib/ts/test_Map.cc
index 6a28445..3824607 100644
--- a/lib/ts/test_Map.cc
+++ b/lib/ts/test_Map.cc
@@ -55,7 +55,7 @@ void test_TSHashTable() {
Table t;
Item* item;
Table::Location loc;
-
+
item = new Item(1);
t.insert(item);
for ( uint32_t i = 2 ; i <= N ; ++i ) {
@@ -80,7 +80,7 @@ void test_TSHashTable() {
; // compiler check.
ink_assert(!(t.find(N/2 | 1).isValid()));
-
+
for ( uint32_t i = 1 ; i <= N ; i += 2) {
t.remove(i);
}
@@ -184,7 +184,7 @@ int main(int /* argc ATS_UNUSED */, char **/*argv ATS_UNUSED */) {
ink_assert(ssh.get("ac") == 7);
ssh.del(ho);
ink_assert(ssh.get(ho) == 0);
-
+
Vec<int> ints;
ssh.get_values(ints);
ink_assert(ints.n == 8);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/tsconfig/Errata.cc
----------------------------------------------------------------------
diff --git a/lib/tsconfig/Errata.cc b/lib/tsconfig/Errata.cc
index a4733a7..a0259a1 100644
--- a/lib/tsconfig/Errata.cc
+++ b/lib/tsconfig/Errata.cc
@@ -58,7 +58,7 @@ Errata::Data::top() const {
return m_items.size() ? m_items.back() : NIL_MESSAGE ;
}
-inline Errata::Errata(ImpPtr const& ptr)
+inline Errata::Errata(ImpPtr const& ptr)
: m_data(ptr) {
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/tsconfig/Errata.h
----------------------------------------------------------------------
diff --git a/lib/tsconfig/Errata.h b/lib/tsconfig/Errata.h
index 2861503..8cb50da 100644
--- a/lib/tsconfig/Errata.h
+++ b/lib/tsconfig/Errata.h
@@ -109,7 +109,7 @@ public:
// typedef Container::iterator reverse_iterator;
/// Reverse constant message iteration.
// typedef Container::const_iterator const_reverse_iterator;
-
+
/// Default constructor - empty errata, very fast.
Errata();
/// Copy constructor, very fast.
@@ -311,7 +311,7 @@ public:
NULL the indentation is overwritten by @a lead if @a indent is
non-zero. It acts as a "continuation" marker for nested
@c Errata.
-
+
*/
std::ostream& write(
std::ostream& out, ///< Output stream.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/tsconfig/IntrusivePtr.h
----------------------------------------------------------------------
diff --git a/lib/tsconfig/IntrusivePtr.h b/lib/tsconfig/IntrusivePtr.h
index 937fc1d..cde2450 100644
--- a/lib/tsconfig/IntrusivePtr.h
+++ b/lib/tsconfig/IntrusivePtr.h
@@ -103,7 +103,7 @@ public:
IntrusivePtrCounter(
IntrusivePtrCounter const& ///< Source object.
);
-
+
/** Assignment operator.
@internal We need this for the same reason as the copy
@@ -217,7 +217,7 @@ public:
> IntrusivePtr(
IntrusivePtr<X> const& that ///< Foreign pointer.
);
-
+
/** Cross type assignment.
This succeeds if an @a X* can be implicitily converted to a @a T*.
*/
@@ -232,7 +232,7 @@ public:
/// @c false otherwise.
bool isShared() const;
/// Check for a single reference (@c shared_ptr compatibility)
- /// @return @c true if this object is not shared.
+ /// @return @c true if this object is not shared.
bool unique() const;
/// Reference count.
/// @return Number of references.
@@ -353,7 +353,7 @@ public:
bool operator() (
IntrusivePtr<T> const& lhs, ///< Left hand operand.
IntrusivePtr<T> const& rhs ///< Right hand operand.
- ) const;
+ ) const;
};
};
@@ -425,7 +425,7 @@ IntrusivePtr<T>::IntrusivePtr(
IntrusivePtr<X> const& that ///< Foreign pointer.
) : super(that.get()) {
}
-
+
template < typename T > IntrusivePtr<T>&
IntrusivePtr<T>::operator = (const self& that) {
this->reset(that.m_obj);
@@ -437,7 +437,7 @@ template < typename X >
IntrusivePtr<T>&
IntrusivePtr<T>::operator = (
IntrusivePtr<X> const& that ///< Foreign pointer.
-) {
+) {
this->reset(that.get());
return *this;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/tsconfig/TsConfigGrammar.c
----------------------------------------------------------------------
diff --git a/lib/tsconfig/TsConfigGrammar.c b/lib/tsconfig/TsConfigGrammar.c
index c24f1a9..c63b4d8 100644
--- a/lib/tsconfig/TsConfigGrammar.c
+++ b/lib/tsconfig/TsConfigGrammar.c
@@ -1,19 +1,19 @@
/* A Bison parser, made by GNU Bison 2.7. */
/* Bison implementation for Yacc-like parsers in C
-
+
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-
+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
@@ -26,7 +26,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/tsconfig/TsConfigGrammar.h
----------------------------------------------------------------------
diff --git a/lib/tsconfig/TsConfigGrammar.h b/lib/tsconfig/TsConfigGrammar.h
index 1700ea1..52f083b 100644
--- a/lib/tsconfig/TsConfigGrammar.h
+++ b/lib/tsconfig/TsConfigGrammar.h
@@ -1,19 +1,19 @@
/* A Bison parser, made by GNU Bison 2.7. */
/* Bison interface for Yacc-like parsers in C
-
+
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-
+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
@@ -26,7 +26,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/tsconfig/TsConfigSyntax.c
----------------------------------------------------------------------
diff --git a/lib/tsconfig/TsConfigSyntax.c b/lib/tsconfig/TsConfigSyntax.c
index 17150a1..63a0ca8 100644
--- a/lib/tsconfig/TsConfigSyntax.c
+++ b/lib/tsconfig/TsConfigSyntax.c
@@ -34,7 +34,7 @@
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
+ * if you want the limit (max/min) macros for int types.
*/
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1
@@ -51,7 +51,7 @@ typedef uint32_t flex_uint32_t;
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
@@ -181,7 +181,7 @@ typedef size_t yy_size_t;
#define EOB_ACT_LAST_MATCH 2
#define YY_LESS_LINENO(n)
-
+
/* Return all but the first "n" matched characters back to the input stream. */
#define yyless(n) \
do \
@@ -238,7 +238,7 @@ struct yy_buffer_state
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
-
+
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
@@ -484,7 +484,7 @@ static yyconst flex_int16_t yy_chk[89] =
See the License for the specific language governing permissions and
limitations under the License.
*/
-
+
# if ! (defined(__clang_analyzer__) || defined(__COVERITY__))
# include "TsConfigParseEvents.h"
@@ -568,7 +568,7 @@ static int yy_init_globals (yyscan_t yyscanner );
/* This must go here because YYSTYPE and YYLTYPE are included
* from bison output in section 1.*/
# define yylval yyg->yylval_r
-
+
int tsconfiglex_init (yyscan_t* scanner);
int tsconfiglex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
@@ -1443,7 +1443,7 @@ static void tsconfig_load_buffer_state (yyscan_t yyscanner)
YY_BUFFER_STATE tsconfig_create_buffer (FILE * file, int size , yyscan_t yyscanner)
{
YY_BUFFER_STATE b;
-
+
b = (YY_BUFFER_STATE) tsconfigalloc(sizeof( struct yy_buffer_state ) ,yyscanner );
if ( ! b )
YY_FATAL_ERROR( "out of dynamic memory in tsconfig_create_buffer()" );
@@ -1509,7 +1509,7 @@ static void tsconfig_load_buffer_state (yyscan_t yyscanner)
}
b->yy_is_interactive = 0;
-
+
errno = oerrno;
}
@@ -1615,9 +1615,9 @@ static void tsconfigensure_buffer_stack (yyscan_t yyscanner)
, yyscanner);
if ( ! yyg->yy_buffer_stack )
YY_FATAL_ERROR( "out of dynamic memory in tsconfigensure_buffer_stack()" );
-
+
memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
+
yyg->yy_buffer_stack_max = num_to_alloc;
yyg->yy_buffer_stack_top = 0;
return;
@@ -1646,12 +1646,12 @@ static void tsconfigensure_buffer_stack (yyscan_t yyscanner)
* @param base the character buffer
* @param size the size in bytes of the character buffer
* @param yyscanner The scanner object.
- * @return the newly allocated buffer state object.
+ * @return the newly allocated buffer state object.
*/
YY_BUFFER_STATE tsconfig_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner)
{
YY_BUFFER_STATE b;
-
+
if ( size < 2 ||
base[size-2] != YY_END_OF_BUFFER_CHAR ||
base[size-1] != YY_END_OF_BUFFER_CHAR )
@@ -1687,7 +1687,7 @@ YY_BUFFER_STATE tsconfig_scan_buffer (char * base, yy_size_t size , yyscan_t y
*/
YY_BUFFER_STATE tsconfig_scan_string (yyconst char * yystr , yyscan_t yyscanner)
{
-
+
return tsconfig_scan_bytes(yystr,strlen(yystr) ,yyscanner);
}
@@ -1704,7 +1704,7 @@ YY_BUFFER_STATE tsconfig_scan_bytes (yyconst char * yybytes, yy_size_t _yybyte
char *buf;
yy_size_t n;
yy_size_t i;
-
+
/* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2;
buf = (char *) tsconfigalloc(n ,yyscanner );
@@ -1772,10 +1772,10 @@ YY_EXTRA_TYPE tsconfigget_extra (yyscan_t yyscanner)
int tsconfigget_lineno (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
+
if (! YY_CURRENT_BUFFER)
return 0;
-
+
return yylineno;
}
@@ -1785,10 +1785,10 @@ int tsconfigget_lineno (yyscan_t yyscanner)
int tsconfigget_column (yyscan_t yyscanner)
{
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-
+
if (! YY_CURRENT_BUFFER)
return 0;
-
+
return yycolumn;
}
@@ -1850,7 +1850,7 @@ void tsconfigset_lineno (int line_number , yyscan_t yyscanner)
/* lineno is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER )
YY_FATAL_ERROR( "tsconfigset_lineno called with no buffer" );
-
+
yylineno = line_number;
}
@@ -1865,7 +1865,7 @@ void tsconfigset_column (int column_no , yyscan_t yyscanner)
/* column is only valid if an input buffer exists. */
if (! YY_CURRENT_BUFFER )
YY_FATAL_ERROR( "tsconfigset_column called with no buffer" );
-
+
yycolumn = column_no;
}
@@ -1960,20 +1960,20 @@ int tsconfiglex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_global
errno = EINVAL;
return 1;
}
-
+
*ptr_yy_globals = (yyscan_t) tsconfigalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
-
+
if (*ptr_yy_globals == NULL){
errno = ENOMEM;
return 1;
}
-
+
/* By setting to 0xAA, we expose bugs in
yy_init_globals. Leave at 0x00 for releases. */
memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-
+
tsconfigset_extra (yy_user_defined, *ptr_yy_globals);
-
+
return yy_init_globals ( *ptr_yy_globals );
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/tsconfig/TsErrataUtil.cc
----------------------------------------------------------------------
diff --git a/lib/tsconfig/TsErrataUtil.cc b/lib/tsconfig/TsErrataUtil.cc
index 4d72b05..fe24d50 100644
--- a/lib/tsconfig/TsErrataUtil.cc
+++ b/lib/tsconfig/TsErrataUtil.cc
@@ -82,7 +82,7 @@ vlogf(
) {
static size_t const SIZE = 8192;
char buffer[SIZE];
-
+
vsnprintf(buffer, SIZE, format, rest);
err.push(id, code, buffer);
return err;
@@ -147,7 +147,7 @@ vlogf_errno(Errata& errata, Errata::Id id, Errata::Code code, char const* format
char e_buffer[E_SIZE];
static int const T_SIZE = 8192;
char t_buffer[T_SIZE];
-
+
n = vsnprintf(t_buffer, T_SIZE, format, rest);
if (0 <= n && n < T_SIZE) { // still have room.
ATS_UNUSED_RETURN(strerror_r(e, e_buffer, E_SIZE));
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/tsconfig/TsValue.h
----------------------------------------------------------------------
diff --git a/lib/tsconfig/TsValue.h b/lib/tsconfig/TsValue.h
index aeee930..2836359 100644
--- a/lib/tsconfig/TsValue.h
+++ b/lib/tsconfig/TsValue.h
@@ -672,7 +672,7 @@ inline size_t Value::getIndex() const {
detail::ValueItem const* item = this->item();
return item ? item->_local_index : 0;
}
-
+
inline bool Value::isLiteral() const { return 0 != (detail::IS_LITERAL & detail::Type_Property[this->getType()]); }
inline bool Value::isContainer() const { return 0 != (detail::IS_CONTAINER & detail::Type_Property[this->getType()]); }
inline Value Value::getParent() const { return this->hasValue() ? Value(_config, _config._table[_vidx]._parent) : Value(); }
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/wccp/Wccp.h
----------------------------------------------------------------------
diff --git a/lib/wccp/Wccp.h b/lib/wccp/Wccp.h
index 9d073d5..4e885e5 100644
--- a/lib/wccp/Wccp.h
+++ b/lib/wccp/Wccp.h
@@ -112,7 +112,7 @@ public:
//@}
/// Service IDs of this value or less are reserved.
static uint8_t const RESERVED = 50;
-
+
/// Number of ports in component (defined by protocol).
static size_t const N_PORTS = 8;
@@ -227,7 +227,7 @@ public:
bool isConfigured() const;
/** Open a socket for communications.
-
+
If @a addr is @c INADDR_ANY then the identifying address is used.
If that is not set this method will attempt to find an arbitrary
local address and use that as the identifying address.
@@ -379,8 +379,8 @@ public:
self& setCacheAssignment(
CacheAssignmentStyle style ///< Style to use.
);
-
-
+
+
private:
Service(Cache const& cache, detail::cache::GroupData& group);
Cache m_cache; ///< Parent cache.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/wccp/WccpConfig.cc
----------------------------------------------------------------------
diff --git a/lib/wccp/WccpConfig.cc b/lib/wccp/WccpConfig.cc
index e028b72..443fa8f 100644
--- a/lib/wccp/WccpConfig.cc
+++ b/lib/wccp/WccpConfig.cc
@@ -165,7 +165,7 @@ ts::Errata::Message Service_Type_Defaulted(wccp::ServiceGroup::Type type, int li
ts::Errata::Message Service_Type_Invalid(ts::ConstBuffer const& text, int line) {
std::ostringstream out;
- out << "Service type '" << text
+ out << "Service type '" << text
<< "' at line " << line
<< " invalid. Must be \"STANDARD\" or \"DYNAMIC\""
;
@@ -249,7 +249,7 @@ ts::Errata::Message Svc_Flags_Ignored(int line) {
ts::Errata::Message Svc_Ports_Too_Many(int line, int n) {
std::ostringstream out;
out << "Excess ports ignored at line " << line
- << ". " << n << " ports specified, only"
+ << ". " << n << " ports specified, only"
<< wccp::ServiceGroup::N_PORTS << " supported."
;
return ts::Errata::Message(14, LVL_INFO, out.str());
@@ -743,7 +743,7 @@ CacheImpl::loadServicesFromFile(char const* path) {
bool gre = FORWARD_OPTS[0].m_found;
bool l2 = FORWARD_OPTS[1].m_found;
if (gre || l2) {
- svc.m_packet_forward =
+ svc.m_packet_forward =
gre
? l2 ? ServiceGroup::GRE_OR_L2 : ServiceGroup::GRE
: ServiceGroup::L2
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/wccp/WccpEndPoint.cc
----------------------------------------------------------------------
diff --git a/lib/wccp/WccpEndPoint.cc b/lib/wccp/WccpEndPoint.cc
index 4d759eb..0dcf7cb 100644
--- a/lib/wccp/WccpEndPoint.cc
+++ b/lib/wccp/WccpEndPoint.cc
@@ -38,7 +38,7 @@ namespace wccp {
# define dstaddr(x) (&(((struct in_pktinfo *)(CMSG_DATA(x)))->ipi_addr))
#else
# error "can't determine socket option"
-#endif
+#endif
// ------------------------------------------------------
Impl::GroupData::GroupData()
@@ -199,7 +199,7 @@ Impl::handleMessage() {
recv_hdr.msg_iovlen = 1;
recv_hdr.msg_control = anc_buffer;
recv_hdr.msg_controllen = ANC_BUFFER_SIZE;
-
+
n = recvmsg(m_fd, &recv_hdr, MSG_TRUNC);
if (n > BUFFER_SIZE) return -EMSGSIZE;
else if (n < 0) return -errno;
@@ -269,9 +269,9 @@ CacheImpl::GroupData::seedRouter(uint32_t addr) {
time_t
CacheImpl::GroupData::removeSeedRouter(uint32_t addr) {
time_t zret = 0;
- std::vector<SeedRouter>::iterator begin = m_seed_routers.begin();
+ std::vector<SeedRouter>::iterator begin = m_seed_routers.begin();
std::vector<SeedRouter>::iterator end = m_seed_routers.end();
- std::vector<SeedRouter>::iterator spot =
+ std::vector<SeedRouter>::iterator spot =
std::find_if(begin, end, ts::predicate(&SeedRouter::m_addr, addr));
if (end != spot) {
@@ -316,7 +316,7 @@ CacheImpl::GroupData::resizeCacheSources() {
}
}
-inline CacheImpl::RouterData::RouterData()
+inline CacheImpl::RouterData::RouterData()
: m_addr(0)
, m_generation(0)
, m_rapid(0)
@@ -648,7 +648,7 @@ CacheImpl::housekeeping() {
here_i_am.setBuffer(msg_buffer);
// Is the router due for a ping?
if (sspot->m_xmit + TIME_UNIT > now) continue; // no
-
+
this->generateHereIAm(here_i_am, group);
dst_addr.sin_addr.s_addr = sspot->m_addr;
@@ -943,7 +943,7 @@ RouterImpl::handleHereIAm(IpHeader const& ip_hdr, ts::Buffer const& chunk) {
time_t now = time(0); // don't call this over and over.
int parse = msg.parse(chunk);
- if (PARSE_SUCCESS != parse)
+ if (PARSE_SUCCESS != parse)
return log(LVL_INFO, "Ignored malformed WCCP2_HERE_I_AM message.\n");
if (!this->validateSecurity(msg, nil_group))
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/wccp/WccpLocal.h
----------------------------------------------------------------------
diff --git a/lib/wccp/WccpLocal.h b/lib/wccp/WccpLocal.h
index d039bc0..9d73d17 100644
--- a/lib/wccp/WccpLocal.h
+++ b/lib/wccp/WccpLocal.h
@@ -978,7 +978,7 @@ struct CompWithHeader : public ComponentBase {
This requires the (subclass) client to
- Do a size check to verify enough space for the component header.
- Set @a m_base
-
+
This method
- Checks the component type against the expected type (@a ect)
- Checks stored component length against the buffer size.
@@ -1604,7 +1604,7 @@ public:
/// Component type ID for this component.
static CompType const COMP_TYPE = CAPABILITY_INFO;
-
+
// Not even a stub for this component, just an array of elements.
/// Default constructor.
@@ -1799,7 +1799,7 @@ class AltMaskAssignComp
public:
typedef AltMaskAssignComp self; ///< Self reference type.
typedef AltAssignComp super; ///< Parent type.
-
+
/// Force virtual desctructor.
virtual ~AltMaskAssignComp() {}
@@ -2068,7 +2068,7 @@ namespace detail {
store one received from an extern source.
*/
detail::Assignment m_assign_info;
-
+
/// Default constructor.
GroupData();
/// Use @a key instead of global default.
@@ -2286,7 +2286,7 @@ public:
/// Default constructor.
Impl();
/** Set the local address used for this endpoint.
- If not set, an arbitrary local address will be
+ If not set, an arbitrary local address will be
@note This can only be called once, and must be called before
@c open.
*/
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/wccp/WccpMeta.h
----------------------------------------------------------------------
diff --git a/lib/wccp/WccpMeta.h b/lib/wccp/WccpMeta.h
index be85c93..a30f1c9 100644
--- a/lib/wccp/WccpMeta.h
+++ b/lib/wccp/WccpMeta.h
@@ -158,7 +158,7 @@ predicate(V (T::*m)() const, V const& v) {
# if 0
/// Accumulate a minimum value when called repeated on different objects.
-template <
+template <
typename V, ///< Value type.
typename T, ///< Object type
typename F ///< Extractor type.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/wccp/WccpMsg.cc
----------------------------------------------------------------------
diff --git a/lib/wccp/WccpMsg.cc b/lib/wccp/WccpMsg.cc
index 0ce41f6..1619538 100644
--- a/lib/wccp/WccpMsg.cc
+++ b/lib/wccp/WccpMsg.cc
@@ -441,14 +441,14 @@ SecurityComp::fill(MsgBuffer& buffer, Option opt) {
throw ts::Exception(BUFFER_TOO_SMALL_FOR_COMP_TEXT);
m_base = buffer.getTail();
-
+
this->setType(COMP_TYPE)
.setLength(comp_size - sizeof(super::raw_t))
.setOption(opt)
;
if (SECURITY_NONE != opt) {
- RawMD5::HashData& data = access_field(&RawMD5::m_data, m_base);
+ RawMD5::HashData& data = access_field(&RawMD5::m_data, m_base);
memset(data, 0, sizeof(data));
}
@@ -497,7 +497,7 @@ SecurityComp::validate(MsgBuffer const& msg) const {
int
SecurityComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
- if (buffer.getSpace() < sizeof(raw_t))
+ if (buffer.getSpace() < sizeof(raw_t))
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -568,7 +568,7 @@ int
ServiceComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
size_t comp_size = this->calcSize();
- if (buffer.getSpace() < comp_size)
+ if (buffer.getSpace() < comp_size)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -701,7 +701,7 @@ RouterIdComp::fillSingleton(
int
RouterIdComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
- if (buffer.getSpace() < sizeof(raw_t))
+ if (buffer.getSpace() < sizeof(raw_t))
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -737,7 +737,7 @@ RouterViewComp::setChangeNumber(uint32_t n) {
set_field(&raw_t::m_change_number, m_base, n);
return *this;
}
-
+
uint32_t
RouterViewComp::getCacheCount() const {
return ntohl(*m_cache_count);
@@ -806,7 +806,7 @@ RouterViewComp::fill(
int
RouterViewComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
- if (buffer.getSpace() < sizeof(raw_t))
+ if (buffer.getSpace() < sizeof(raw_t))
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -859,7 +859,7 @@ CacheIdComp::fill(MsgBuffer& base, CacheIdBox const& src) {
int
CacheIdComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
- if (buffer.getSpace() < sizeof(raw_t))
+ if (buffer.getSpace() < sizeof(raw_t))
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -890,7 +890,7 @@ CacheViewComp::setChangeNumber(uint32_t n) {
set_field(&raw_t::m_change_number, m_base, n);
return *this;
}
-
+
uint32_t
CacheViewComp::getRouterCount() const {
return get_field(&raw_t::m_router_count, m_base);
@@ -997,7 +997,7 @@ CacheViewComp::fill(
int
CacheViewComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
- if (buffer.getSpace() < sizeof(raw_t))
+ if (buffer.getSpace() < sizeof(raw_t))
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -1037,7 +1037,7 @@ AssignInfoComp::setKeyChangeNumber(uint32_t n) {
access_field(&raw_t::m_key, m_base).setChangeNumber(n);
return *this;
}
-
+
uint32_t
AssignInfoComp::getKeyAddr() const {
return access_field(&raw_t::m_key, m_base).getAddr();
@@ -1094,7 +1094,7 @@ AssignInfoComp::calcCacheCountPtr() {
AssignInfoComp::Bucket*
AssignInfoComp::calcBucketPtr() {
return reinterpret_cast<Bucket*>(reinterpret_cast<char*>(m_cache_count) + sizeof(uint32_t) * (1 + this->getCacheCount()));
-}
+}
AssignInfoComp&
AssignInfoComp::fill(
@@ -1128,7 +1128,7 @@ AssignInfoComp::fill(
int
AssignInfoComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
- if (buffer.getSpace() < HEADER_SIZE)
+ if (buffer.getSpace() < HEADER_SIZE)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -1222,7 +1222,7 @@ AltHashAssignComp::fill(
int
AltHashAssignComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
- if (buffer.getSpace() < sizeof(raw_t))
+ if (buffer.getSpace() < sizeof(raw_t))
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -1276,7 +1276,7 @@ AltMaskAssignComp::fill(
int
AltMaskAssignComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
- if (buffer.getSpace() < sizeof(raw_t))
+ if (buffer.getSpace() < sizeof(raw_t))
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -1346,7 +1346,7 @@ CmdComp::fill(MsgBuffer& buffer, cmd_t cmd, uint32_t data) {
int
CmdComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
- if (buffer.getSpace() < sizeof(raw_t))
+ if (buffer.getSpace() < sizeof(raw_t))
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -1383,17 +1383,17 @@ CapComp::cache() const {
switch (elt.getCapType()) {
case CapabilityElt::PACKET_FORWARD_METHOD:
x = elt.getCapData();
- if (0 < x && x < 4)
+ if (0 < x && x < 4)
m_packet_forward = static_cast<ServiceGroup::PacketStyle>(x);
break;
case CapabilityElt::PACKET_RETURN_METHOD:
x = elt.getCapData();
- if (0 < x && x < 4)
+ if (0 < x && x < 4)
m_packet_return = static_cast<ServiceGroup::PacketStyle>(x);
break;
case CapabilityElt::CACHE_ASSIGNMENT_METHOD:
x = elt.getCapData();
- if (0 < x && x < 4)
+ if (0 < x && x < 4)
m_cache_assign = static_cast<ServiceGroup::CacheAssignmentStyle>(x);
break;
default:
@@ -1424,7 +1424,7 @@ int
CapComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
m_cached = false;
- if (buffer.getSpace()< sizeof(raw_t))
+ if (buffer.getSpace()< sizeof(raw_t))
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -1441,7 +1441,7 @@ CapComp::parse(MsgBuffer& buffer) {
int
QueryComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
- if (buffer.getSpace()< sizeof(raw_t))
+ if (buffer.getSpace()< sizeof(raw_t))
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -1483,7 +1483,7 @@ AssignMapComp::fill(MsgBuffer& buffer, detail::Assignment const& assign) {
int
AssignMapComp::parse(MsgBuffer& buffer) {
int zret = PARSE_SUCCESS;
- if (buffer.getSpace() < HEADER_SIZE)
+ if (buffer.getSpace() < HEADER_SIZE)
zret = PARSE_BUFFER_TOO_SMALL;
else {
m_base = buffer.getTail();
@@ -1535,7 +1535,7 @@ detail::Assignment::fill(cache::GroupData& group, uint32_t addr) {
// the hash assignment, we can compute reasonable upper bounds and so
// we don't have to do space checks when those get filled out.
// The mask assignment is more difficult. We just guess generously and
- // try to recover if we go over.
+ // try to recover if we go over.
size_t size = RouterAssignListElt::calcSize(n_routers) + HashAssignElt::calcSize(n_caches) + 4096;
if (m_buffer.getSize() < size) {
@@ -1572,7 +1572,7 @@ detail::Assignment::fill(cache::GroupData& group, uint32_t addr) {
size_t k = m_router_list->getSize();
m_buffer.use(k);
m_hash_assign = reinterpret_cast<HashAssignElt*>(m_buffer.getTail());
-
+
// If the nr value is 0, then the cache was not included in any
// last packet, so it should be discarded. A cache is valid if
// nr is n_routers, indicating that every router mentioned it.
@@ -1640,11 +1640,11 @@ HereIAmMsg::fill_caps(
) {
if (router.m_send_caps) {
m_capabilities.fill(m_buffer, 3);
- m_capabilities.elt(0) =
+ m_capabilities.elt(0) =
CapabilityElt(CapabilityElt::PACKET_FORWARD_METHOD, router.m_packet_forward);
- m_capabilities.elt(1) =
+ m_capabilities.elt(1) =
CapabilityElt(CapabilityElt::CACHE_ASSIGNMENT_METHOD, router.m_cache_assign);
- m_capabilities.elt(2) =
+ m_capabilities.elt(2) =
CapabilityElt(CapabilityElt::PACKET_RETURN_METHOD, router.m_packet_return);
}
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/wccp/WccpStatic.cc
----------------------------------------------------------------------
diff --git a/lib/wccp/WccpStatic.cc b/lib/wccp/WccpStatic.cc
index bcb06a8..db26418 100644
--- a/lib/wccp/WccpStatic.cc
+++ b/lib/wccp/WccpStatic.cc
@@ -118,7 +118,7 @@ vlogf(
) {
static size_t const SIZE = 8192;
char buffer[SIZE];
-
+
vsnprintf(buffer, SIZE, format, rest);
err.push(id, code, buffer);
return err;
@@ -169,7 +169,7 @@ vlogf_errno(ts::Errata::Code code, char const* format, va_list& rest) {
char e_buffer[E_SIZE];
static int const T_SIZE = 8192;
char t_buffer[T_SIZE];
-
+
n = vsnprintf(t_buffer, T_SIZE, format, rest);
if (0 <= n && n < T_SIZE) { // still have room.
ATS_UNUSED_RETURN(strerror_r(e, e_buffer, E_SIZE));
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/lib/wccp/wccp-test-router.cc
----------------------------------------------------------------------
diff --git a/lib/wccp/wccp-test-router.cc b/lib/wccp/wccp-test-router.cc
index 43fa70e..731cd41 100644
--- a/lib/wccp/wccp-test-router.cc
+++ b/lib/wccp/wccp-test-router.cc
@@ -153,5 +153,5 @@ main(int argc, char** argv) {
wcp.sendPendingMessages();
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/mgmt/Rollback.cc
----------------------------------------------------------------------
diff --git a/mgmt/Rollback.cc b/mgmt/Rollback.cc
index cef1fa0..9243043 100644
--- a/mgmt/Rollback.cc
+++ b/mgmt/Rollback.cc
@@ -1,6 +1,6 @@
/** @file
- This file contains code for class to allow rollback of configuration files
+ This file contains code for class to allow rollback of configuration files
@section license License
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/mgmt/api/TSControlMain.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/TSControlMain.cc b/mgmt/api/TSControlMain.cc
index 474918f..7810445 100644
--- a/mgmt/api/TSControlMain.cc
+++ b/mgmt/api/TSControlMain.cc
@@ -879,7 +879,7 @@ handle_diags(int /* fd */, void * req, size_t reqlen)
TSMgmtError ret;
DiagsLevel level;
- MgmtMarshallInt optype;
+ MgmtMarshallInt optype;
MgmtMarshallInt mode;
MgmtMarshallString msg = NULL;
@@ -938,7 +938,7 @@ handle_diags(int /* fd */, void * req, size_t reqlen)
static TSMgmtError
handle_stats_reset(int fd, void * req, size_t reqlen)
{
- MgmtMarshallInt optype;
+ MgmtMarshallInt optype;
MgmtMarshallString name = NULL;
MgmtMarshallInt err;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/mgmt/web2/WebHttp.cc
----------------------------------------------------------------------
diff --git a/mgmt/web2/WebHttp.cc b/mgmt/web2/WebHttp.cc
index b69cf1f..91d99aa 100644
--- a/mgmt/web2/WebHttp.cc
+++ b/mgmt/web2/WebHttp.cc
@@ -625,6 +625,6 @@ WebHttpAddDocRoot_Xmalloc(WebHttpContext * whc, const char *file, int file_len)
*(doc_root_file + whc->doc_root_len + file_len) = '\0';
Debug("web2", "DocRoot request file: %s", doc_root_file);
-
+
return doc_root_file;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/conf_remap/conf_remap.cc
----------------------------------------------------------------------
diff --git a/plugins/conf_remap/conf_remap.cc b/plugins/conf_remap/conf_remap.cc
index 4a260ec..3120fbb 100644
--- a/plugins/conf_remap/conf_remap.cc
+++ b/plugins/conf_remap/conf_remap.cc
@@ -179,7 +179,7 @@ RemapConfigs::parse_file(const char* filename)
TSError("%s: file %s, line %d: no records.config name given", PLUGIN_NAME, path.c_str(), line_num);
continue;
}
-
+
// Find the type (INT or STRING only)
tok = strtok_r(NULL, " \t", &ln);
if (TS_RECORDDATATYPE_NULL == (type = str_to_datatype(tok))) {
@@ -273,7 +273,7 @@ TSRemapNewInstance(int argc, char* argv[], void** ih, char* /* errbuf ATS_UNUSED
TSError("Unable to create remap instance, need configuration file");
return TS_ERROR;
}
-
+
RemapConfigs* conf = new(RemapConfigs);
for (int i = 2; i < argc; ++i) {
@@ -342,7 +342,7 @@ TSRemapDoRemap(void* ih, TSHttpTxn rh, TSRemapRequestInfo* /* rri ATS_UNUSED */)
}
-
+
/*
local variables:
mode: C++
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_base_fetch.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_base_fetch.cc b/plugins/experimental/ats_pagespeed/ats_base_fetch.cc
index 0d53252..87f2b61 100644
--- a/plugins/experimental/ats_pagespeed/ats_base_fetch.cc
+++ b/plugins/experimental/ats_pagespeed/ats_base_fetch.cc
@@ -104,7 +104,7 @@ void AtsBaseFetch::HandleHeadersComplete() {
}
void AtsBaseFetch::ForwardData(const StringPiece& sp, bool reenable, bool last) {
- if (is_ipro_) {
+ if (is_ipro_) {
TSDebug("ats-speed", "ipro forwarddata: %.*s", (int)sp.size(), sp.data());
buffer_.append(sp.data(), sp.size());
return;
@@ -129,34 +129,34 @@ void AtsBaseFetch::ForwardData(const StringPiece& sp, bool reenable, bool last)
if (last) {
TSVIONBytesSet(downstream_vio_, downstream_length_);
}
- if (reenable) {
+ if (reenable) {
TSVIOReenable(downstream_vio_);
}
}
Unlock();
}
-void AtsBaseFetch::HandleDone(bool success) {
+void AtsBaseFetch::HandleDone(bool success) {
// When this is an IPRO lookup:
// if we've got a 200 result, store the data and setup an intercept
- // to write it out.
+ // to write it out.
// Regardless, re-enable the transaction at this point.
//TODO(oschaaf): what about no success?
- if (is_ipro_) {
+ if (is_ipro_) {
TSDebug("ats-speed", "ipro lookup base fetch done()");
done_called_ = true;
int status_code = response_headers()->status_code();
bool status_ok = (status_code != 0) && (status_code < 400);
- if (status_code == CacheUrlAsyncFetcher::kNotInCacheStatus) {
+ if (status_code == CacheUrlAsyncFetcher::kNotInCacheStatus) {
TSDebug("ats-speed", "ipro lookup base fetch -> not found in cache");
ctx_->record_in_place = true;
TSHttpTxnReenable(ctx_->txn, TS_EVENT_HTTP_CONTINUE);
ctx_ = NULL;
DecrefAndDeleteIfUnreferenced();
return;
- } else if (!status_ok) {
+ } else if (!status_ok) {
TSDebug("ats-speed", "ipro lookup base fetch -> ipro cache entry says not applicable");
TSHttpTxnReenable(ctx_->txn, TS_EVENT_HTTP_CONTINUE);
ctx_ = NULL;
@@ -178,7 +178,7 @@ void AtsBaseFetch::HandleDone(bool success) {
TSHttpTxnReenable(txn, TS_EVENT_HTTP_CONTINUE);
return;
}
-
+
TSCont interceptCont = TSContCreate((int (*)(tsapi_cont*, TSEvent, void*))ipro_callback_, TSMutexCreate());
InterceptCtx *intercept_ctx = new InterceptCtx();
intercept_ctx->request_ctx = ctx;
@@ -187,7 +187,7 @@ void AtsBaseFetch::HandleDone(bool success) {
copy_request_headers_to_psol(reqp, req_hdr_loc, intercept_ctx->request_headers);
TSHandleMLocRelease(reqp, TS_NULL_MLOC, req_hdr_loc);
-
+
TSContDataSet(interceptCont, intercept_ctx);
// TODO(oschaaf): when we serve an IPRO optimized asset, that will be handled
// by the resource intercept. Which means we should set TXN_INDEX_OWNED_ARG to
@@ -209,7 +209,7 @@ void AtsBaseFetch::HandleDone(bool success) {
Lock();
done_called_ = true;
ForwardData("", true, true);
-
+
DecrefAndDeleteIfUnreferenced();
// TODO(oschaaf): we aren't safe to touch the associated mutex,
// right? FIX.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_base_fetch.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_base_fetch.h b/plugins/experimental/ats_pagespeed/ats_base_fetch.h
index 96e49ed..e11628c 100644
--- a/plugins/experimental/ats_pagespeed/ats_base_fetch.h
+++ b/plugins/experimental/ats_pagespeed/ats_base_fetch.h
@@ -53,7 +53,7 @@ public:
TSVIO downstream_vio,
TSIOBuffer downstream_buffer,
bool is_resource_fetch);
-
+
virtual ~AtsBaseFetch();
void Release();
void set_handle_error(bool x) { handle_error_ = x; }
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_beacon_intercept.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_beacon_intercept.cc b/plugins/experimental/ats_pagespeed/ats_beacon_intercept.cc
index 88cf016..4a1141f 100644
--- a/plugins/experimental/ats_pagespeed/ats_beacon_intercept.cc
+++ b/plugins/experimental/ats_pagespeed/ats_beacon_intercept.cc
@@ -68,7 +68,7 @@ struct InterceptCtx {
bool req_hdr_parsed;
bool initialized;
TransformCtx* request_context;
- InterceptCtx(TSCont cont)
+ InterceptCtx(TSCont cont)
: net_vc(0), contp(cont), input(), output(), body(""), req_content_len(0), req_hdr_bufp(0), req_hdr_loc(0),
req_hdr_parsed(false), initialized(false) {
http_parser = TSHttpParserCreate();
@@ -80,7 +80,7 @@ struct InterceptCtx {
~InterceptCtx() {
TSDebug(DEBUG_TAG, "[%s] Destroying continuation data", __FUNCTION__);
- TSHttpParserDestroy(http_parser);
+ TSHttpParserDestroy(http_parser);
if (req_hdr_loc) {
TSHandleMLocRelease(req_hdr_bufp, TS_NULL_MLOC, req_hdr_loc);
}
@@ -101,7 +101,7 @@ InterceptCtx::init(TSVConn vconn)
TSError("[%s] InterceptCtx already initialized!", __FUNCTION__);
return false;
}
-
+
net_vc = vconn;
input.buffer = TSIOBufferCreate();
@@ -143,7 +143,7 @@ handleRead(InterceptCtx *cont_data, bool &read_complete) {
TSError("[%s] Error while getting number of bytes available", __FUNCTION__);
return false;
}
-
+
TSDebug(DEBUG_TAG, "[%s] Parsed header, avail: %d", __FUNCTION__, avail);
int consumed = 0;
@@ -160,7 +160,7 @@ handleRead(InterceptCtx *cont_data, bool &read_complete) {
TSDebug(DEBUG_TAG, "[%s] Parsed header", __FUNCTION__);
TSMLoc content_len_loc = TSMimeHdrFieldFind(cont_data->req_hdr_bufp, cont_data->req_hdr_loc,
TS_MIME_FIELD_CONTENT_LENGTH, -1);
-
+
/*if (!content_len_loc) {
TSError("[%s] Error while searching content length header [%s]",
__FUNCTION__, TS_MIME_FIELD_CONTENT_LENGTH);
@@ -197,11 +197,11 @@ handleRead(InterceptCtx *cont_data, bool &read_complete) {
block = TSIOBufferBlockNext(block);
}
}
-
+
TSIOBufferReaderConsume(cont_data->input.reader, consumed);
TSDebug(DEBUG_TAG, "[%s] Consumed %d bytes from input vio, avail: %d", __FUNCTION__, consumed, avail);
-
+
// Modify the input VIO to reflect how much data we've completed.
TSVIONDoneSet(cont_data->input.vio, TSVIONDoneGet(cont_data->input.vio) + consumed);
@@ -221,7 +221,7 @@ static bool
processRequest(InterceptCtx *cont_data) {
// OS: Looks like on 5.x we sometimes receive read complete / EOS events twice,
// which needs looking into. Probably this intercept is doing something it shouldn't
- if (cont_data->output.buffer) {
+ if (cont_data->output.buffer) {
TSDebug("ats_pagespeed", "Received read complete / EOS twice?!");
return true;
}
@@ -241,19 +241,19 @@ processRequest(InterceptCtx *cont_data) {
StringPiece query_param_beacon_data;
ps_query_params_handler(cont_data->request_context->url_string->c_str(), &query_param_beacon_data);
-
+
GoogleString beacon_data = net_instaweb::StrCat(
query_param_beacon_data, "&", cont_data->body);
ServerContext* server_context = cont_data->request_context->server_context;
-
- SystemRequestContext* system_request_context =
+
+ SystemRequestContext* system_request_context =
new SystemRequestContext(server_context->thread_system()->NewMutex(),
server_context->timer(),
// TODO(oschaaf): determine these for real.
"www.foo.com",
80,
"127.0.0.1");
-
+
if (!server_context->HandleBeacon(
beacon_data,
cont_data->request_context->user_agent->c_str(),
@@ -262,7 +262,7 @@ processRequest(InterceptCtx *cont_data) {
} else {
TSDebug(DEBUG_TAG, "Beacon post data processed OK: [%s]", beacon_data.c_str());
}
-
+
cont_data->setupWrite();
if (TSIOBufferWrite(cont_data->output.buffer, reply_header.data(), reply_header.size()) == TS_ERROR) {
TSError("[%s] Error while writing reply header", __FUNCTION__);
@@ -276,7 +276,7 @@ processRequest(InterceptCtx *cont_data) {
int total_bytes_written = reply_header.size() + body_size;
TSDebug(DEBUG_TAG, "[%s] Wrote reply of size %d", __FUNCTION__, total_bytes_written);
TSVIONBytesSet(cont_data->output.vio, total_bytes_written);
-
+
TSVIOReenable(cont_data->output.vio);
return true;
}
@@ -320,7 +320,7 @@ txn_intercept(TSCont contp, TSEvent event, void *edata) {
break;
case TS_EVENT_ERROR:
// todo: do some error handling here
- TSDebug(DEBUG_TAG, "[%s] Received error event; going to shutdown, event: %d", __FUNCTION__, event);
+ TSDebug(DEBUG_TAG, "[%s] Received error event; going to shutdown, event: %d", __FUNCTION__, event);
TSError("[%s] Received error event; going to shutdown, event: %d", __FUNCTION__, event);
shutdown = true;
break;
@@ -343,7 +343,7 @@ txn_intercept(TSCont contp, TSEvent event, void *edata) {
}
delete cont_data;
TSContDestroy(contp);
- }
+ }
return 1;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_config.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_config.cc b/plugins/experimental/ats_pagespeed/ats_config.cc
index e0adf42..f72c3db 100644
--- a/plugins/experimental/ats_pagespeed/ats_config.cc
+++ b/plugins/experimental/ats_pagespeed/ats_config.cc
@@ -167,7 +167,7 @@ bool AtsConfig::Parse(const char * path ) {
if (line[0] == '#') {
continue;
}
-
+
vector<string> v = tokenize( line, isspace );
if (v.size() == 0)
continue;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_config.h
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_config.h b/plugins/experimental/ats_pagespeed/ats_config.h
index d3b0e40..ca03993 100644
--- a/plugins/experimental/ats_pagespeed/ats_config.h
+++ b/plugins/experimental/ats_pagespeed/ats_config.h
@@ -64,7 +64,7 @@ class AtsConfig {
public:
explicit AtsConfig(AtsThreadSystem* thread_system);
virtual ~AtsConfig();
-
+
// TODO(oschaaf): destructor??
bool Parse(const char * path);
AtsHostConfig * Find(const char * host, int host_length);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_header_utils.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_header_utils.cc b/plugins/experimental/ats_pagespeed/ats_header_utils.cc
index a61c784..c7b5165 100644
--- a/plugins/experimental/ats_pagespeed/ats_header_utils.cc
+++ b/plugins/experimental/ats_pagespeed/ats_header_utils.cc
@@ -79,7 +79,7 @@ void set_header(TSMBuffer bufp, TSMLoc hdr_loc, const char * header_name, const
if (field_loc) {
TSMimeHdrFieldValueStringSet(bufp, hdr_loc, field_loc, -1, header_value, -1);
- } else {
+ } else {
if ( TSMimeHdrFieldCreate(bufp, hdr_loc, &field_loc) == TS_SUCCESS ) {
TSMimeHdrFieldNameSet(bufp, hdr_loc, field_loc, header_name, -1);
TSMimeHdrFieldAppend(bufp, hdr_loc, field_loc);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ab5ba9a8/plugins/experimental/ats_pagespeed/ats_message_handler.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/ats_pagespeed/ats_message_handler.cc b/plugins/experimental/ats_pagespeed/ats_message_handler.cc
index 370f317..15811bc 100644
--- a/plugins/experimental/ats_pagespeed/ats_message_handler.cc
+++ b/plugins/experimental/ats_pagespeed/ats_message_handler.cc
@@ -33,7 +33,7 @@
#include "net/instaweb/public/version.h"
#include "pagespeed/kernel/base/posix_timer.h"
#include "pagespeed/kernel/base/time_util.h"
-
+
namespace {
@@ -67,10 +67,10 @@ void AtsMessageHandler::set_buffer(SharedCircularBuffer* buff) {
void AtsMessageHandler::MessageVImpl(MessageType type, const char* msg,
va_list args) {
GoogleString formatted_message = Format(msg, args);
-
+
TSDebug("ats-speed", "[%s %s] %s", kModuleName, kModPagespeedVersion,
formatted_message.c_str());
-
+
// Prepare a log message for the SharedCircularBuffer only.
// Prepend time and severity to message.
// Format is [time] [severity] [pid] message.
@@ -80,7 +80,7 @@ void AtsMessageHandler::MessageVImpl(MessageType type, const char* msg,
if (!ConvertTimeToString(timer.NowMs(), &time)) {
time = "?";
}
-
+
StrAppend(&message, "[", time, "] ",
"[", MessageTypeToString(type), "] ");
StrAppend(&message, pid_string_, " ", formatted_message, "\n");