fixed merge issues in the previous commit; also fixed the test suite for ssl-cert-by-lua.

Author: agentzh

src/ngx_http_lua_sslcertby.c

@@ -35,7 +35,8 @@ ngx_http_lua_ssl_cert_handler_file(ngx_http_request_t *r,
 {
     ngx_int_t           rc;
 
-    rc = ngx_http_lua_cache_loadfile(r, L, lscf->ssl_cert_src.data,
+    rc = ngx_http_lua_cache_loadfile(r->connection->log, L,
+                                     lscf->ssl_cert_src.data,
                                      lscf->ssl_cert_src_key);
     if (rc != NGX_OK) {
         return rc;
@@ -54,7 +55,8 @@ ngx_http_lua_ssl_cert_handler_inline(ngx_http_request_t *r,
 {
     ngx_int_t           rc;
 
-    rc = ngx_http_lua_cache_loadbuffer(r, L, lscf->ssl_cert_src.data,
+    rc = ngx_http_lua_cache_loadbuffer(r->connection->log, L,
+                                       lscf->ssl_cert_src.data,
                                        lscf->ssl_cert_src.len,
                                        lscf->ssl_cert_src_key,
                                        "=ssl_certificate_by_lua");

t/130-ssl-cert-by.t

@@ -2183,7 +2183,7 @@ failed to create OCSP request: output buffer too small: 68 > 67
             local req, err = ssl.create_ocsp_request(cert_data, 67)
             if not req then
                 ngx.log(ngx.ERR, "failed to create OCSP request: ", err)
-                return
+                return ngx.exit(ngx.ERROR)
             end
 
             ngx.log(ngx.WARN, "OCSP request created with length ", #req)
@@ -2242,7 +2242,7 @@ failed to create OCSP request: output buffer too small: 68 > 67
 GET /t
 --- response_body
 connected: 1
-ssl handshake: userdata
+failed to do SSL handshake: handshake failed
 
 --- error_log
 lua ssl server name: "test.com"
@@ -2823,7 +2823,6 @@ OCSP response validation ok
 
 
 === TEST 28: fail to validate OCSP response - OCSP response returns revoked status
-
 --- http_config
     lua_package_path "t/lib/?.lua;lua/?.lua;../lua-resty-core/lib/?.lua;;";
 
@@ -2840,7 +2839,7 @@ OCSP response validation ok
             cert_data, err = ssl.cert_pem_to_der(cert_data)
             if not cert_data then
                 ngx.log(ngx.ERR, "failed to convert pem cert to der cert: ", err)
-                return
+                return ngx.exit(ngx.ERROR)
             end
 
             local f = assert(io.open("t/cert/ocsp/revoked-ocsp-resp.der"))
@@ -2850,7 +2849,7 @@ OCSP response validation ok
             local req, err = ssl.validate_ocsp_response(resp, cert_data)
             if not req then
                 ngx.log(ngx.ERR, "failed to validate OCSP response: ", err)
-                return
+                return ngx.exit(ngx.ERROR)
             end
 
             ngx.log(ngx.WARN, "OCSP response validation ok")
@@ -2904,7 +2903,7 @@ OCSP response validation ok
 GET /t
 --- response_body
 connected: 1
-ssl handshake: userdata
+failed to do SSL handshake: handshake failed
 
 --- error_log
 lua ssl server name: "test.com"

t/cert/ocsp/revoked-ocsp-resp.der

@@ -30,7 +30,7 @@ time ngx-build $force $version \
         --with-http_ssl_module \
             --add-module=$root/../ndk-nginx-module \
             --add-module=$root/../set-misc-nginx-module \
-            --with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:/usr/local/lib" \
+            --with-ld-opt="-L$PCRE_LIB -Wl,-rpath,$PCRE_LIB:$LIBDRIZZLE_LIB:$OPENSSL_LIB:/usr/local/lib" \
             --without-mail_pop3_module \
             --without-mail_imap_module \
             --with-http_image_filter_module \