Update respond_to? calls for second argument.

Rack (since v2) has started explicitly listing the second
(optional) argument for respond_to?, which matches the
underlying Ruby spec. This patch fixes the calls in both C
and Ruby approaches.

[ew: add test, use rb_obj_respond_to if available]

1 files changed, 13 insertions, 4 deletions

diff --git a/ext/clogger_ext/clogger.c b/ext/clogger_ext/clogger.c
index 481dd61..fdc23e3 100644
--- a/ext/clogger_ext/clogger.c
+++ b/ext/clogger_ext/clogger.c
@@ -963,14 +963,23 @@ static VALUE clogger_init_copy(VALUE clone, VALUE orig)
  * used to delegate +:to_path+ checks for Rack webservers that optimize
  * static file serving
  */
-static VALUE respond_to(VALUE self, VALUE method)
+static VALUE respond_to(int argc, VALUE *argv, VALUE self)
 {
         struct clogger *c = clogger_get(self);
-        ID id = rb_to_id(method);
+        VALUE method, include_all;
+        ID id;
 
+        rb_scan_args(argc, argv, "11", &method, &include_all);
+        id = rb_to_id(method);
         if (close_id == id)
                 return Qtrue;
-        return rb_respond_to(c->body, id);
+
+#ifdef HAVE_RB_OBJ_RESPOND_TO
+        return rb_obj_respond_to(c->body, id, RTEST(include_all));
+#endif
+        if (argc == 1)
+                return rb_respond_to(c->body, id);
+        return rb_funcallv(c->body, respond_to_id, argc, argv);
 }
 
 /*
@@ -1044,7 +1053,7 @@ void Init_clogger_ext(void)
         rb_define_method(cClogger, "wrap_body?", clogger_wrap_body, 0);
         rb_define_method(cClogger, "reentrant?", clogger_reentrant, 0);
         rb_define_method(cClogger, "to_path", to_path, 0);
-        rb_define_method(cClogger, "respond_to?", respond_to, 1);
+        rb_define_method(cClogger, "respond_to?", respond_to, -1);
         rb_define_method(cClogger, "body", body, 0);
         CONST_GLOBAL_STR(REMOTE_ADDR);
         CONST_GLOBAL_STR(HTTP_X_FORWARDED_FOR);