]> git.kaiwu.me - nginx.git/commitdiff
OCSP stapling: build fixes.
authorMaxim Dounin <mdounin@mdounin.ru>
Mon, 1 Oct 2012 13:54:13 +0000 (13:54 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Mon, 1 Oct 2012 13:54:13 +0000 (13:54 +0000)
With the "ssl_stapling_verify" commit build with old OpenSSL libraries
was broken due to incorrect prototype of the ngx_ssl_stapling() function.
One incorrect use of ngx_log_debug() instead of ngx_log_debug2() slipped in
and broke win32 build.

src/event/ngx_event_openssl_stapling.c

index 51caea6f0eeca1045cfb427fbd2e758bee6ccfe2..aaa8d8ac44c0956e7322a64ee32960548779744c 100644 (file)
@@ -1142,9 +1142,9 @@ ngx_ssl_ocsp_create_request(ngx_ssl_ocsp_ctx_t *ctx)
     escape = ngx_escape_uri(NULL, base64.data, base64.len,
                             NGX_ESCAPE_URI_COMPONENT);
 
-    ngx_log_debug(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
-                  "ssl ocsp request length %z, escape %d",
-                  base64.len, escape);
+    ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
+                   "ssl ocsp request length %z, escape %d",
+                   base64.len, escape);
 
     len = sizeof("GET ") - 1 + ctx->uri.len + sizeof("/") - 1
           + base64.len + 2 * escape + sizeof(" HTTP/1.0" CRLF) - 1
@@ -1729,8 +1729,8 @@ ngx_ssl_ocsp_log_error(ngx_log_t *log, u_char *buf, size_t len)
 
 
 ngx_int_t
-ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *responder,
-    ngx_str_t *file)
+ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file,
+    ngx_str_t *responder, ngx_uint_t verify)
 {
     ngx_log_error(NGX_LOG_WARN, ssl->log, 0,
                   "\"ssl_stapling\" ignored, not supported");