Issue #23 Support the for the new SSL module

mozilla-services · Sep 6, 2016 · 3257f08 · 3257f08
1 parent 162cff9
commit 3257f08
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/socket/CMakeLists.txt.socket b/socket/CMakeLists.txt.socket
@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
-project(socket VERSION 3.0.1 LANGUAGES C)
+project(socket VERSION 3.0.2 LANGUAGES C)
 
 set(CPACK_PACKAGE_NAME luasandbox-${PROJECT_NAME})
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Lua Socket Modules")

diff --git a/socket/sandboxes/heka/input/heka_tcp.lua b/socket/sandboxes/heka/input/heka_tcp.lua
@@ -34,8 +34,9 @@ local address = read_config("address") or "127.0.0.1"
 local port = read_config("port") or 5565
 local ssl_params = read_config("ssl_params")
 local ssl_ctx = nil
+local ssl = nil
 if ssl_params then
-    require "ssl"
+    ssl = require "ssl"
     ssl_ctx = assert(ssl.newcontext(ssl_params))
 end
 local server = assert(socket.bind(address, port))

diff --git a/socket/sandboxes/heka/output/heka_tcp.lua b/socket/sandboxes/heka/output/heka_tcp.lua
@@ -34,8 +34,10 @@ local timeout = read_config("timeout") or 10
 local ssl_params = read_config("ssl_params")
 
 local ssl_ctx = nil
+local ssl = nil
 if ssl_params then
-    require "ssl"
+    require "table"
+    ssl = require "ssl"
     ssl_ctx = assert(ssl.newcontext(ssl_params))
 end
 

diff --git a/socket/sandboxes/heka/output/heka_tcp_matcher.lua b/socket/sandboxes/heka/output/heka_tcp_matcher.lua
@@ -38,8 +38,9 @@ local address = read_config("address") or "127.0.0.1"
 local port = read_config("port") or 5566
 local ssl_params = read_config("ssl_params")
 local ssl_ctx = nil
+local ssl = nil
 if ssl_params then
-    require "ssl"
+    ssl = require "ssl"
     ssl_ctx = assert(ssl.newcontext(ssl_params))
 end
 local server = assert(socket.bind(address, port))