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

Ruby: changing callback functions prototype for v2.7.

Browse Source 
This closes #371 issue on GitHub.
This commit is contained in:
Max Romanov
2020-01-28 16:59:12 +03:00
parent 4bad2cf1e9
commit 2f8b243fa4
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ruby/nxt_ruby.c
View File

@@ -52,7 +52,8 @@ static int nxt_ruby_hash_info(VALUE r_key, VALUE r_value, VALUE arg);
static int nxt_ruby_hash_add(VALUE r_key, VALUE r_value, VALUE arg);
static int nxt_ruby_rack_result_body(VALUE result);
static int nxt_ruby_rack_result_body_file_write(VALUE filepath);
static VALUE nxt_ruby_rack_result_body_each(VALUE body);
static VALUE nxt_ruby_rack_result_body_each(VALUE body, VALUE arg,
int argc, const VALUE *argv, VALUE blockarg);
static void nxt_ruby_exception_log(nxt_task_t *task, uint32_t level,
const char *desc);
@@ -813,7 +814,8 @@ nxt_ruby_rack_result_body_file_write(VALUE filepath)
static VALUE
nxt_ruby_rack_result_body_each(VALUE body)
nxt_ruby_rack_result_body_each(VALUE body, VALUE arg, int argc,
const VALUE *argv, VALUE blockarg)
{
int rc;

18
src/ruby/nxt_ruby_stream_io.c
View File

@@ -10,15 +10,15 @@
static VALUE nxt_ruby_stream_io_new(VALUE class, VALUE wrap);
static VALUE nxt_ruby_stream_io_initialize(int argc, VALUE *argv, VALUE self);
static VALUE nxt_ruby_stream_io_gets(VALUE obj, VALUE args);
static VALUE nxt_ruby_stream_io_each(VALUE obj, VALUE args);
static VALUE nxt_ruby_stream_io_gets(VALUE obj);
static VALUE nxt_ruby_stream_io_each(VALUE obj);
static VALUE nxt_ruby_stream_io_read(VALUE obj, VALUE args);
static VALUE nxt_ruby_stream_io_rewind(VALUE obj, VALUE args);
static VALUE nxt_ruby_stream_io_rewind(VALUE obj);
static VALUE nxt_ruby_stream_io_puts(VALUE obj, VALUE args);
static VALUE nxt_ruby_stream_io_write(VALUE obj, VALUE args);
nxt_inline long nxt_ruby_stream_io_s_write(nxt_ruby_run_ctx_t *run_ctx,
VALUE val);
static VALUE nxt_ruby_stream_io_flush(VALUE obj, VALUE args);
static VALUE nxt_ruby_stream_io_flush(VALUE obj);
VALUE
@@ -85,7 +85,7 @@ nxt_ruby_stream_io_initialize(int argc, VALUE *argv, VALUE self)
static VALUE
nxt_ruby_stream_io_gets(VALUE obj, VALUE args)
nxt_ruby_stream_io_gets(VALUE obj)
{
VALUE buf;
char *p;
@@ -132,7 +132,7 @@ nxt_ruby_stream_io_gets(VALUE obj, VALUE args)
static VALUE
nxt_ruby_stream_io_each(VALUE obj, VALUE args)
nxt_ruby_stream_io_each(VALUE obj)
{
VALUE chunk;
@@ -141,7 +141,7 @@ nxt_ruby_stream_io_each(VALUE obj, VALUE args)
}
for ( ;; ) {
chunk = nxt_ruby_stream_io_gets(obj, Qnil);
chunk = nxt_ruby_stream_io_gets(obj);
if (chunk == Qnil) {
return Qnil;
@@ -203,7 +203,7 @@ nxt_ruby_stream_io_read(VALUE obj, VALUE args)
static VALUE
nxt_ruby_stream_io_rewind(VALUE obj, VALUE args)
nxt_ruby_stream_io_rewind(VALUE obj)
{
return Qnil;
}
@@ -266,7 +266,7 @@ nxt_ruby_stream_io_s_write(nxt_ruby_run_ctx_t *run_ctx, VALUE val)
static VALUE
nxt_ruby_stream_io_flush(VALUE obj, VALUE args)
nxt_ruby_stream_io_flush(VALUE obj)
{
return Qnil;
}