support an init param for the filter to configure whether response is handled "by default"

Author: kares

src/main/java/org/jruby/rack/UnmappedRackFilter.java

@@ -43,6 +43,8 @@ public class UnmappedRackFilter extends AbstractFilter {
     // NOTE: it's true by default for backwards compatibility
     private Object resetUnhandledResponse = Boolean.TRUE;
 
+    private boolean responseHandledByDefault = true;
+
     private Collection<Integer> responseNotHandledStatuses =
         // 403 due containers not supporting PUT/DELETE correctly (Tomcat 6)
         // 405 returned by Jetty 7/8 on PUT/DELETE requests by default
@@ -70,7 +72,7 @@ public void init(FilterConfig config) throws ServletException {
         String value = config.getInitParameter("resetUnhandledResponse");
         if ( value != null ) setResetUnhandledResponseValue(value);
 
-        // ResponseCapture.defaultNotHandledStatuses e.g. "403,404,500"
+        // ResponseCapture.notHandledStatuses e.g. "403,404,500"
         value = config.getInitParameter("responseNotHandledStatuses");
         if ( value != null ) {
             final Set<Integer> statuses = new HashSet<Integer>();
@@ -82,6 +84,11 @@ public void init(FilterConfig config) throws ServletException {
             }
             responseNotHandledStatuses = statuses;
         }
+        // ResponseCapture.handledByDefault true/false (true by default)
+        value = config.getInitParameter("responseHandledByDefault");
+        if ( value != null ) {
+            responseHandledByDefault = Boolean.parseBoolean(value);
+        }
     }
 
     @Override
@@ -148,6 +155,7 @@ else if ( isResetUnhandledResponseBuffer() ) {
     protected ResponseCapture wrapResponse(ServletResponse response) {
         final ResponseCapture capture = super.wrapResponse(response);
         capture.setNotHandledStatuses( getResponseNotHandledStatuses() );
+        capture.setHandledByDefault( isResponseHandledByDefault() );
         return capture;
     }
 
@@ -188,4 +196,12 @@ public void setDefaultNotHandledStatuses(final Collection<Integer> responseNotHa
             responseNotHandledStatuses == null ? Collections.EMPTY_SET : responseNotHandledStatuses;
     }
 
+    public boolean isResponseHandledByDefault() {
+        return responseHandledByDefault;
+    }
+
+    public void setResponseHandledByDefault(boolean responseHandledByDefault) {
+        this.responseHandledByDefault = responseHandledByDefault;
+    }
+
 }

src/main/java/org/jruby/rack/servlet/ResponseCapture.java

@@ -28,11 +28,12 @@ public class ResponseCapture extends HttpServletResponseWrapper {
     private static final String STREAM = "stream";
     private static final String WRITER = "writer";
 
-    private static Collection<Integer> defaultNotHandledStatuses = Collections.singleton(404);
+    private static final Collection<Integer> defaultNotHandledStatuses = Collections.singleton(404);
 
     private Integer status;
     private Object output;
 
+    private boolean handledByDefault;
     private Collection<Integer> notHandledStatuses = defaultNotHandledStatuses;
 
     /**
@@ -219,7 +220,7 @@ public boolean isHandled(final HttpServletRequest request) {
                 // true by default seems very weird but this is best to cover
                 // "more" containers right out of the box ...
                 // e.g. Jetty https://github.com/jruby/jruby-rack/issues/175
-                return handled = true; // return false;
+                return handled = isHandledByDefault();
             }
 
             // consider HTTP OPTIONS with "Allow" header unhandled :
@@ -253,6 +254,14 @@ public void setNotHandledStatuses(final Collection<Integer> notHandledStatuses)
             notHandledStatuses == null ? Collections.EMPTY_SET : notHandledStatuses;
     }
 
+    boolean isHandledByDefault() {
+        return handledByDefault;
+    }
+
+    public void setHandledByDefault(boolean handledByDefault) {
+        this.handledByDefault = handledByDefault;
+    }
+
     /**
      * @return true if {@link #getOutputStream()} (or {@link #getWriter()}) has
      * been accessed

src/spec/ruby/rack/servlet/response_capture_spec.rb

@@ -4,7 +4,9 @@
 
   let(:servlet_response) { MockHttpServletResponse.new }
   let(:response_capture) do
-    org.jruby.rack.servlet.ResponseCapture.new(servlet_response)
+    response = org.jruby.rack.servlet.ResponseCapture.new(servlet_response)
+    response.handled_by_default = true
+    response
   end
 
   let(:servlet_request) { MockHttpServletRequest.new(@servlet_context) }