]>
Commit | Line | Data |
---|---|---|
68d15d21 MT |
1 | Do not implicitly load the zlib support if OPENSSL_NO_DEFAULT_ZLIB is set. |
2 | diff -up openssl-0.9.8j/ssl/ssl_ciph.c.env-nozlib openssl-0.9.8j/ssl/ssl_ciph.c | |
3 | --- openssl-0.9.8j/ssl/ssl_ciph.c.env-nozlib 2009-01-05 15:43:07.000000000 +0100 | |
4 | +++ openssl-0.9.8j/ssl/ssl_ciph.c 2009-01-14 17:47:46.000000000 +0100 | |
5 | @@ -287,7 +287,7 @@ static void load_builtin_compressions(vo | |
6 | ||
7 | MemCheck_off(); | |
8 | ssl_comp_methods=sk_SSL_COMP_new(sk_comp_cmp); | |
9 | - if (ssl_comp_methods != NULL) | |
10 | + if (ssl_comp_methods != NULL && getenv("OPENSSL_NO_DEFAULT_ZLIB") == NULL) | |
11 | { | |
12 | comp=(SSL_COMP *)OPENSSL_malloc(sizeof(SSL_COMP)); | |
13 | if (comp != NULL) |