[nginx] svn commit: r4869 - trunk/src/event

mdounin at mdounin.ru mdounin at mdounin.ru
Thu Sep 27 18:01:07 UTC 2012


Author: mdounin
Date: 2012-09-27 18:01:06 +0000 (Thu, 27 Sep 2012)
New Revision: 4869
URL: http://trac.nginx.org/nginx/changeset/4869/nginx

Log:
SSL: added version checks for ssl compression workaround.

The SSL_COMP_get_compression_methods() is only available as an API
function in OpenSSL 0.9.8+, require it explicitly to unbreak build
with OpenSSL 0.9.7.


Modified:
   trunk/src/event/ngx_event_openssl.c

Modified: trunk/src/event/ngx_event_openssl.c
===================================================================
--- trunk/src/event/ngx_event_openssl.c	2012-09-27 17:59:59 UTC (rev 4868)
+++ trunk/src/event/ngx_event_openssl.c	2012-09-27 18:01:06 UTC (rev 4869)
@@ -94,6 +94,7 @@
 
     OpenSSL_add_all_algorithms();
 
+#if OPENSSL_VERSION_NUMBER >= 0x0090800fL
 #ifndef SSL_OP_NO_COMPRESSION
     {
     /*
@@ -111,6 +112,7 @@
     }
     }
 #endif
+#endif
 
     ngx_ssl_connection_index = SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL);
 



More information about the nginx-devel mailing list