craigmcc 01/04/17 09:35:06
Modified: tester/src/tester/org/apache/tester WrapperFilter.java
tester/web/WEB-INF web.xml
Added: tester/src/tester/org/apache/tester StaticFilter.java
Log:
Add a separate Filter to reset the static logger at the beginning of each
request, so that nothing can accidentally leak through from previous
requests.
Revision Changes Path
1.4 +2 -3
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/WrapperFilter.java
Index: WrapperFilter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/WrapperFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WrapperFilter.java 2001/03/17 18:50:32 1.3
+++ WrapperFilter.java 2001/04/17 16:34:55 1.4
@@ -68,7 +68,7 @@
* it passes on with either generic or HTTP-specific wrappers.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/03/17 18:50:32 $
+ * @version $Revision: 1.4 $ $Date: 2001/04/17 16:34:55 $
*/
public class WrapperFilter implements Filter {
@@ -137,8 +137,7 @@
((HttpServletResponse) inResponse);
}
- // Reset our logger and perform this request
- StaticLogger.reset();
+ // Perform this request
chain.doFilter(outRequest, outResponse);
}
1.1
jakarta-tomcat-4.0/tester/src/tester/org/apache/tester/StaticFilter.java
Index: StaticFilter.java
===================================================================
/* ========================================================================= *
* *
* The Apache Software License, Version 1.1 *
* *
* Copyright (c) 1999, 2000, 2001 The Apache Software Foundation. *
* All rights reserved. *
* *
* ========================================================================= *
* *
* Redistribution and use in source and binary forms, with or without modi- *
* fication, are permitted provided that the following conditions are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice *
* notice, this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. The end-user documentation included with the redistribution, if any, *
* must include the following acknowlegement: *
* *
* "This product includes software developed by the Apache Software *
* Foundation <http://www.apache.org/>." *
* *
* Alternately, this acknowlegement may appear in the software itself, if *
* and wherever such third-party acknowlegements normally appear. *
* *
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software *
* Foundation" must not be used to endorse or promote products derived *
* from this software without prior written permission. For written *
* permission, please contact <[EMAIL PROTECTED]>. *
* *
* 5. Products derived from this software may not be called "Apache" nor may *
* "Apache" appear in their names without prior written permission of the *
* Apache Software Foundation. *
* *
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES *
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY *
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL *
* THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY *
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL *
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS *
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) *
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, *
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN *
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *
* POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= *
* *
* This software consists of voluntary contributions made by many indivi- *
* duals on behalf of the Apache Software Foundation. For more information *
* on the Apache Software Foundation, please see <http://www.apache.org/>. *
* *
* ========================================================================= */
package org.apache.tester;
import java.io.*;
import java.util.*;
import javax.servlet.*;
import javax.servlet.http.*;
/**
* Simple filter to reset the static log at the beginning of each request,
* so that no leftovers from the previous request are inadvertently included.
*
* @author Craig R. McClanahan
* @version $Revision: 1.1 $ $Date: 2001/04/17 16:34:54 $
*/
public class StaticFilter implements Filter {
// ----------------------------------------------------------- Constructors
// ----------------------------------------------------- Instance Variables
/**
* The filter configuration object for this filter.
*/
protected FilterConfig config = null;
// --------------------------------------------------------- Public Methods
/**
* Release this Filter instance from service.
*/
public void destroy() {
config = null;
}
/**
* Wrap this request and/or response as configured and pass it on.
*/
public void doFilter(ServletRequest inRequest, ServletResponse inResponse,
FilterChain chain)
throws IOException, ServletException {
// Reset our logger and perform this request
StaticLogger.reset();
chain.doFilter(inRequest, inResponse);
}
/**
* Place this Filter instance into service.
*
* @param config The filter configuration object
*/
public void init(FilterConfig config) throws ServletException {
this.config = config;
}
}
1.22 +12 -0 jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/tester/web/WEB-INF/web.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- web.xml 2001/04/17 04:22:25 1.21
+++ web.xml 2001/04/17 16:35:03 1.22
@@ -38,7 +38,19 @@
</filter>
+ <filter>
+ <filter-name>StaticFilter</filter-name>
+ <filter-class>org.apache.tester.StaticFilter</filter-class>
+ </filter>
+
+
<!-- ========== Filter Mappings ======================================= -->
+
+ <!-- Use StaticFilter on *all* requests to clear static log -->
+ <filter-mapping>
+ <filter-name>StaticFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<filter-mapping>
<filter-name>HttpFilter</filter-name>
