BBlack has submitted this change and it was merged.

Change subject: Lua module: OpenSSL-1.1 compat fixup
......................................................................


Lua module: OpenSSL-1.1 compat fixup

Basic idea from: https://github.com/openssl/openssl/issues/1567

Change-Id: I359c520c392ff121b5f31a162fd8ce6ba2444207
---
M debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  BBlack: Verified; Looks good to me, approved



diff --git a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c 
b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c
index b5596bc..52c74f8 100644
--- a/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c
+++ b/debian/modules/nginx-lua/src/ngx_http_lua_ssl_session_storeby.c
@@ -180,6 +180,7 @@
     ngx_http_lua_ssl_ctx_t          *cctx;
     ngx_http_lua_srv_conf_t         *lscf;
     ngx_http_core_loc_conf_t        *clcf;
+    unsigned int                    sess_len;
 
     c = ngx_ssl_get_connection(ssl_conn);
 
@@ -249,8 +250,8 @@
     cctx->connection = c;
     cctx->request = r;
     cctx->session = sess;
-    cctx->session_id.data = sess->session_id;
-    cctx->session_id.len = sess->session_id_length;
+    cctx->session_id.data = SSL_SESSION_get_id(sess, &sess_len);
+    cctx->session_id.len = sess_len;
     cctx->done = 0;
 
     dd("setting cctx");

-- 
To view, visit https://gerrit.wikimedia.org/r/316553
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I359c520c392ff121b5f31a162fd8ce6ba2444207
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/nginx
Gerrit-Branch: wmf-1.11.4
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to