You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by jo...@apache.org on 2009/10/28 15:19:32 UTC

svn commit: r830554 - /httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h

Author: jorton
Date: Wed Oct 28 14:19:32 2009
New Revision: 830554

URL: http://svn.apache.org/viewvc?rev=830554&view=rev
Log:
* modules/ssl/ssl_toolkit_compat.h: Fold #if checks to enable OCSP
  stapling support, and also check that HAVE_OCSP is defined.

Modified:
    httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h

Modified: httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h?rev=830554&r1=830553&r2=830554&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_toolkit_compat.h Wed Oct 28 14:19:32 2009
@@ -147,11 +147,10 @@
 
 #define HAVE_SSL_X509V3_EXT_d2i
 
-#if (OPENSSL_VERSION_NUMBER >= 0x00908080)
-#ifndef OPENSSL_NO_TLSEXT
+#if OPENSSL_VERSION_NUMBER >= 0x00908080 && defined(HAVE_OCSP) \
+    && !defined(OPENSSL_NO_TLSEXT)
 #define HAVE_OCSP_STAPLING
 #endif
-#endif
 
 #ifndef PEM_F_DEF_CALLBACK
 #ifdef PEM_F_PEM_DEF_CALLBACK