diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-10-01 13:54:13 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-10-01 13:54:13 +0000 |
| commit | 7eea509776b9dfc35b4b0b45f0aceeb36420aacd (patch) | |
| tree | f49d30841590cd96bab77883d5a24f49b3c6a7b2 | |
| parent | bec2cc5286e5888eb1de9462f7c64b922967b47b (diff) | |
| download | nginx-7eea509776b9dfc35b4b0b45f0aceeb36420aacd.tar.gz nginx-7eea509776b9dfc35b4b0b45f0aceeb36420aacd.tar.bz2 | |
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.
| -rw-r--r-- | src/event/ngx_event_openssl_stapling.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c index 51caea6f0..aaa8d8ac4 100644 --- a/src/event/ngx_event_openssl_stapling.c +++ b/src/event/ngx_event_openssl_stapling.c @@ -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"); |