On Sat, 25 Oct 2014, Guenter wrote:
ok; found the required functions are with OpenSSL 1.0.2beta3, therefore I
would like to change the check for HAS_ALPN like this:
--- lib/vtls/openssl.c.orig Wed Sep 03 15:22:36 2014
+++ lib/vtls/openssl.c Sat Oct 25 18:11:52 2014
@@ -1415,16 +1415,12 @@
#ifdef USE_NGHTTP2
#undef HAS_ALPN
-#if defined(HAVE_SSL_CTX_SET_ALPN_PROTOS) && \
- defined(HAVE_SSL_CTX_SET_ALPN_SELECT_CB)
-# define HAS_ALPN 1
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L &&
!defined(OPENSSL_NO_NEXTPROTONEG) \
+ && !defined(OPENSSL_NO_TLSEXT)
+#define HAS_ALPN
#endif
I'm fine with doing this check as long as we can be reasonably sure it is the
correct one. But then I'd also suggest we remove the checks from configure
again since they are then pointless and unnecessary.
Alternatively, we add this new check as an OR to the former check so that we
can detect the functions with configure OR deem them present based on the
version number.
curl -V
curl 7.38.0 (i386-pc-win32) libcurl/7.38.0 OpenSSL/1.0.2 zlib/1.2.8
nghttp2/0.6.4
Features: AsynchDNS IPv6 Largefile SSPI SPNEGO NTLM SSL libz HTTP2
Looks correct. Unfortunately my http2 test server work haven't gotten very far
so we can't run any local tests for http2 yet! :-/
--
/ daniel.haxx.se
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
