From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 19 Feb 2019 17:56:59 +0000 (+0000)
Subject: [Project] Adopt lua libraries for http context
X-Git-Tag: 1.9.0~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b13907192f14c0a5171b225c21ffbcedfec3d501;p=thirdparty%2Frspamd.git

[Project] Adopt lua libraries for http context
---

diff --git a/src/lua/lua_dns_resolver.c b/src/lua/lua_dns_resolver.c
index 362a6b35e1..b68e153970 100644
--- a/src/lua/lua_dns_resolver.c
+++ b/src/lua/lua_dns_resolver.c
@@ -301,6 +301,8 @@ lua_push_dns_reply (lua_State *L, const struct rdns_reply *reply)
 
 				lua_rawseti (L, -2, ++i);
 				break;
+			default:
+				continue;
 			}
 		}
 		lua_pushnil (L);
diff --git a/src/lua/lua_http.c b/src/lua/lua_http.c
index 2ca01d8a5b..8c3dfb9291 100644
--- a/src/lua/lua_http.c
+++ b/src/lua/lua_http.c
@@ -379,23 +379,22 @@ lua_http_make_connection (struct lua_http_cbdata *cbd)
 	cbd->fd = fd;
 
 	if (cbd->cfg) {
-		cbd->conn = rspamd_http_connection_new (NULL,
+		cbd->conn = rspamd_http_connection_new (
+				NULL,
+				NULL,
 				lua_http_error_handler,
 				lua_http_finish_handler,
 				RSPAMD_HTTP_CLIENT_SIMPLE,
-				RSPAMD_HTTP_CLIENT,
-				NULL,
-				(cbd->flags & RSPAMD_LUA_HTTP_FLAG_NOVERIFY) ?
-				cbd->cfg->libs_ctx->ssl_ctx_noverify : cbd->cfg->libs_ctx->ssl_ctx);
+				RSPAMD_HTTP_CLIENT);
 	}
 	else {
-		cbd->conn = rspamd_http_connection_new (NULL,
+		cbd->conn = rspamd_http_connection_new (
+				NULL,
+				NULL,
 				lua_http_error_handler,
 				lua_http_finish_handler,
 				RSPAMD_HTTP_CLIENT_SIMPLE,
-				RSPAMD_HTTP_CLIENT,
-				NULL,
-				NULL);
+				RSPAMD_HTTP_CLIENT);
 	}
 
 	if (cbd->conn) {