From 9bda3322fb3bc328ce6300bb8a84e7ea5cdeb6aa Mon Sep 17 00:00:00 2001 From: Paul Aurich Date: Wed, 12 Jun 2013 18:33:19 -0700 Subject: [PATCH] context: no_compression is options, not verify The OpenSSL 0.9.8 compat needs to be handled as part of the options, not the verification flags. --- src/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/context.c b/src/context.c index 625468e..f411250 100644 --- a/src/context.c +++ b/src/context.c @@ -406,12 +406,6 @@ static int set_verify(lua_State *L) int max = lua_gettop(L); for (i = 2; i <= max; i++) { str = luaL_checkstring(L, i); -#if !defined(SSL_OP_NO_COMPRESSION) && (OPENSSL_VERSION_NUMBER >= 0x0090800f) && (OPENSSL_VERSION_NUMBER < 0x1000000fL) - /* Version 0.9.8 has a different way to disable compression */ - if (!strcmp(luaL_checkstring(L, i), "no_compression")) - ctx->comp_methods = NULL; - else -#endif if (!set_verify_flag(str, &flag)) { lua_pushboolean(L, 0); lua_pushstring(L, "invalid verify option"); @@ -435,6 +429,12 @@ static int set_options(lua_State *L) /* any option? */ if (max > 1) { for (i = 2; i <= max; i++) { +#if !defined(SSL_OP_NO_COMPRESSION) && (OPENSSL_VERSION_NUMBER >= 0x0090800f) && (OPENSSL_VERSION_NUMBER < 0x1000000fL) + /* Version 0.9.8 has a different way to disable compression */ + if (!strcmp(luaL_checkstring(L, i), "no_compression")) + ctx->comp_methods = NULL; + else +#endif if (!set_option_flag(luaL_checkstring(L, i), &flag)) { lua_pushboolean(L, 0); lua_pushstring(L, "invalid option");