From 88ff8c69a0621b335794271ade7003aad65bd5ef Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 16 Sep 2018 22:54:09 +0900 Subject: [PATCH] Update mruby 1.4.1 --- src/shrpx_mruby_module_request.cc | 2 +- src/shrpx_mruby_module_response.cc | 6 +++--- third-party/mruby | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/shrpx_mruby_module_request.cc b/src/shrpx_mruby_module_request.cc index 0cd0d038..1ed3aa90 100644 --- a/src/shrpx_mruby_module_request.cc +++ b/src/shrpx_mruby_module_request.cc @@ -254,7 +254,7 @@ mrb_value request_mod_header(mrb_state *mrb, mrb_value self, bool repl) { } if (mrb_array_p(values)) { - auto n = mrb_ary_len(mrb, values); + auto n = RARRAY_LEN(values); for (int i = 0; i < n; ++i) { auto value = mrb_ary_ref(mrb, values, i); if (!mrb_string_p(value)) { diff --git a/src/shrpx_mruby_module_response.cc b/src/shrpx_mruby_module_response.cc index 62f46d5a..3b24ea06 100644 --- a/src/shrpx_mruby_module_response.cc +++ b/src/shrpx_mruby_module_response.cc @@ -146,7 +146,7 @@ mrb_value response_mod_header(mrb_state *mrb, mrb_value self, bool repl) { } if (mrb_array_p(values)) { - auto n = mrb_ary_len(mrb, values); + auto n = RARRAY_LEN(values); for (int i = 0; i < n; ++i) { auto value = mrb_ary_ref(mrb, values, i); if (!mrb_string_p(value)) { @@ -299,7 +299,7 @@ mrb_value response_send_info(mrb_state *mrb, mrb_value self) { auto &balloc = downstream->get_block_allocator(); auto keys = mrb_hash_keys(mrb, hash); - auto keyslen = mrb_ary_len(mrb, keys); + auto keyslen = RARRAY_LEN(keys); for (int i = 0; i < keyslen; ++i) { auto key = mrb_ary_ref(mrb, keys, i); @@ -322,7 +322,7 @@ mrb_value response_send_info(mrb_state *mrb, mrb_value self) { auto token = http2::lookup_token(keyref.byte(), keyref.size()); if (mrb_array_p(values)) { - auto n = mrb_ary_len(mrb, values); + auto n = RARRAY_LEN(values); for (int i = 0; i < n; ++i) { auto value = mrb_ary_ref(mrb, values, i); if (!mrb_string_p(value)) { diff --git a/third-party/mruby b/third-party/mruby index 46960936..023070a6 160000 --- a/third-party/mruby +++ b/third-party/mruby @@ -1 +1 @@ -Subproject commit 4696093673c3352a1897490ecc5e4e4e40f463b5 +Subproject commit 023070a6396233974785a8fd5735b9380a884f27