Repository: trafficserver Updated Branches: refs/heads/master bd4fa4775 -> 17ae8069a
TS-2367: Couple fixes to make builds happy Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/17ae8069 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/17ae8069 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/17ae8069 Branch: refs/heads/master Commit: 17ae8069acb908fece508e323c791e52a8c91a3c Parents: bd4fa47 Author: Bryan Call <bc...@apache.org> Authored: Fri Aug 1 11:33:07 2014 -0700 Committer: Bryan Call <bc...@apache.org> Committed: Fri Aug 1 11:33:07 2014 -0700 ---------------------------------------------------------------------- iocore/net/P_OCSPStapling.h | 2 ++ iocore/net/SSLNetProcessor.cc | 1 + 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/17ae8069/iocore/net/P_OCSPStapling.h ---------------------------------------------------------------------- diff --git a/iocore/net/P_OCSPStapling.h b/iocore/net/P_OCSPStapling.h index d036651..5d414e8 100644 --- a/iocore/net/P_OCSPStapling.h +++ b/iocore/net/P_OCSPStapling.h @@ -24,6 +24,7 @@ #include <openssl/ssl.h> +#ifdef sk_OPENSSL_STRING_pop #ifdef SSL_CTX_set_tlsext_status_cb #define HAVE_OPENSSL_OCSP_STAPLING 1 void ssl_stapling_ex_init(); @@ -31,5 +32,6 @@ void ocsp_update(); int ssl_callback_ocsp_stapling(SSL *); #endif /* SSL_CTX_set_tlsext_status_cb */ +#endif /* sk_OPENSSL_STRING_pop */ #endif /* __P_OCSPSTAPLING_H__ */ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/17ae8069/iocore/net/SSLNetProcessor.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNetProcessor.cc b/iocore/net/SSLNetProcessor.cc index 5c2d8cc..b8e72fd 100644 --- a/iocore/net/SSLNetProcessor.cc +++ b/iocore/net/SSLNetProcessor.cc @@ -39,6 +39,7 @@ struct OCSPContinuation:public Continuation { int mainEvent(int /* event ATS_UNUSED */, Event *e) { + (void)e; ocsp_update(); return EVENT_CONT;