From e0a10d428151b26eceb33a1ede5b6334a8fd3f05 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 6 Oct 2009 16:19:49 +0000 Subject: Changes with nginx 0.8.19 06 Oct 2009 *) Change: now SSLv2 protocol is disabled by default. *) Change: now default SSL ciphers are "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM". *) Bugfix: a "limit_req" directive did not work; the bug had appeared in 0.8.18. --- src/http/modules/ngx_http_limit_req_module.c | 8 ++++---- src/http/modules/ngx_http_ssl_module.c | 5 ++--- src/http/modules/perl/nginx.pm | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src/http') diff --git a/src/http/modules/ngx_http_limit_req_module.c b/src/http/modules/ngx_http_limit_req_module.c index c9ff20c87..f9b64f1f8 100644 --- a/src/http/modules/ngx_http_limit_req_module.c +++ b/src/http/modules/ngx_http_limit_req_module.c @@ -398,15 +398,15 @@ ngx_http_limit_req_lookup(ngx_http_limit_req_conf_t *lrcf, ngx_uint_t hash, excess = lr->excess - ctx->rate * ngx_abs(ms) / 1000 + 1000; + if (excess < 0) { + excess = 0; + } + if ((ngx_uint_t) excess > lrcf->burst) { *lrp = lr; return NGX_BUSY; } - if (excess < 0) { - excess = 0; - } - lr->excess = excess; lr->last = now; diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c index cc0b932d2..1d67eeb26 100644 --- a/src/http/modules/ngx_http_ssl_module.c +++ b/src/http/modules/ngx_http_ssl_module.c @@ -13,7 +13,7 @@ typedef ngx_int_t (*ngx_ssl_variable_handler_pt)(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s); -#define NGX_DEFAULT_CIPHERS "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP" +#define NGX_DEFAULT_CIPHERS "ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM" static ngx_int_t ngx_http_ssl_static_variable(ngx_http_request_t *r, @@ -347,8 +347,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) prev->prefer_server_ciphers, 0); ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, - (NGX_CONF_BITMASK_SET - |NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1)); + (NGX_CONF_BITMASK_SET|NGX_SSL_SSLv3|NGX_SSL_TLSv1)); ngx_conf_merge_uint_value(conf->verify, prev->verify, 0); ngx_conf_merge_uint_value(conf->verify_depth, prev->verify_depth, 1); diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm index 3e667f4ad..6e96912e7 100644 --- a/src/http/modules/perl/nginx.pm +++ b/src/http/modules/perl/nginx.pm @@ -47,7 +47,7 @@ our @EXPORT = qw( HTTP_INSUFFICIENT_STORAGE ); -our $VERSION = '0.8.18'; +our $VERSION = '0.8.19'; require XSLoader; XSLoader::load('nginx', $VERSION); -- cgit v1.2.1