nginxtra 1.6.0.9 → 1.6.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/nginxtra +1 -1
- data/bin/nginxtra_rails +1 -1
- data/lib/nginxtra/version.rb +1 -1
- data/vendor/nginx/CHANGES +15 -0
- data/vendor/nginx/CHANGES.ru +16 -0
- data/vendor/nginx/src/core/nginx.h +2 -2
- data/vendor/nginx/src/http/ngx_http_request.c +2 -0
- data/vendor/nginx/src/mail/ngx_mail_smtp_handler.c +13 -0
- metadata +7 -7
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 5a369f94e07f5931407f7b44ad43a6c98f27cea3
|
4
|
+
data.tar.gz: 243030adfeee60632c741be4b329de3b92478e47
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e76ab0356342254fb0bc4ed9df9cd7a8a1a036dd1a3467f19405e390b1f621aaef1fea2ddba5e7d0ab18ebf6e00cfad5fe1833b74240ef16a10e5ffc27eb45ba
|
7
|
+
data.tar.gz: 3afc11ee1c7f66fe21f475c7fc014ca847392889ccb356959edb93391e423a4438a252ba84ceb6cb5c79904c2811f123cfc6b669bf3ed42eeeee73712ab83c7c
|
data/bin/nginxtra
CHANGED
data/bin/nginxtra_rails
CHANGED
data/lib/nginxtra/version.rb
CHANGED
data/vendor/nginx/CHANGES
CHANGED
@@ -1,4 +1,19 @@
|
|
1
1
|
|
2
|
+
Changes with nginx 1.6.1 05 Aug 2014
|
3
|
+
|
4
|
+
*) Security: pipelined commands were not discarded after STARTTLS
|
5
|
+
command in SMTP proxy (CVE-2014-3556); the bug had appeared in 1.5.6.
|
6
|
+
Thanks to Chris Boulton.
|
7
|
+
|
8
|
+
*) Bugfix: the $uri variable might contain garbage when returning errors
|
9
|
+
with code 400.
|
10
|
+
Thanks to Sergey Bobrov.
|
11
|
+
|
12
|
+
*) Bugfix: in the "none" parameter in the "smtp_auth" directive; the bug
|
13
|
+
had appeared in 1.5.6.
|
14
|
+
Thanks to Svyatoslav Nikolsky.
|
15
|
+
|
16
|
+
|
2
17
|
Changes with nginx 1.6.0 24 Apr 2014
|
3
18
|
|
4
19
|
*) 1.6.x stable branch.
|
data/vendor/nginx/CHANGES.ru
CHANGED
@@ -1,4 +1,20 @@
|
|
1
1
|
|
2
|
+
Изменения в nginx 1.6.1 05.08.2014
|
3
|
+
|
4
|
+
*) Безопасность: pipelined-команды не отбрасывались после команды
|
5
|
+
STARTTLS в SMTP прокси-сервере (CVE-2014-3556); ошибка появилась в
|
6
|
+
1.5.6.
|
7
|
+
Спасибо Chris Boulton.
|
8
|
+
|
9
|
+
*) Исправление: переменная $uri могла содержать мусор при возврате
|
10
|
+
ошибок с кодом 400.
|
11
|
+
Спасибо Сергею Боброву.
|
12
|
+
|
13
|
+
*) Исправление: в работе параметра none директивы smtp_auth; ошибка
|
14
|
+
появилась в 1.5.6.
|
15
|
+
Спасибо Святославу Никольскому.
|
16
|
+
|
17
|
+
|
2
18
|
Изменения в nginx 1.6.0 24.04.2014
|
3
19
|
|
4
20
|
*) Стабильная ветка 1.6.x.
|
@@ -1071,6 +1071,8 @@ ngx_http_process_request_uri(ngx_http_request_t *r)
|
|
1071
1071
|
cscf = ngx_http_get_module_srv_conf(r, ngx_http_core_module);
|
1072
1072
|
|
1073
1073
|
if (ngx_http_parse_complex_uri(r, cscf->merge_slashes) != NGX_OK) {
|
1074
|
+
r->uri.len = 0;
|
1075
|
+
|
1074
1076
|
ngx_log_error(NGX_LOG_INFO, r->connection->log, 0,
|
1075
1077
|
"client sent invalid request");
|
1076
1078
|
ngx_http_finalize_request(r, NGX_HTTP_BAD_REQUEST);
|
@@ -679,6 +679,11 @@ ngx_mail_smtp_mail(ngx_mail_session_t *s, ngx_connection_t *c)
|
|
679
679
|
return NGX_OK;
|
680
680
|
}
|
681
681
|
|
682
|
+
if (s->args.nelts == 0) {
|
683
|
+
ngx_str_set(&s->out, smtp_invalid_argument);
|
684
|
+
return NGX_OK;
|
685
|
+
}
|
686
|
+
|
682
687
|
arg = s->args.elts;
|
683
688
|
arg += s->args.nelts - 1;
|
684
689
|
|
@@ -713,6 +718,11 @@ ngx_mail_smtp_rcpt(ngx_mail_session_t *s, ngx_connection_t *c)
|
|
713
718
|
return NGX_OK;
|
714
719
|
}
|
715
720
|
|
721
|
+
if (s->args.nelts == 0) {
|
722
|
+
ngx_str_set(&s->out, smtp_invalid_argument);
|
723
|
+
return NGX_OK;
|
724
|
+
}
|
725
|
+
|
716
726
|
arg = s->args.elts;
|
717
727
|
arg += s->args.nelts - 1;
|
718
728
|
|
@@ -767,6 +777,9 @@ ngx_mail_smtp_starttls(ngx_mail_session_t *s, ngx_connection_t *c)
|
|
767
777
|
ngx_str_null(&s->smtp_from);
|
768
778
|
ngx_str_null(&s->smtp_to);
|
769
779
|
|
780
|
+
s->buffer->pos = s->buffer->start;
|
781
|
+
s->buffer->last = s->buffer->start;
|
782
|
+
|
770
783
|
c->read->handler = ngx_mail_starttls_handler;
|
771
784
|
return NGX_OK;
|
772
785
|
}
|
metadata
CHANGED
@@ -1,27 +1,27 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: nginxtra
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.6.
|
4
|
+
version: 1.6.1.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mike Virata-Stone
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-
|
11
|
+
date: 2014-08-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: thor
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - ~>
|
17
|
+
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
19
|
version: '0.16'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- - ~>
|
24
|
+
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
26
|
version: '0.16'
|
27
27
|
description: This gem is intended to provide an easy to use configuration file that
|
@@ -433,17 +433,17 @@ require_paths:
|
|
433
433
|
- lib
|
434
434
|
required_ruby_version: !ruby/object:Gem::Requirement
|
435
435
|
requirements:
|
436
|
-
- -
|
436
|
+
- - ">="
|
437
437
|
- !ruby/object:Gem::Version
|
438
438
|
version: '0'
|
439
439
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
440
440
|
requirements:
|
441
|
-
- -
|
441
|
+
- - ">="
|
442
442
|
- !ruby/object:Gem::Version
|
443
443
|
version: '0'
|
444
444
|
requirements: []
|
445
445
|
rubyforge_project:
|
446
|
-
rubygems_version: 2.
|
446
|
+
rubygems_version: 2.2.2
|
447
447
|
signing_key:
|
448
448
|
specification_version: 4
|
449
449
|
summary: Wrapper of nginx for easy install and use.
|