nginxtra 1.2.0.1 → 1.2.1.2

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.
Files changed (37) hide show
  1. data/VERSION +1 -1
  2. data/bin/nginxtra +1 -1
  3. data/lib/nginxtra.rb +2 -0
  4. data/lib/nginxtra/action.rb +1 -1
  5. data/lib/nginxtra/actions/convert.rb +67 -0
  6. data/lib/nginxtra/actions/install.rb +3 -0
  7. data/lib/nginxtra/cli.rb +20 -0
  8. data/lib/nginxtra/config_converter.rb +324 -0
  9. data/lib/nginxtra/error.rb +3 -0
  10. data/src/nginx/CHANGES +45 -0
  11. data/src/nginx/CHANGES.ru +46 -0
  12. data/src/nginx/src/core/nginx.h +2 -2
  13. data/src/nginx/src/core/ngx_resolver.c +14 -2
  14. data/src/nginx/src/event/ngx_event.c +18 -21
  15. data/src/nginx/src/event/ngx_event.h +0 -6
  16. data/src/nginx/src/event/ngx_event_accept.c +90 -13
  17. data/src/nginx/src/event/ngx_event_openssl.c +1 -0
  18. data/src/nginx/src/http/modules/ngx_http_fastcgi_module.c +26 -4
  19. data/src/nginx/src/http/modules/ngx_http_flv_module.c +1 -1
  20. data/src/nginx/src/http/modules/ngx_http_geo_module.c +62 -74
  21. data/src/nginx/src/http/modules/ngx_http_geoip_module.c +130 -30
  22. data/src/nginx/src/http/modules/ngx_http_gzip_static_module.c +1 -1
  23. data/src/nginx/src/http/modules/ngx_http_mp4_module.c +1 -1
  24. data/src/nginx/src/http/modules/ngx_http_realip_module.c +45 -93
  25. data/src/nginx/src/http/modules/ngx_http_scgi_module.c +2 -0
  26. data/src/nginx/src/http/modules/ngx_http_stub_status_module.c +1 -1
  27. data/src/nginx/src/http/modules/ngx_http_uwsgi_module.c +2 -0
  28. data/src/nginx/src/http/modules/perl/nginx.pm +1 -1
  29. data/src/nginx/src/http/ngx_http_core_module.c +104 -0
  30. data/src/nginx/src/http/ngx_http_core_module.h +3 -0
  31. data/src/nginx/src/http/ngx_http_parse.c +20 -0
  32. data/src/nginx/src/http/ngx_http_request.c +26 -15
  33. data/src/nginx/src/http/ngx_http_script.c +0 -1
  34. data/src/nginx/src/http/ngx_http_upstream_round_robin.c +72 -170
  35. data/src/nginx/src/http/ngx_http_upstream_round_robin.h +1 -0
  36. data/src/nginx/src/os/unix/ngx_errno.h +2 -0
  37. metadata +6 -4
data/src/nginx/src/http/ngx_http_upstream_round_robin.h CHANGED
@@ -20,6 +20,7 @@ typedef struct {
20
20
  ngx_str_t name;
21
21
 
22
22
  ngx_int_t current_weight;
23
+ ngx_int_t effective_weight;
23
24
  ngx_int_t weight;
24
25
 
25
26
  ngx_uint_t fails;
data/src/nginx/src/os/unix/ngx_errno.h CHANGED
@@ -29,6 +29,8 @@ typedef int ngx_err_t;
29
29
  #define NGX_ENOTDIR ENOTDIR
30
30
  #define NGX_EISDIR EISDIR
31
31
  #define NGX_EINVAL EINVAL
32
+ #define NGX_ENFILE ENFILE
33
+ #define NGX_EMFILE EMFILE
32
34
  #define NGX_ENOSPC ENOSPC
33
35
  #define NGX_EPIPE EPIPE
34
36
  #define NGX_EINPROGRESS EINPROGRESS
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nginxtra
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0.1
4
+ version: 1.2.1.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-06-05 00:00:00.000000000 Z
12
+ date: 2012-06-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: thor
16
- requirement: &6775360 !ruby/object:Gem::Requirement
16
+ requirement: &10550480 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,7 +21,7 @@ dependencies:
21
21
  version: 0.15.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *6775360
24
+ version_requirements: *10550480
25
25
  description: This gem is intended to provide an easy to use configuration file that
26
26
  will automatically be used to compile nginx and configure the configuration.
27
27
  email: reasonnumber@gmail.com
@@ -35,6 +35,7 @@ files:
35
35
  - lib/nginxtra.rb
36
36
  - lib/nginxtra/action.rb
37
37
  - lib/nginxtra/actions/compile.rb
38
+ - lib/nginxtra/actions/convert.rb
38
39
  - lib/nginxtra/actions/install.rb
39
40
  - lib/nginxtra/actions/reload.rb
40
41
  - lib/nginxtra/actions/restart.rb
@@ -43,6 +44,7 @@ files:
43
44
  - lib/nginxtra/actions/stop.rb
44
45
  - lib/nginxtra/cli.rb
45
46
  - lib/nginxtra/config.rb
47
+ - lib/nginxtra/config_converter.rb
46
48
  - lib/nginxtra/error.rb
47
49
  - lib/nginxtra/status.rb
48
50
  - src/nginx/CHANGES