You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/12/15 21:16:06 UTC
svn commit: r1774522 - in /tomcat/trunk: ./ test/org/apache/jasper/compiler/
test/webapp/jsp/encoding/
Author: markt
Date: Thu Dec 15 21:16:06 2016
New Revision: 1774522
URL: http://svn.apache.org/viewvc?rev=1774522&view=rev
Log:
Add some tests for the Jasper's file encoding detection.
This is to support some refactoring I am working on to remove the custom XML parser in Jasper.
Added:
tomcat/trunk/test/org/apache/jasper/compiler/TestEncodingDetector.java (with props)
tomcat/trunk/test/webapp/jsp/encoding/
tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jsp (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx
tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx
tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-none.jsp (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-none.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf16be.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf16le.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf8.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jsp (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16be.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16le.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf8.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jsp (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16be.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16le.jspx (with props)
tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx (with props)
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1774522&r1=1774521&r2=1774522&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Dec 15 21:16:06 2016
@@ -560,6 +560,8 @@
<exclude name="test/webapp/bug53257/**/*.txt"/>
<exclude name="test/webapp-fragments/WEB-INF/classes/*.txt"/>
<exclude name="test/webresources/**"/>
+ <!-- Exclude test files with unusual encodings -->
+ <exclude name="test/webapp/jsp/encoding/**"/>
</fileset>
<fileset dir="modules/jdbc-pool" >
<exclude name=".*/**"/>
Added: tomcat/trunk/test/org/apache/jasper/compiler/TestEncodingDetector.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestEncodingDetector.java?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/compiler/TestEncodingDetector.java (added)
+++ tomcat/trunk/test/org/apache/jasper/compiler/TestEncodingDetector.java Thu Dec 15 21:16:06 2016
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jasper.compiler;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+import org.apache.catalina.startup.TomcatBaseTest;
+import org.apache.tomcat.util.buf.ByteChunk;
+
+@RunWith(Parameterized.class)
+public class TestEncodingDetector extends TomcatBaseTest {
+
+ @Parameters
+ public static Collection<Object[]> inputs() {
+ /// Note: These files are saved using the encoding indicated by the BOM
+ List<Object[]> result = new ArrayList<>();
+ result.add(new Object[] { "bom-none-prolog-none.jsp", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-none.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-utf16be.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-utf16le.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-none-prolog-utf8.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf8-prolog-none.jsp", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf8-prolog-none.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf8-prolog-utf16be.jspx", Integer.valueOf(500), null });
+ result.add(new Object[] { "bom-utf8-prolog-utf16le.jspx", Integer.valueOf(500), null });
+ result.add(new Object[] { "bom-utf8-prolog-utf8.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16be-prolog-none.jsp", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16be-prolog-none.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16be-prolog-utf16be.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16be-prolog-utf16le.jspx", Integer.valueOf(500), null });
+ result.add(new Object[] { "bom-utf16be-prolog-utf8.jspx", Integer.valueOf(500), null });
+ result.add(new Object[] { "bom-utf16le-prolog-none.jsp", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16le-prolog-none.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16le-prolog-utf16be.jspx", Integer.valueOf(500), null });
+ result.add(new Object[] { "bom-utf16le-prolog-utf16le.jspx", Integer.valueOf(200), Boolean.TRUE });
+ result.add(new Object[] { "bom-utf16le-prolog-utf8.jspx", Integer.valueOf(500), null });
+ return result;
+ }
+
+
+ @Parameter(0)
+ public String jspName;
+
+ @Parameter(1)
+ public int expectedResponseCode;
+
+ @Parameter(2)
+ public Boolean responseBodyOK;
+
+ @Test
+ public void testEncodedJsp() throws Exception {
+ getTomcatInstanceTestWebapp(false, true);
+
+ ByteChunk responseBody = new ByteChunk();
+ int rc = getUrl("http://localhost:" + getPort() + "/test/jsp/encoding/" + jspName,
+ responseBody, null);
+
+ Assert.assertEquals(expectedResponseCode, rc);
+
+ if (expectedResponseCode == 200) {
+ // trim() to remove whitespace like new lines
+ String bodyText = responseBody.toString().trim();
+ if (responseBodyOK.booleanValue()) {
+ Assert.assertEquals("OK", bodyText);
+ } else {
+ Assert.assertNotEquals("OK", bodyText);
+ }
+ }
+ }
+}
Propchange: tomcat/trunk/test/org/apache/jasper/compiler/TestEncodingDetector.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jsp?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jsp (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jsp Thu Dec 15 21:16:06 2016
@@ -0,0 +1,17 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--%>
+<%@ page contentType="text/plain"%>OK
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx Thu Dec 15 21:16:06 2016
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
+</jsp:root>
\ No newline at end of file
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx?rev=1774522&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx?rev=1774522&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx Thu Dec 15 21:16:06 2016
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
+</jsp:root>
\ No newline at end of file
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-none.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-none.jsp?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-none.jsp (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-none.jsp [UTF-16BE] Thu Dec 15 21:16:06 2016
@@ -0,0 +1,17 @@
+\ufeff<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--%>
+<%@ page contentType="text/plain; charset=UTF-8" pageEncoding="UTF-16BE"%>OK
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-none.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-16BE
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-none.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-none.jspx?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-none.jspx (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-none.jspx [UTF-16BE] Thu Dec 15 21:16:06 2016
@@ -0,0 +1,21 @@
+\ufeff<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
+</jsp:root>
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-none.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-16BE
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf16be.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf16be.jspx?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf16be.jspx (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf16be.jspx [UTF-16BE] Thu Dec 15 21:16:06 2016
@@ -0,0 +1,21 @@
+\ufeff<?xml version="1.0" encoding="UTF-16BE" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
+</jsp:root>
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf16be.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-16BE
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf16le.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf16le.jspx?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf16le.jspx (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf16le.jspx [UTF-16BE] Thu Dec 15 21:16:06 2016
@@ -0,0 +1,21 @@
+\ufeff<?xml version="1.0" encoding="UTF-16LE" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
+</jsp:root>
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf16le.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-16BE
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf8.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf8.jspx?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf8.jspx (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf8.jspx [UTF-16BE] Thu Dec 15 21:16:06 2016
@@ -0,0 +1,21 @@
+\ufeff<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
+</jsp:root>
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16be-prolog-utf8.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-16BE
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jsp?rev=1774522&view=auto
==============================================================================
Binary files tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jsp (added) and tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jsp Thu Dec 15 21:16:06 2016 differ
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain; UTF-16BE
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jspx?rev=1774522&view=auto
==============================================================================
Binary files tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jspx (added) and tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jspx Thu Dec 15 21:16:06 2016 differ
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-none.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; UTF-16BE
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16be.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16be.jspx?rev=1774522&view=auto
==============================================================================
Binary files tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16be.jspx (added) and tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16be.jspx Thu Dec 15 21:16:06 2016 differ
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16be.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; UTF-16BE
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16le.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16le.jspx?rev=1774522&view=auto
==============================================================================
Binary files tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16le.jspx (added) and tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16le.jspx Thu Dec 15 21:16:06 2016 differ
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf16le.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; UTF-16BE
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf8.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf8.jspx?rev=1774522&view=auto
==============================================================================
Binary files tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf8.jspx (added) and tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf8.jspx Thu Dec 15 21:16:06 2016 differ
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf16le-prolog-utf8.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; UTF-16BE
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jsp
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jsp?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jsp (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jsp [UTF-8] Thu Dec 15 21:16:06 2016
@@ -0,0 +1,17 @@
+\ufeff<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--%>
+<%@ page contentType="text/plain"%>OK
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jsp
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-8
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx [UTF-8] Thu Dec 15 21:16:06 2016
@@ -0,0 +1,21 @@
+\ufeff<?xml version="1.0" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
+</jsp:root>
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-none.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-8
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16be.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16be.jspx?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16be.jspx (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16be.jspx [UTF-8] Thu Dec 15 21:16:06 2016
@@ -0,0 +1,21 @@
+\ufeff<?xml version="1.0" encoding="UTF-16BE" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
+</jsp:root>
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16be.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-8
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16le.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16le.jspx?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16le.jspx (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16le.jspx [UTF-8] Thu Dec 15 21:16:06 2016
@@ -0,0 +1,21 @@
+\ufeff<?xml version="1.0" encoding="UTF-16LE" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
+</jsp:root>
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf16le.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-8
Added: tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx?rev=1774522&view=auto
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx (added)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx [UTF-8] Thu Dec 15 21:16:06 2016
@@ -0,0 +1,21 @@
+\ufeff<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.3">
+ <jsp:directive.page contentType="text/plain" />
+ <jsp:text>OK</jsp:text>
+</jsp:root>
\ No newline at end of file
Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-utf8-prolog-utf8.jspx
------------------------------------------------------------------------------
svn:mime-type = text/plain; charset=UTF-8
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org