Mercurial > hg > nginx
comparison src/event/ngx_event_openssl_stapling.c @ 4880:0254c1a43fe5
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 01 Oct 2012 13:54:13 +0000 |
parents | 4a804fd04e6c |
children | cfab1e7e4ac2 |
comparison
equal
deleted
inserted
replaced
4879:4a804fd04e6c | 4880:0254c1a43fe5 |
---|---|
1140 ngx_encode_base64(&base64, &binary); | 1140 ngx_encode_base64(&base64, &binary); |
1141 | 1141 |
1142 escape = ngx_escape_uri(NULL, base64.data, base64.len, | 1142 escape = ngx_escape_uri(NULL, base64.data, base64.len, |
1143 NGX_ESCAPE_URI_COMPONENT); | 1143 NGX_ESCAPE_URI_COMPONENT); |
1144 | 1144 |
1145 ngx_log_debug(NGX_LOG_DEBUG_EVENT, ctx->log, 0, | 1145 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, ctx->log, 0, |
1146 "ssl ocsp request length %z, escape %d", | 1146 "ssl ocsp request length %z, escape %d", |
1147 base64.len, escape); | 1147 base64.len, escape); |
1148 | 1148 |
1149 len = sizeof("GET ") - 1 + ctx->uri.len + sizeof("/") - 1 | 1149 len = sizeof("GET ") - 1 + ctx->uri.len + sizeof("/") - 1 |
1150 + base64.len + 2 * escape + sizeof(" HTTP/1.0" CRLF) - 1 | 1150 + base64.len + 2 * escape + sizeof(" HTTP/1.0" CRLF) - 1 |
1151 + sizeof("Host: ") - 1 + ctx->host.len + sizeof(CRLF) - 1 | 1151 + sizeof("Host: ") - 1 + ctx->host.len + sizeof(CRLF) - 1 |
1152 + sizeof(CRLF) - 1; | 1152 + sizeof(CRLF) - 1; |
1727 | 1727 |
1728 #else | 1728 #else |
1729 | 1729 |
1730 | 1730 |
1731 ngx_int_t | 1731 ngx_int_t |
1732 ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *responder, | 1732 ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *file, |
1733 ngx_str_t *file) | 1733 ngx_str_t *responder, ngx_uint_t verify) |
1734 { | 1734 { |
1735 ngx_log_error(NGX_LOG_WARN, ssl->log, 0, | 1735 ngx_log_error(NGX_LOG_WARN, ssl->log, 0, |
1736 "\"ssl_stapling\" ignored, not supported"); | 1736 "\"ssl_stapling\" ignored, not supported"); |
1737 | 1737 |
1738 return NGX_OK; | 1738 return NGX_OK; |