You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2015/02/03 22:25:03 UTC
[1/2] trafficserver git commit: TS-3287: fix array comparison to NULL
errors
Repository: trafficserver
Updated Branches:
refs/heads/master 84e44deb4 -> 2d77660a2
TS-3287: fix array comparison to NULL errors
Coverity CID #1214711
Coverity CID #1216304
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2d77660a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2d77660a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2d77660a
Branch: refs/heads/master
Commit: 2d77660a266e72b9954d846f1a066ca6a926c036
Parents: 6072c21
Author: James Peach <jp...@apache.org>
Authored: Wed Jan 28 13:45:41 2015 -0800
Committer: James Peach <jp...@apache.org>
Committed: Tue Feb 3 13:24:41 2015 -0800
----------------------------------------------------------------------
plugins/experimental/ts_lua/ts_lua_util.c | 2 +-
plugins/experimental/url_sig/url_sig.c | 15 ++++++---------
2 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2d77660a/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 868618d..658b6ab 100644
--- a/plugins/experimental/ts_lua/ts_lua_util.c
+++ b/plugins/experimental/ts_lua/ts_lua_util.c
@@ -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 (strlen(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);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2d77660a/plugins/experimental/url_sig/url_sig.c
----------------------------------------------------------------------
diff --git a/plugins/experimental/url_sig/url_sig.c b/plugins/experimental/url_sig/url_sig.c
index 0adf23c..0644fd3 100644
--- a/plugins/experimental/url_sig/url_sig.c
+++ b/plugins/experimental/url_sig/url_sig.c
@@ -71,12 +71,7 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char *errbuf, int errbuf_s
struct config *cfg;
cfg = TSmalloc(sizeof(struct config));
- *ih = (void *) cfg;
-
- int i = 0;
- for (i = 0; i < MAX_KEY_NUM; i++) {
- cfg->keys[i][0] = '\0';
- }
+ memset(cfg, 0, sizeof(struct config));
if (argc != 3) {
snprintf(errbuf, errbuf_size - 1,
@@ -187,11 +182,13 @@ TSRemapNewInstance(int argc, char *argv[], void **ih, char *errbuf, int errbuf_s
}
- for (i = 0; i < MAX_KEY_NUM; i++) {
- if (cfg->keys[i] != NULL && strlen(cfg->keys[i]) > 0)
- TSDebug(PLUGIN_NAME, "shared secret key[%d] = %s\n", i, cfg->keys[i]);
+ for (unsigned i = 0; i < MAX_KEY_NUM; i++) {
+ if (strlen(cfg->keys[i]) > 0)
+ TSDebug(PLUGIN_NAME, "shared secret key[%i] = %s\n", i, cfg->keys[i]);
}
fclose(file);
+
+ *ih = (void *) cfg;
return TS_SUCCESS;
}
[2/2] trafficserver git commit: TS-3319: fix a build warning
Posted by jp...@apache.org.
TS-3319: fix a build warning
Fix an unused variable warning. Rename to setSslHandshakeCallbacks
match the naming conventions in this file.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6072c213
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6072c213
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6072c213
Branch: refs/heads/master
Commit: 6072c213f6b6474a2c1e75427891201b1cb5fe5e
Parents: 84e44de
Author: James Peach <jp...@apache.org>
Authored: Tue Feb 3 13:23:28 2015 -0800
Committer: James Peach <jp...@apache.org>
Committed: Tue Feb 3 13:24:41 2015 -0800
----------------------------------------------------------------------
iocore/net/SSLUtils.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6072c213/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index afdf8e9..2314b38 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -1680,7 +1680,7 @@ ssl_callback_info(const SSL *ssl, int where, int ret)
}
static void
-setSslHandshakeCallbacks(SSL_CTX *ctx) {
+ssl_set_handshake_callbacks(SSL_CTX *ctx) {
#if TS_USE_TLS_SNI
// Make sure the callbacks are set
#if OPENSSL_VERSION_NUMBER >= 0x1000200fL
@@ -1721,7 +1721,7 @@ ssl_store_ssl_context(
if (strcmp(sslMultCertSettings.addr, "*") == 0) {
if (lookup->insert(sslMultCertSettings.addr, SSLCertContext(ctx, sslMultCertSettings.opt)) >= 0) {
lookup->ssl_default = ctx;
- setSslHandshakeCallbacks(ctx);
+ ssl_set_handshake_callbacks(ctx);
}
} else {
IpEndpoint ep;
@@ -1916,7 +1916,7 @@ SSLParseCertificateConfiguration(const SSLConfigParams * params, SSLCertLookup *
if (lookup->ssl_default == NULL) {
ssl_user_config sslMultiCertSettings;
sslMultiCertSettings.addr = ats_strdup("*");
- SSL_CTX *ctx = ssl_store_ssl_context(params, lookup, sslMultiCertSettings);
+ ssl_store_ssl_context(params, lookup, sslMultiCertSettings);
}
return true;
}