Merge branch 'sunpoet-master'

e6798740 · Tatsuhiro Tsujikawa · a151a44c · 90b5a585 · e6798740
Commit e6798740 authored Dec 04, 2015 by Tatsuhiro Tsujikawa
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

src/asio_common.cc src/asio_common.cc +2 -0

No files found.
--- a/src/asio_common.cc
+++ b/src/asio_common.cc
@@ -177,9 +177,11 @@ bool tls_h2_negotiated(ssl_socket &socket) {
  unsigned int next_proto_len = 0;

  SSL_get0_next_proto_negotiated(ssl, &next_proto, &next_proto_len);
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L
  if (next_proto == nullptr) {
    SSL_get0_alpn_selected(ssl, &next_proto, &next_proto_len);
  }
+#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L

  if (next_proto == nullptr) {
    return false;