nginxtra 1.4.2.9 → 1.4.3.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/bin/nginxtra +1 -1
- data/bin/nginxtra_rails +1 -1
- data/lib/nginxtra/version.rb +1 -1
- data/vendor/nginx/CHANGES +21 -0
- data/vendor/nginx/CHANGES.ru +21 -0
- data/vendor/nginx/src/core/nginx.h +2 -2
- data/vendor/nginx/src/core/ngx_crypt.c +1 -1
- data/vendor/nginx/src/http/modules/ngx_http_autoindex_module.c +3 -3
- data/vendor/nginx/src/http/modules/ngx_http_log_module.c +1 -1
- data/vendor/nginx/src/http/ngx_http_core_module.c +3 -1
- data/vendor/nginx/src/http/ngx_http_spdy.c +2 -9
- data/vendor/nginx/src/http/ngx_http_variables.c +1 -1
- data/vendor/nginx/src/mail/ngx_mail_smtp_module.c +0 -1
- data/vendor/nginx/src/mail/ngx_mail_ssl_module.c +5 -0
- data/vendor/nginx/src/os/unix/ngx_errno.h +1 -1
- metadata +9 -13
checksums.yaml
ADDED
@@ -0,0 +1,7 @@
|
|
1
|
+
---
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: 81cc27b496477f82ca37b4d7750379effd5e0574
|
4
|
+
data.tar.gz: c41eaef205f94780ec52649c4b7acee8ce2954b4
|
5
|
+
SHA512:
|
6
|
+
metadata.gz: 60bce9431469687065e84c9feedeedd760cddf6e69182be80da015c5bc0a37c21b090cf99e82143470d3c21f4d589f7ab80e1035a6fb7a25ccdc3d437b76b6b0
|
7
|
+
data.tar.gz: e1a00910874d0d142d2677ff397c1065c4d5887ca002f54846fcb49f98c4778d33a43b6d1439fa93171e7a7f96298f6b8d15ea0acc219702e7d9f5c93a0da735
|
data/bin/nginxtra
CHANGED
data/bin/nginxtra_rails
CHANGED
data/lib/nginxtra/version.rb
CHANGED
data/vendor/nginx/CHANGES
CHANGED
@@ -1,4 +1,25 @@
|
|
1
1
|
|
2
|
+
Changes with nginx 1.4.3 08 Oct 2013
|
3
|
+
|
4
|
+
*) Bugfix: a segmentation fault might occur in a worker process if the
|
5
|
+
ngx_http_spdy_module was used with the "client_body_in_file_only"
|
6
|
+
directive.
|
7
|
+
|
8
|
+
*) Bugfix: a segmentation fault might occur on start or during
|
9
|
+
reconfiguration if the "try_files" directive was used with an empty
|
10
|
+
parameter.
|
11
|
+
|
12
|
+
*) Bugfix: the $request_time variable did not work in nginx/Windows.
|
13
|
+
|
14
|
+
*) Bugfix: in the ngx_http_auth_basic_module when using "$apr1$"
|
15
|
+
password encryption method.
|
16
|
+
Thanks to Markus Linnala.
|
17
|
+
|
18
|
+
*) Bugfix: in the ngx_http_autoindex_module.
|
19
|
+
|
20
|
+
*) Bugfix: in the mail proxy server.
|
21
|
+
|
22
|
+
|
2
23
|
Changes with nginx 1.4.2 17 Jul 2013
|
3
24
|
|
4
25
|
*) Bugfix: the $r->header_in() embedded perl method did not return value
|
data/vendor/nginx/CHANGES.ru
CHANGED
@@ -1,4 +1,25 @@
|
|
1
1
|
|
2
|
+
Изменения в nginx 1.4.3 08.10.2013
|
3
|
+
|
4
|
+
*) Исправление: в рабочем процессе мог произойти segmentation fault,
|
5
|
+
если использовался модуль ngx_http_spdy_module и директива
|
6
|
+
client_body_in_file_only.
|
7
|
+
|
8
|
+
*) Исправление: на старте или во время переконфигурации мог произойти
|
9
|
+
segmentation fault, если использовалась директива try_files с пустым
|
10
|
+
параметром.
|
11
|
+
|
12
|
+
*) Исправление: переменная $request_time не работала в nginx/Windows.
|
13
|
+
|
14
|
+
*) Исправление: в модуле ngx_http_auth_basic_module при использовании
|
15
|
+
метода шифрования паролей "$apr1$".
|
16
|
+
Спасибо Markus Linnala.
|
17
|
+
|
18
|
+
*) Исправление: в модуле ngx_http_autoindex_module.
|
19
|
+
|
20
|
+
*) Исправление: в почтовом прокси-сервере.
|
21
|
+
|
22
|
+
|
2
23
|
Изменения в nginx 1.4.2 17.07.2013
|
3
24
|
|
4
25
|
*) Исправление: метод $r->header_in() встроенного перла не возвращал
|
@@ -137,7 +137,7 @@ ngx_crypt_apr1(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted)
|
|
137
137
|
|
138
138
|
/* output */
|
139
139
|
|
140
|
-
*encrypted = ngx_pnalloc(pool, sizeof("$apr1$") - 1 + saltlen +
|
140
|
+
*encrypted = ngx_pnalloc(pool, sizeof("$apr1$") - 1 + saltlen + 1 + 22 + 1);
|
141
141
|
if (*encrypted == NULL) {
|
142
142
|
return NGX_ERROR;
|
143
143
|
}
|
@@ -304,7 +304,7 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
|
|
304
304
|
if (ngx_de_info(filename, &dir) == NGX_FILE_ERROR) {
|
305
305
|
err = ngx_errno;
|
306
306
|
|
307
|
-
if (err != NGX_ENOENT) {
|
307
|
+
if (err != NGX_ENOENT && err != NGX_ELOOP) {
|
308
308
|
ngx_log_error(NGX_LOG_CRIT, r->connection->log, err,
|
309
309
|
ngx_de_info_n " \"%s\" failed", filename);
|
310
310
|
|
@@ -388,7 +388,7 @@ ngx_http_autoindex_handler(ngx_http_request_t *r)
|
|
388
388
|
|
389
389
|
b = ngx_create_temp_buf(r->pool, len);
|
390
390
|
if (b == NULL) {
|
391
|
-
return
|
391
|
+
return NGX_ERROR;
|
392
392
|
}
|
393
393
|
|
394
394
|
if (entries.nelts > 1) {
|
@@ -649,7 +649,7 @@ ngx_http_autoindex_error(ngx_http_request_t *r, ngx_dir_t *dir, ngx_str_t *name)
|
|
649
649
|
ngx_close_dir_n " \"%V\" failed", name);
|
650
650
|
}
|
651
651
|
|
652
|
-
return NGX_HTTP_INTERNAL_SERVER_ERROR;
|
652
|
+
return r->header_sent ? NGX_ERROR : NGX_HTTP_INTERNAL_SERVER_ERROR;
|
653
653
|
}
|
654
654
|
|
655
655
|
|
@@ -780,7 +780,7 @@ ngx_http_log_request_time(ngx_http_request_t *r, u_char *buf,
|
|
780
780
|
((tp->sec - r->start_sec) * 1000 + (tp->msec - r->start_msec));
|
781
781
|
ms = ngx_max(ms, 0);
|
782
782
|
|
783
|
-
return ngx_sprintf(buf, "%T.%03M", ms / 1000, ms % 1000);
|
783
|
+
return ngx_sprintf(buf, "%T.%03M", (time_t) ms / 1000, ms % 1000);
|
784
784
|
}
|
785
785
|
|
786
786
|
|
@@ -4758,7 +4758,9 @@ ngx_http_core_try_files(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|
4758
4758
|
|
4759
4759
|
tf[i].name = value[i + 1];
|
4760
4760
|
|
4761
|
-
if (tf[i].name.
|
4761
|
+
if (tf[i].name.len > 0
|
4762
|
+
&& tf[i].name.data[tf[i].name.len - 1] == '/')
|
4763
|
+
{
|
4762
4764
|
tf[i].test_dir = 1;
|
4763
4765
|
tf[i].name.len--;
|
4764
4766
|
tf[i].name.data[tf[i].name.len] = '\0';
|
@@ -2529,13 +2529,6 @@ ngx_http_spdy_init_request_body(ngx_http_request_t *r)
|
|
2529
2529
|
return NGX_ERROR;
|
2530
2530
|
}
|
2531
2531
|
|
2532
|
-
if (rb->rest == 0) {
|
2533
|
-
buf->in_file = 1;
|
2534
|
-
buf->file = &tf->file;
|
2535
|
-
} else {
|
2536
|
-
rb->buf = buf;
|
2537
|
-
}
|
2538
|
-
|
2539
2532
|
} else {
|
2540
2533
|
|
2541
2534
|
if (rb->rest == 0) {
|
@@ -2546,10 +2539,10 @@ ngx_http_spdy_init_request_body(ngx_http_request_t *r)
|
|
2546
2539
|
if (buf == NULL) {
|
2547
2540
|
return NGX_ERROR;
|
2548
2541
|
}
|
2549
|
-
|
2550
|
-
rb->buf = buf;
|
2551
2542
|
}
|
2552
2543
|
|
2544
|
+
rb->buf = buf;
|
2545
|
+
|
2553
2546
|
rb->bufs = ngx_alloc_chain_link(r->pool);
|
2554
2547
|
if (rb->bufs == NULL) {
|
2555
2548
|
return NGX_ERROR;
|
@@ -1988,7 +1988,7 @@ ngx_http_variable_request_time(ngx_http_request_t *r,
|
|
1988
1988
|
((tp->sec - r->start_sec) * 1000 + (tp->msec - r->start_msec));
|
1989
1989
|
ms = ngx_max(ms, 0);
|
1990
1990
|
|
1991
|
-
v->len = ngx_sprintf(p, "%T.%03M", ms / 1000, ms % 1000) - p;
|
1991
|
+
v->len = ngx_sprintf(p, "%T.%03M", (time_t) ms / 1000, ms % 1000) - p;
|
1992
1992
|
v->valid = 1;
|
1993
1993
|
v->no_cacheable = 0;
|
1994
1994
|
v->not_found = 0;
|
@@ -277,7 +277,6 @@ ngx_mail_smtp_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
|
|
277
277
|
p = ngx_cpymem(p, conf->capability.data, conf->capability.len);
|
278
278
|
|
279
279
|
p = ngx_cpymem(p, "250 STARTTLS" CRLF, sizeof("250 STARTTLS" CRLF) - 1);
|
280
|
-
*p++ = CR; *p = LF;
|
281
280
|
|
282
281
|
p = conf->starttls_capability.data
|
283
282
|
+ (last - conf->capability.data) + 3;
|
@@ -235,6 +235,11 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf, void *parent, void *child)
|
|
235
235
|
mode = "";
|
236
236
|
}
|
237
237
|
|
238
|
+
if (conf->file == NULL) {
|
239
|
+
conf->file = prev->file;
|
240
|
+
conf->line = prev->line;
|
241
|
+
}
|
242
|
+
|
238
243
|
if (*mode) {
|
239
244
|
|
240
245
|
if (conf->certificate.len == 0) {
|
@@ -49,10 +49,10 @@ typedef int ngx_err_t;
|
|
49
49
|
#define NGX_ECANCELED ECANCELED
|
50
50
|
#define NGX_EILSEQ EILSEQ
|
51
51
|
#define NGX_ENOMOREFILES 0
|
52
|
+
#define NGX_ELOOP ELOOP
|
52
53
|
|
53
54
|
#if (NGX_HAVE_OPENAT)
|
54
55
|
#define NGX_EMLINK EMLINK
|
55
|
-
#define NGX_ELOOP ELOOP
|
56
56
|
#endif
|
57
57
|
|
58
58
|
#if (__hpux__)
|
metadata
CHANGED
@@ -1,20 +1,18 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: nginxtra
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.4.
|
5
|
-
prerelease:
|
4
|
+
version: 1.4.3.9
|
6
5
|
platform: ruby
|
7
6
|
authors:
|
8
7
|
- Mike Virata-Stone
|
9
8
|
autorequire:
|
10
9
|
bindir: bin
|
11
10
|
cert_chain: []
|
12
|
-
date: 2013-
|
11
|
+
date: 2013-10-08 00:00:00.000000000 Z
|
13
12
|
dependencies:
|
14
13
|
- !ruby/object:Gem::Dependency
|
15
14
|
name: thor
|
16
15
|
requirement: !ruby/object:Gem::Requirement
|
17
|
-
none: false
|
18
16
|
requirements:
|
19
17
|
- - ~>
|
20
18
|
- !ruby/object:Gem::Version
|
@@ -22,7 +20,6 @@ dependencies:
|
|
22
20
|
type: :runtime
|
23
21
|
prerelease: false
|
24
22
|
version_requirements: !ruby/object:Gem::Requirement
|
25
|
-
none: false
|
26
23
|
requirements:
|
27
24
|
- - ~>
|
28
25
|
- !ruby/object:Gem::Version
|
@@ -421,28 +418,27 @@ files:
|
|
421
418
|
- vendor/nginx/src/os/unix/ngx_writev_chain.c
|
422
419
|
- vendor/nginx/src/os/unix/rfork_thread.S
|
423
420
|
homepage: https://github.com/mikestone/nginxtra
|
424
|
-
licenses:
|
421
|
+
licenses:
|
422
|
+
- nginx
|
423
|
+
metadata: {}
|
425
424
|
post_install_message:
|
426
425
|
rdoc_options: []
|
427
426
|
require_paths:
|
428
427
|
- lib
|
429
428
|
required_ruby_version: !ruby/object:Gem::Requirement
|
430
|
-
none: false
|
431
429
|
requirements:
|
432
|
-
- -
|
430
|
+
- - '>='
|
433
431
|
- !ruby/object:Gem::Version
|
434
432
|
version: '0'
|
435
433
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
436
|
-
none: false
|
437
434
|
requirements:
|
438
|
-
- -
|
435
|
+
- - '>='
|
439
436
|
- !ruby/object:Gem::Version
|
440
437
|
version: '0'
|
441
438
|
requirements: []
|
442
439
|
rubyforge_project:
|
443
|
-
rubygems_version:
|
440
|
+
rubygems_version: 2.0.3
|
444
441
|
signing_key:
|
445
|
-
specification_version:
|
442
|
+
specification_version: 4
|
446
443
|
summary: Wrapper of nginx for easy install and use.
|
447
444
|
test_files: []
|
448
|
-
has_rdoc:
|