technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Ruby: fixing initialization sequence.

Browse Source 
There was a change (ruby/ruby@6c70fed) in Ruby 2.6 that moved
RUBY_DESCRIPTION global constant definition out of Init_version().
Unit initialized Ruby incorrectly, so the constant was not defined.

This closes #330 issue on GitHub.
This commit is contained in:
Max Romanov
2019-11-13 15:53:49 +03:00
parent f2610d2160
commit bdd96bc9ed
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ruby/nxt_ruby.c
View File

@@ -85,14 +85,16 @@ static nxt_int_t
nxt_ruby_init(nxt_task_t *task, nxt_common_app_conf_t *conf) nxt_ruby_init(nxt_task_t *task, nxt_common_app_conf_t *conf)
{ {
int state, rc; int state, rc;
VALUE dummy, res; VALUE res;
nxt_unit_ctx_t *unit_ctx; nxt_unit_ctx_t *unit_ctx;
nxt_unit_init_t ruby_unit_init; nxt_unit_init_t ruby_unit_init;
nxt_ruby_rack_init_t rack_init; nxt_ruby_rack_init_t rack_init;
static char *argv[2] = { (char *) "NGINX_Unit", (char *) "-e0" };
RUBY_INIT_STACK
ruby_init(); ruby_init();
Init_stack(&dummy); ruby_options(2, argv);
ruby_init_loadpath();
ruby_script("NGINX_Unit"); ruby_script("NGINX_Unit");
rack_init.task = task; rack_init.task = task;
@@ -707,7 +709,8 @@ nxt_ruby_rack_result_body(VALUE result)
} }
} else if (rb_respond_to(body, rb_intern("each"))) { } else if (rb_respond_to(body, rb_intern("each"))) {
rb_iterate(rb_each, body, nxt_ruby_rack_result_body_each, 0); rb_block_call(body, rb_intern("each"), 0, 0,
nxt_ruby_rack_result_body_each, 0);
} else { } else {
nxt_unit_req_error(nxt_ruby_run_ctx.req, nxt_unit_req_error(nxt_ruby_run_ctx.req,