[nginx] svn commit: r4881 - trunk/src/event

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-10-01 13:54:13 +0000 (Mon, 01 Oct 2012)
New Revision: 4881
URL: http://trac.nginx.org/nginx/changeset/4881/nginx

Log:
OCSP stapling: build fixes.

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.


Modified:
   trunk/src/event/ngx_event_openssl_stapling.c

Modified: trunk/src/event/ngx_event_openssl_stapling.c
===================================================================
--- trunk/src/event/ngx_event_openssl_stapling.c	2012-10-01 12:53:11 UTC (rev 4880)
+++ trunk/src/event/ngx_event_openssl_stapling.c	2012-10-01 13:54:13 UTC (rev 4881)
@@ -1142,9 +1142,9 @@
     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_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");