bugfix: return NGX_OK in ngx_http_lua_ffi_exit when in NGX_HTTP_LUA_CONTEXT_SSL_PSK.

Tuure Vartiainen · Tuure Vartiainen · commit b8d9f062e9bc · 2017-10-06T10:52:59.000+03:00
diff --git a/src/ngx_http_lua_control.c b/src/ngx_http_lua_control.c
@@ -498,8 +498,7 @@ ngx_http_lua_ffi_exit(ngx_http_request_t *r, int status, u_char *err,
         ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
                        "lua exit with code %d", status);
 
-        if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE
-            || ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_PSK) {
+        if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE) {
             return NGX_DONE;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -498,8 +498,7 @@ ngx_http_lua_ffi_exit(ngx_http_request_t r, int status, u_char err,`
`498`	`498`	`ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,`
`499`	`499`	`"lua exit with code %d", status);`
`500`	`500`
`501`		`- if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE`
`502`		`- \|\| ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_PSK) {`
	`501`	`+ if (ctx->context == NGX_HTTP_LUA_CONTEXT_SSL_SESS_STORE) {`
`503`	`502`	`return NGX_DONE;`
`504`	`503`	`}`
`505`	`504`