Author: markt Date: Sat Dec 17 11:11:51 2016 New Revision: 1774736 URL: http://svn.apache.org/viewvc?rev=1774736&view=rev Log: Engage brain / consume more caffeine. If no BOM then prolog *does* define the encoding.
Modified: tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx (contents, props changed) tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx (contents, props changed) 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=1774736&r1=1774735&r2=1774736&view=diff ============================================================================== --- tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx [UTF-8] (original) +++ tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx [UTF-16BE] Sat Dec 17 11:11:51 2016 @@ -1,21 +1,21 @@ -<?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> +<?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-none-prolog-utf16be.jspx ('svn:eol-style' removed) Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16be.jspx ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Sat Dec 17 11:11:51 2016 @@ -1 +1 @@ -text/plain; charset=UTF-8 +text/plain; charset=UTF-16BE 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=1774736&r1=1774735&r2=1774736&view=diff ============================================================================== --- tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx [UTF-8] (original) +++ tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx [UTF-16LE] Sat Dec 17 11:11:51 2016 @@ -1,21 +1,21 @@ -<?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> +<?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-none-prolog-utf16le.jspx ('svn:eol-style' removed) Propchange: tomcat/trunk/test/webapp/jsp/encoding/bom-none-prolog-utf16le.jspx ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Sat Dec 17 11:11:51 2016 @@ -1 +1 @@ -text/plain; charset=UTF-8 +text/plain; charset=UTF-16LE --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org