Repository: trafficserver Updated Branches: refs/heads/master 133653bbf -> 4283af481
Fix build errors. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/4283af48 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4283af48 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4283af48 Branch: refs/heads/master Commit: 4283af481b148967b6675bf7b3d778700f6b76dd Parents: 133653b Author: Alan M. Carroll <[email protected]> Authored: Wed Sep 24 23:34:05 2014 -0500 Committer: Alan M. Carroll <[email protected]> Committed: Wed Sep 24 23:34:05 2014 -0500 ---------------------------------------------------------------------- example/ssl-sni/ssl-sni.cc | 12 +++++++++++- plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc | 1 - 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4283af48/example/ssl-sni/ssl-sni.cc ---------------------------------------------------------------------- diff --git a/example/ssl-sni/ssl-sni.cc b/example/ssl-sni/ssl-sni.cc index d1aa856..fb31f6b 100644 --- a/example/ssl-sni/ssl-sni.cc +++ b/example/ssl-sni/ssl-sni.cc @@ -10,8 +10,8 @@ # include <memory.h> # include <inttypes.h> # include <ts/ts.h> +# include <ink_config.h> # include <tsconfig/TsValue.h> -# include <alloca.h> # include <openssl/ssl.h> using ts::config::Configuration; @@ -20,6 +20,8 @@ using ts::config::Value; # define PN "ssl-sni-test" # define PCP "[" PN " Plugin] " +# if TS_USE_TLS_SNI + namespace { std::string ConfigPath; @@ -160,3 +162,11 @@ TSPluginInit(int argc, const char *argv[]) { return; } +# else // ! TS_USE_TLS_SNI + +void +TSPluginInit(int, const char *[]) { + TSError(PCP "requires TLS SNI which is not available."); +} + +# endif // TS_USE_TLS_SNI http://git-wip-us.apache.org/repos/asf/trafficserver/blob/4283af48/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 396e65a..a211d7c 100644 --- a/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc +++ b/plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc @@ -548,4 +548,3 @@ TSPluginInit(int, const char *[]) { } # endif // TS_USE_TLS_SNI -
