Mercurial > hg > nginx-vendor-1-0
comparison src/http/modules/ngx_http_ssl_module.c @ 638:692f4d4d7f10 NGINX_1_0_9
nginx 1.0.9
*) Change: now the 0x7F-0x1F characters are escaped as \xXX in an
access_log.
*) Change: now SIGWINCH signal works only in daemon mode.
*) Feature: "proxy/fastcgi/scgi/uwsgi_ignore_headers" directives support
the following additional values: X-Accel-Limit-Rate,
X-Accel-Buffering, X-Accel-Charset.
*) Feature: decrease of memory consumption if SSL is used.
*) Feature: accept filters are now supported on NetBSD.
*) Feature: the "uwsgi_buffering" and "scgi_buffering" directives.
Thanks to Peter Smit.
*) Bugfix: a segmentation fault occurred on start or while
reconfiguration if the "ssl" directive was used at http level and
there was no "ssl_certificate" defined.
*) Bugfix: some UTF-8 characters were processed incorrectly.
Thanks to Alexey Kuts.
*) Bugfix: the ngx_http_rewrite_module directives specified at "server"
level were executed twice if no matching locations were defined.
*) Bugfix: a socket leak might occurred if "aio sendfile" was used.
*) Bugfix: connections with fast clients might be closed after
send_timeout if file AIO was used.
*) Bugfix: in the ngx_http_autoindex_module.
*) Bugfix: the module ngx_http_mp4_module did not support seeking on
32-bit platforms.
*) Bugfix: non-cacheable responses might be cached if
"proxy_cache_bypass" directive was used.
Thanks to John Ferlito.
*) Bugfix: cached responses with an empty body were returned
incorrectly; the bug had appeared in 0.8.31.
*) Bugfix: 201 responses of the ngx_http_dav_module were incorrect; the
bug had appeared in 0.8.32.
*) Bugfix: in the "return" directive.
*) Bugfix: the "ssl_verify_client", "ssl_verify_depth", and
"ssl_prefer_server_ciphers" directives might work incorrectly if SNI
was used.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Tue, 01 Nov 2011 00:00:00 +0400 |
parents | 0d6525917227 |
children | 1b80544421e8 |
comparison
equal
deleted
inserted
replaced
637:ea7441793bba | 638:692f4d4d7f10 |
---|---|
344 ngx_http_ssl_srv_conf_t *prev = parent; | 344 ngx_http_ssl_srv_conf_t *prev = parent; |
345 ngx_http_ssl_srv_conf_t *conf = child; | 345 ngx_http_ssl_srv_conf_t *conf = child; |
346 | 346 |
347 ngx_pool_cleanup_t *cln; | 347 ngx_pool_cleanup_t *cln; |
348 | 348 |
349 ngx_conf_merge_value(conf->enable, prev->enable, 0); | 349 if (conf->enable == NGX_CONF_UNSET) { |
350 if (prev->enable == NGX_CONF_UNSET) { | |
351 conf->enable = 0; | |
352 | |
353 } else { | |
354 conf->enable = prev->enable; | |
355 conf->file = prev->file; | |
356 conf->line = prev->line; | |
357 } | |
358 } | |
350 | 359 |
351 ngx_conf_merge_value(conf->session_timeout, | 360 ngx_conf_merge_value(conf->session_timeout, |
352 prev->session_timeout, 300); | 361 prev->session_timeout, 300); |
353 | 362 |
354 ngx_conf_merge_value(conf->prefer_server_ciphers, | 363 ngx_conf_merge_value(conf->prefer_server_ciphers, |