Attachment #37241 for bug #64432

View | Details | Raw Unified | Return to bug 64432
Collapse All | Expand All





    protected RewriteCond[] conditions = new RewriteCond[0];

    protected ThreadLocal<Pattern> pattern = new ThreadLocal<>();
    protected Substitution substitution = null;

    protected String patternString = null;

     * @return <code>null</code> if no rewrite took place
     */
    public CharSequence evaluate(CharSequence url, Resolver resolver) {
        Pattern pattern = this.pattern.get();
        if (pattern == null) {
            // Parse the pattern
            int flags = 0;

                flags |= Pattern.CASE_INSENSITIVE;
            }
            pattern = Pattern.compile(patternString, flags);
            this.pattern.set(pattern);
        }
        Matcher matcher = pattern.matcher(url);
        // Use XOR

Lines 605-610 Link Here

(-)test/org/apache/catalina/valves/rewrite/TestRewriteValve.java (+9 lines)
605	doTestRewrite("RewriteRule !^/c/.* /b/", "/c/d", "/c/d");	605	doTestRewrite("RewriteRule !^/c/.* /b/", "/c/d", "/c/d");
606	}	606	}
607		607
		608	@Test
		609	public void testMultiLine001() throws Exception {
		610	doTestRewrite("RewriteRule /dummy /anotherDummy [L]\nRewriteRule ^/a /c [L]", "/a", "/c");
		611	}
		612
		613	@Test
		614	public void testMultiLine002() throws Exception {
		615	doTestRewrite("RewriteRule /dummy /a\nRewriteRule /a /c [L]", "/dummy", "/c");
		616	}
608		617
609	private void doTestRewrite(String config, String request, String expectedURI) throws Exception {	618	private void doTestRewrite(String config, String request, String expectedURI) throws Exception {
610	doTestRewrite(config, request, expectedURI, null);	619	doTestRewrite(config, request, expectedURI, null);

Return to bug 64432

Lines 26-32 Link Here

(-)java/org/apache/catalina/valves/rewrite/RewriteRule.java (-3 / +3 lines)
26		26
27	protected RewriteCond[] conditions = new RewriteCond[0];	27	protected RewriteCond[] conditions = new RewriteCond[0];
28		28
29	protected static ThreadLocal<Pattern> pattern = new ThreadLocal<>();	29	protected ThreadLocal<Pattern> pattern = new ThreadLocal<>();
30	protected Substitution substitution = null;	30	protected Substitution substitution = null;
31		31
32	protected String patternString = null;	32	protected String patternString = null;
Lines 86-92 Link Here
86	* @return <code>null</code> if no rewrite took place	86	* @return <code>null</code> if no rewrite took place
87	*/	87	*/
88	public CharSequence evaluate(CharSequence url, Resolver resolver) {	88	public CharSequence evaluate(CharSequence url, Resolver resolver) {
89	Pattern pattern = RewriteRule.pattern.get();	89	Pattern pattern = this.pattern.get();
90	if (pattern == null) {	90	if (pattern == null) {
91	// Parse the pattern	91	// Parse the pattern
92	int flags = 0;	92	int flags = 0;
Lines 94-100 Link Here
94	flags \|= Pattern.CASE_INSENSITIVE;	94	flags \|= Pattern.CASE_INSENSITIVE;
95	}	95	}
96	pattern = Pattern.compile(patternString, flags);	96	pattern = Pattern.compile(patternString, flags);
97	RewriteRule.pattern.set(pattern);	97	this.pattern.set(pattern);
98	}	98	}
99	Matcher matcher = pattern.matcher(url);	99	Matcher matcher = pattern.matcher(url);
100	// Use XOR	100	// Use XOR