summaryrefslogtreecommitdiff
path: root/src/http/ngx_http.h
diff options
context:
space:
mode:
authornginx <nginx@nginx.org>2013-07-17 13:20:40 +0000
committerJon Kolb <jon@b0g.us>2013-07-17 13:20:40 +0000
commite11452c2e0b93111df75a5bd3fa61c237048ae35 (patch)
treedb53fbcb0d28137f495882a4841d5aae8df0ccf0 /src/http/ngx_http.h
parente9bd13a142dcc2333c60638409a3e6893b35cdb2 (diff)
downloadnginx-e11452c2e0b93111df75a5bd3fa61c237048ae35.tar.gz
Changes with nginx 1.4.2 17 Jul 2013v1.4.2
*) Bugfix: the $r->header_in() embedded perl method did not return value of the "Cookie" and "X-Forwarded-For" request header lines; the bug had appeared in 1.3.14. *) Bugfix: nginx could not be built with the ngx_mail_ssl_module, but without ngx_http_ssl_module; the bug had appeared in 1.3.14. *) Bugfix: in the "proxy_set_body" directive. Thanks to Lanshun Zhou. *) Bugfix: the "fail_timeout" parameter of the "server" directive in the "upstream" context might not work if "max_fails" parameter was used; the bug had appeared in 1.3.0. *) Bugfix: a segmentation fault might occur in a worker process if the "ssl_stapling" directive was used. Thanks to Piotr Sikora. *) Bugfix: nginx/Windows might stop accepting connections if several worker processes were used.
Diffstat (limited to 'src/http/ngx_http.h')
-rw-r--r--src/http/ngx_http.h2
1 files changed, 1 insertions, 1 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