about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorPat Allan <pat@freelancing-gods.com>2017-05-21 14:01:30 +1000
committerEric Wong <e@80x24.org>2017-05-21 04:18:46 +0000
commite10ef6433f47f6152b776237c5f408e35c186dce (patch)
treea30271a2bec96ef6b00347d47ba0e7a28721e391
parent029d072d420f0adf98c620913fe05eba3222e244 (diff)
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.

However, rb_respond_to only accepts a single argument - differing from the Ruby side of things - so perhaps this patch isn't quite perfect (and my C skills are very limited, so the whole thing could use a review).
-rw-r--r--ext/clogger_ext/clogger.c8
-rw-r--r--lib/clogger/pure.rb4
2 files changed, 8 insertions, 4 deletions
diff --git a/ext/clogger_ext/clogger.c b/ext/clogger_ext/clogger.c
index 481dd61..622c98c 100644
--- a/ext/clogger_ext/clogger.c
+++ b/ext/clogger_ext/clogger.c
@@ -963,8 +963,12 @@ 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)
 {
+        VALUE method, include_all;
+        rb_scan_args(argc, argv, "11", &method, &include_all);
+        if (NIL_P(include_all)) include_all = Qfalse;
+
         struct clogger *c = clogger_get(self);
         ID id = rb_to_id(method);
 
@@ -1044,7 +1048,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);
diff --git a/lib/clogger/pure.rb b/lib/clogger/pure.rb
index 77f81b4..fddfe79 100644
--- a/lib/clogger/pure.rb
+++ b/lib/clogger/pure.rb
@@ -77,8 +77,8 @@ class Clogger
     @logger.respond_to?(:fileno) ? @logger.fileno : nil
   end
 
-  def respond_to?(m)
-    :close == m.to_sym || @body.respond_to?(m)
+  def respond_to?(method, include_all=false)
+    :close == method.to_sym || @body.respond_to?(method, include_all)
   end
 
   def to_path