Author: markt
Date: Sat Dec 17 10:56:33 2016
New Revision: 1774733
URL: http://svn.apache.org/viewvc?rev=1774733&view=rev
Log:
Fix line-endings for files that have no BOM and declare various encodings.
They are actually all ISO-8859-1 (so UTF-8 works as well)
Modified:
tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx
tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx
tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx
tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx
Modified: 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=1774733&r1=1774732&r2=1774733&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx [UTF-8]
(original)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-none.jspx [UTF-8] Sat
Dec 17 10:56:33 2016
@@ -14,8 +14,8 @@
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 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
Modified: 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=1774733&r1=1774732&r2=1774733&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx
[UTF-16BE] (original)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx
[UTF-16BE] Sat Dec 17 10:56:33 2016
@@ -1,21 +1 @@
-<?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
+㰀㼀砀洀氀 瘀攀爀猀椀漀渀㴀∀⸀ ∀ 攀渀挀漀搀椀渀最㴀∀唀吀䘀ⴀ㘀䈀䔀∀ 㼀㸀ഀ㰀℀ⴀⴀഀ 䰀椀挀攀渀猀攀搀 琀漀 琀栀攀 䄀瀀愀挀栀攀
匀漀昀琀眀愀爀攀 䘀漀甀渀搀愀琀椀漀渀 ⠀䄀匀䘀⤀ 甀渀搀攀爀 漀渀攀 漀爀 洀漀爀攀ഀ 挀漀渀琀爀椀戀甀琀漀爀 氀椀挀攀渀猀攀 愀最爀攀攀洀攀渀琀猀⸀
匀攀攀 琀栀攀 一伀吀䤀䌀䔀 昀椀氀攀 搀椀猀琀爀椀戀甀琀攀搀 眀椀琀栀ഀ 琀栀椀猀 眀漀爀欀 昀漀爀 愀搀搀椀琀椀漀渀愀氀 椀渀昀漀爀洀愀琀椀漀渀
爀攀最愀爀搀椀渀最 挀漀瀀礀爀椀最栀琀 漀眀渀攀爀猀栀椀瀀⸀ഀ 吀栀攀 䄀匀䘀 氀椀挀攀渀猀攀猀 琀栀椀猀 昀椀氀攀 琀漀 夀漀甀 甀渀搀攀爀 琀栀攀
䄀瀀愀挀栀攀 䰀椀挀攀渀猀攀Ⰰ 嘀攀爀猀椀漀�
�� ㈀⸀ ഀ ⠀琀栀攀 ∀䰀椀挀攀渀猀攀∀⤀㬀 礀漀甀 洀愀礀 渀漀琀 甀猀攀 琀栀椀猀 昀椀氀攀 攀砀挀攀瀀琀 椀渀 挀漀洀瀀氀椀愀渀挀攀
眀椀琀栀ഀ 琀栀攀 䰀椀挀攀渀猀攀⸀ 夀漀甀 洀愀礀 漀戀琀愀椀渀 愀 挀漀瀀礀 漀昀 琀栀攀 䰀椀挀攀渀猀攀 愀琀ഀഀ
栀琀琀瀀㨀⼀⼀眀眀眀⸀愀瀀愀挀栀攀⸀漀爀最⼀氀椀挀攀渀猀攀猀⼀䰀䤀䌀䔀一匀䔀ⴀ㈀⸀ ഀഀ 唀渀氀攀猀猀 爀攀焀甀椀爀攀搀 戀礀 愀瀀瀀氀椀挀愀戀氀攀
氀愀眀 漀爀 愀最爀攀攀搀 琀漀 椀渀 眀爀椀琀椀渀最Ⰰ 猀漀昀琀眀愀爀攀ഀ 搀椀猀琀爀椀戀甀琀攀搀 甀渀搀攀爀 琀栀攀 䰀椀挀攀渀猀攀 椀猀
搀椀猀琀爀椀戀甀琀攀搀 漀渀 愀渀 ∀䄀匀 䤀匀∀ 䈀䄀匀䤀匀Ⰰഀ ��
�䤀吀䠀伀唀吀 圀䄀刀刀䄀一吀䤀䔀匀 伀刀 䌀伀一䐀䤀吀䤀伀一匀 伀䘀 䄀一夀 䬀䤀一䐀Ⰰ 攀椀琀栀攀爀 攀砀瀀爀攀猀猀 漀爀 椀洀瀀氀椀攀搀⸀ഀ
匀攀攀 琀栀攀 䰀椀挀攀渀猀攀 昀漀爀 琀栀攀 猀瀀攀挀椀昀椀挀 氀愀渀最甀愀最攀 最漀瘀攀爀渀椀渀最 瀀攀爀洀椀猀猀椀漀渀猀 愀渀搀ഀ
氀椀洀椀琀愀琀椀漀渀猀 甀渀搀攀爀 琀栀攀 䰀椀挀攀渀猀攀⸀ഀⴀⴀ㸀ഀ㰀樀猀瀀㨀爀漀漀琀
砀洀氀渀猀㨀樀猀瀀㴀∀栀琀琀瀀㨀⼀⼀樀愀瘀愀⸀猀甀渀⸀挀漀洀⼀䨀匀倀⼀倀愀最攀∀ 瘀攀爀猀椀漀渀㴀∀㈀⸀㌀∀㸀ഀ 㰀樀猀瀀㨀搀椀爀攀挀琀椀瘀攀⸀瀀愀最攀
挀漀渀琀攀渀琀吀礀瀀攀㴀∀琀攀砀琀⼀瀀氀愀椀渀∀ ⼀㸀ഀ 㰀樀猀瀀㨀琀攀砀琀㸀伀䬀㰀⼀樀猀瀀㨀琀攀砀琀㸀ഀ㰀⼀樀猀
瀀㨀爀漀漀琀㸀
\ No newline at end of file
Modified: 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=1774733&r1=1774732&r2=1774733&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx
[UTF-16LE] (original)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx
[UTF-16LE] Sat Dec 17 10:56:33 2016
@@ -14,8 +14,8 @@
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 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
Modified: 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=1774733&r1=1774732&r2=1774733&view=diff
==============================================================================
--- tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx [UTF-8]
(original)
+++ tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf8.jspx [UTF-8] Sat
Dec 17 10:56:33 2016
@@ -14,8 +14,8 @@
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 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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
