14 lines
639 B
Diff
14 lines
639 B
Diff
|
Do not implicitly load the zlib support if OPENSSL_NO_DEFAULT_ZLIB is set.
|
||
|
|
diff -up openssl-0.9.8j/ssl/ssl_ciph.c.env-nozlib openssl-0.9.8j/ssl/ssl_ciph.c
|
||
|
|
--- openssl-0.9.8j/ssl/ssl_ciph.c.env-nozlib 2009-01-05 15:43:07.000000000 +0100
|
||
|
|
+++ openssl-0.9.8j/ssl/ssl_ciph.c 2009-01-14 17:47:46.000000000 +0100
|
||
|
|
@@ -287,7 +287,7 @@ static void load_builtin_compressions(vo
|
||
|
|
|
||
|
|
MemCheck_off();
|
||
|
|
ssl_comp_methods=sk_SSL_COMP_new(sk_comp_cmp);
|
||
|
|
- if (ssl_comp_methods != NULL)
|
||
|
|
+ if (ssl_comp_methods != NULL && getenv("OPENSSL_NO_DEFAULT_ZLIB") == NULL)
|
||
|
|
{
|
||
|
|
comp=(SSL_COMP *)OPENSSL_malloc(sizeof(SSL_COMP));
|
||
|
|
if (comp != NULL)
|