aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-09-06 08:01:14 +0000
committerChristian Grothoff <christian@grothoff.org>2013-09-06 08:01:14 +0000
commite10685804a4e61e7e41747248347474dc9db90ed (patch)
tree153e3499ad6dbdf7d58f7e080571f58a1a211934
parentc82b4ff99a35bb2636db4220b34f336e241a04b6 (diff)
downloadlibmicrohttpd-e10685804a4e61e7e41747248347474dc9db90ed.tar.gz
libmicrohttpd-e10685804a4e61e7e41747248347474dc9db90ed.zip
check openssl symbols for libmicrospdy
-rw-r--r--ChangeLog9
-rw-r--r--configure.ac7
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3cff96d5..5ae3edc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
1Fri Sep 6 10:00:44 CEST 2013
2 Improved check for proper OpenSSL version for
3 libmicrospdy. -CG
4
1Wed Sep 4 17:23:15 CEST 2013 5Wed Sep 4 17:23:15 CEST 2013
2 Set IPV6_V6ONLY socket option correctly when IPv6 is 6 Set IPV6_V6ONLY socket option correctly when IPv6 is
3 enabled (MHD_USE_IPv6) but not dual stack 7 enabled (MHD_USE_IPv6) but not dual stack
4 (MHD_USE_DUAL_STACK) -MW 8 (MHD_USE_DUAL_STACK) -MW
9
5Mon Sep 2 22:59:45 CEST 2013 10Mon Sep 2 22:59:45 CEST 2013
6 Fix use-after-free in epoll()-mode on read error. 11 Fix use-after-free in epoll()-mode on read error.
7 Releasing libmicrohttpd 0.9.30. -CG 12 Releasing libmicrohttpd 0.9.30. -CG
diff --git a/configure.ac b/configure.ac
index 9e22a881..72f17957 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,8 +337,11 @@ AC_MSG_RESULT($enable_spdy)
337if test "$enable_spdy" = "yes" 337if test "$enable_spdy" = "yes"
338then 338then
339 AC_CHECK_HEADERS([openssl/err.h], 339 AC_CHECK_HEADERS([openssl/err.h],
340 [AM_CONDITIONAL(HAVE_OPENSSL, true) 340 AC_CHECK_LIB(crypto, SSL_CTX_set_next_protos_advertised_cb,
341 enable_spdy="yes"], 341 [AM_CONDITIONAL(HAVE_OPENSSL, true)
342 enable_spdy="yes"],
343 [AM_CONDITIONAL(HAVE_OPENSSL, false)
344 enable_spdy="no"]),
342 [AM_CONDITIONAL(HAVE_OPENSSL, false) 345 [AM_CONDITIONAL(HAVE_OPENSSL, false)
343 enable_spdy="no"]) 346 enable_spdy="no"])
344else 347else