Repository: trafficserver Updated Branches: refs/heads/master b7d839157 -> 2e1ca045e
TS-3382: update CHANGES Ran clang-format Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2e1ca045 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2e1ca045 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2e1ca045 Branch: refs/heads/master Commit: 2e1ca045ea0d8ed10949b8f4f823b7c18e75d109 Parents: b7d8391 Author: shinrich <[email protected]> Authored: Thu Jun 4 14:40:53 2015 -0500 Committer: shinrich <[email protected]> Committed: Thu Jun 4 14:40:53 2015 -0500 ---------------------------------------------------------------------- CHANGES | 2 ++ cmd/traffic_manager/traffic_manager.cc | 33 ++++++++++++++--------------- iocore/net/SSLUtils.cc | 4 ++-- proxy/spdy/SpdyClientSession.cc | 2 +- 4 files changed, 21 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2e1ca045/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 6356444..a4c58e5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 6.0.0 + *) [TS-3382] Add support for CRYPTO_THREADID to support openssl 1.1 + *) [TS-3378] SpdyRequest used after free() *) [TS-3664] WebSockets attempts a cache lookup and blocks on multiple requests http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2e1ca045/cmd/traffic_manager/traffic_manager.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_manager/traffic_manager.cc b/cmd/traffic_manager/traffic_manager.cc index 55bb9d3..9da4d99 100644 --- a/cmd/traffic_manager/traffic_manager.cc +++ b/cmd/traffic_manager/traffic_manager.cc @@ -75,7 +75,7 @@ static char debug_tags[1024] = ""; static char action_tags[1024] = ""; static bool proxy_off = false; -static const char * mgmt_path = NULL; +static const char *mgmt_path = NULL; // By default, set the current directory as base static const char *recs_conf = "records.config"; @@ -380,11 +380,10 @@ main(int argc, const char **argv) // Before accessing file system initialize Layout engine Layout::create(); - mgmt_path = Layout::get()->sysconfdir; + mgmt_path = Layout::get()->sysconfdir; // Set up the application version info - appVersionInfo.setup(PACKAGE_NAME,"traffic_manager", PACKAGE_VERSION, - __DATE__, __TIME__, BUILD_MACHINE, BUILD_PERSON, ""); + appVersionInfo.setup(PACKAGE_NAME, "traffic_manager", PACKAGE_VERSION, __DATE__, __TIME__, BUILD_MACHINE, BUILD_PERSON, ""); bool found = false; int just_started = 0; @@ -401,21 +400,21 @@ main(int argc, const char **argv) ink_thread webThrId; ArgumentDescription argument_descriptions[] = { - { "proxyOff", '-', "Disable proxy", "F", &proxy_off, NULL, NULL }, - { "aconfPort", '-', "Autoconf port", "I", &aconf_port_arg, "MGMT_ACONF_PORT", NULL }, - { "clusterMCPort", '-', "Cluster multicast port", "I", &cluster_mcport , "MGMT_CLUSTER_MC_PORT", NULL }, - { "clusterRSPort", '-', "Cluster reliable service port", "I", &cluster_rsport , "MGMT_CLUSTER_RS_PORT", NULL }, - { "groupAddr", '-', "Multicast group address", "S*", &group_addr, "MGMT_GROUP_ADDR", NULL }, - { "path", '-', "Path to the management socket", "S*", &mgmt_path, NULL, NULL }, - { "recordsConf", '-', "Path to records.config", "S*", &recs_conf, NULL, NULL }, - { "tsArgs", '-', "Additional arguments for traffic_server", "S*", &tsArgs, NULL, NULL }, - { "proxyPort", '-', "HTTP port descriptor", "S*", &proxy_port, NULL, NULL }, - { "proxyBackDoor", '-', "Management port", "I", &proxy_backdoor, NULL, NULL }, + {"proxyOff", '-', "Disable proxy", "F", &proxy_off, NULL, NULL}, + {"aconfPort", '-', "Autoconf port", "I", &aconf_port_arg, "MGMT_ACONF_PORT", NULL}, + {"clusterMCPort", '-', "Cluster multicast port", "I", &cluster_mcport, "MGMT_CLUSTER_MC_PORT", NULL}, + {"clusterRSPort", '-', "Cluster reliable service port", "I", &cluster_rsport, "MGMT_CLUSTER_RS_PORT", NULL}, + {"groupAddr", '-', "Multicast group address", "S*", &group_addr, "MGMT_GROUP_ADDR", NULL}, + {"path", '-', "Path to the management socket", "S*", &mgmt_path, NULL, NULL}, + {"recordsConf", '-', "Path to records.config", "S*", &recs_conf, NULL, NULL}, + {"tsArgs", '-', "Additional arguments for traffic_server", "S*", &tsArgs, NULL, NULL}, + {"proxyPort", '-', "HTTP port descriptor", "S*", &proxy_port, NULL, NULL}, + {"proxyBackDoor", '-', "Management port", "I", &proxy_backdoor, NULL, NULL}, #if TS_USE_DIAGS - { "debug", 'T', "Vertical-bar-separated Debug Tags", "S1023", debug_tags, NULL, NULL}, - { "action", 'B', "Vertical-bar-separated Behavior Tags", "S1023", action_tags, NULL, NULL}, + {"debug", 'T', "Vertical-bar-separated Debug Tags", "S1023", debug_tags, NULL, NULL}, + {"action", 'B', "Vertical-bar-separated Behavior Tags", "S1023", action_tags, NULL, NULL}, #endif - { "nosyslog", '-', "Do not log to syslog", "F", &disable_syslog, NULL, NULL }, + {"nosyslog", '-', "Do not log to syslog", "F", &disable_syslog, NULL, NULL}, HELP_ARGUMENT_DESCRIPTION(), VERSION_ARGUMENT_DESCRIPTION() }; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2e1ca045/iocore/net/SSLUtils.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc index be44495..2a31523 100644 --- a/iocore/net/SSLUtils.cc +++ b/iocore/net/SSLUtils.cc @@ -132,7 +132,7 @@ static InkHashTable *ssl_cipher_name_table = NULL; */ static void -SSL_pthreads_thread_id(CRYPTO_THREADID* id) +SSL_pthreads_thread_id(CRYPTO_THREADID *id) { CRYPTO_THREADID_set_numeric(id, (unsigned long)pthread_self()); } @@ -1220,7 +1220,7 @@ SSLInitServerContext(const SSLConfigParams *params, const ssl_user_config &sslMu ats_scoped_str completeServerCertPath; SSL_CTX *ctx = SSLDefaultServerContext(); EVP_MD_CTX digest; - STACK_OF(X509_NAME) * ca_list = NULL; + STACK_OF(X509_NAME) *ca_list = NULL; unsigned char hash_buf[EVP_MAX_MD_SIZE]; unsigned int hash_len = 0; char const *setting_cert = sslMultCertSettings.cert.get(); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2e1ca045/proxy/spdy/SpdyClientSession.cc ---------------------------------------------------------------------- diff --git a/proxy/spdy/SpdyClientSession.cc b/proxy/spdy/SpdyClientSession.cc index 963ab03..4317d9a 100644 --- a/proxy/spdy/SpdyClientSession.cc +++ b/proxy/spdy/SpdyClientSession.cc @@ -70,7 +70,7 @@ SpdyRequest::clear() if (fetch_sm) { // Clear the UserData just in case fetch_sm's - // death is delayed. Don't want freed requests + // death is delayed. Don't want freed requests // showing up in callbacks TSFetchUserDataSet(fetch_sm, NULL); TSFetchDestroy(fetch_sm);
