diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-05-11 18:49:30 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-05-11 18:49:30 +0400 |
| commit | abef0366e9bb7641058e4d8ab2a495ccf6ff5028 (patch) | |
| tree | 30c9a6a8bf154e6cbb4255283cba7c94360eb76a | |
| parent | 1901e10d199a321ccf539fd13198746a1e6eeb10 (diff) | |
| download | nginx-abef0366e9bb7641058e4d8ab2a495ccf6ff5028.tar.gz nginx-abef0366e9bb7641058e4d8ab2a495ccf6ff5028.zip | |
Fixed build with --with-mail_ssl_module.
If nginx was compiled without --with-http_ssl_module, but with some
other module which uses OpenSSL (e.g. --with-mail_ssl_module), insufficient
preprocessor check resulted in build failure. The problem was introduced
by e0a3714a36f8 (1.3.14).
Reported by Roman Arutyunyan.
| -rw-r--r-- | src/http/ngx_http.h | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_request.c | 8 | ||||
| -rw-r--r-- | src/http/ngx_http_request.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h index 3d758bfd9..d4dc1bd94 100644 --- a/src/http/ngx_http.h +++ b/src/http/ngx_http.h @@ -89,7 +89,7 @@ ngx_int_t ngx_http_add_listen(ngx_conf_t *cf, ngx_http_core_srv_conf_t *cscf, void ngx_http_init_connection(ngx_connection_t *c); void ngx_http_close_connection(ngx_connection_t *c); -#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME +#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME) int ngx_http_ssl_servername(ngx_ssl_conn_t *ssl_conn, int *ad, void *arg); #endif diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 8942deb33..c8c5d153f 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -1955,7 +1955,7 @@ ngx_http_set_virtual_server(ngx_http_request_t *r, ngx_str_t *host) hc = r->http_connection; -#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME +#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME) if (hc->ssl_servername) { if (hc->ssl_servername->len == host->len @@ -1986,7 +1986,7 @@ ngx_http_set_virtual_server(ngx_http_request_t *r, ngx_str_t *host) return NGX_ERROR; } -#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME +#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME) if (hc->ssl_servername) { ngx_http_ssl_srv_conf_t *sscf; @@ -2053,7 +2053,7 @@ ngx_http_find_virtual_server(ngx_connection_t *c, sn = virtual_names->regex; -#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME +#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME) if (r == NULL) { ngx_http_connection_t *hc; @@ -2085,7 +2085,7 @@ ngx_http_find_virtual_server(ngx_connection_t *c, return NGX_DECLINED; } -#endif /* SSL_CTRL_SET_TLSEXT_HOSTNAME */ +#endif /* NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME */ for (i = 0; i < virtual_names->nregex; i++) { diff --git a/src/http/ngx_http_request.h b/src/http/ngx_http_request.h index 5c62785e2..bd842df7e 100644 --- a/src/http/ngx_http_request.h +++ b/src/http/ngx_http_request.h @@ -295,7 +295,7 @@ typedef struct { ngx_http_addr_conf_t *addr_conf; ngx_http_conf_ctx_t *conf_ctx; -#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME +#if (NGX_HTTP_SSL && defined SSL_CTRL_SET_TLSEXT_HOSTNAME) ngx_str_t *ssl_servername; #if (NGX_PCRE) ngx_http_regex_t *ssl_servername_regex; |