Fix svn properties:

- java/org/apache/tomcat/util/http/fileupload/InvalidFileNameException.java
  Removed mime-type and added eol-style and keywords.
  Already pinged upstream about that.
  Used the same keywords as the other files, slightly
  different from TC conventions.
- We should add tag, tagx, jspf, jspx to our eol-style
  subversion configuration for native line endings.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@981441 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/tomcat/util/http/fileupload/InvalidFileNameException.java b/java/org/apache/tomcat/util/http/fileupload/InvalidFileNameException.java
index f09357e..f86b6f5 100644 (file)
--- a/java/org/apache/tomcat/util/http/fileupload/InvalidFileNameException.java
+++ b/java/org/apache/tomcat/util/http/fileupload/InvalidFileNameException.java
@@ -1,50 +1,50 @@
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.util.http.fileupload;\r
-\r
-\r
-/**\r
- * This exception is thrown in case of an invalid file name.\r
- * A file name is invalid, if it contains a NUL character.\r
- * Attackers might use this to circumvent security checks:\r
- * For example, a malicious user might upload a file with the name\r
- * "foo.exe\0.png". This file name might pass security checks (i.e.\r
- * checks for the extension ".png"), while, depending on the underlying\r
- * C library, it might create a file named "foo.exe", as the NUL\r
- * character is the string terminator in C.\r
- */\r
-public class InvalidFileNameException extends RuntimeException {\r
-    private static final long serialVersionUID = 7922042602454350470L;\r
-    private final String name;\r
-\r
-    /**\r
-     * Creates a new instance.\r
-     * @param pName The file name causing the exception.\r
-     * @param pMessage A human readable error message.\r
-     */\r
-    public InvalidFileNameException(String pName, String pMessage) {\r
-        super(pMessage);\r
-        name = pName;\r
-    }\r
-\r
-    /**\r
-     * Returns the invalid file name.\r
-     */\r
-    public String getName() {\r
-        return name;\r
-    }\r
-}\r
+/*
+ * 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.tomcat.util.http.fileupload;
+
+
+/**
+ * This exception is thrown in case of an invalid file name.
+ * A file name is invalid, if it contains a NUL character.
+ * Attackers might use this to circumvent security checks:
+ * For example, a malicious user might upload a file with the name
+ * "foo.exe\0.png". This file name might pass security checks (i.e.
+ * checks for the extension ".png"), while, depending on the underlying
+ * C library, it might create a file named "foo.exe", as the NUL
+ * character is the string terminator in C.
+ */
+public class InvalidFileNameException extends RuntimeException {
+    private static final long serialVersionUID = 7922042602454350470L;
+    private final String name;
+
+    /**
+     * Creates a new instance.
+     * @param pName The file name causing the exception.
+     * @param pMessage A human readable error message.
+     */
+    public InvalidFileNameException(String pName, String pMessage) {
+        super(pMessage);
+        name = pName;
+    }
+
+    /**
+     * Returns the invalid file name.
+     */
+    public String getName() {
+        return name;
+    }
+}

diff --git a/test/webapp-3.0/WEB-INF/tags/bug42390.tag b/test/webapp-3.0/WEB-INF/tags/bug42390.tag
index 2e6840a..97619ed 100644 (file)
--- a/test/webapp-3.0/WEB-INF/tags/bug42390.tag
+++ b/test/webapp-3.0/WEB-INF/tags/bug42390.tag
@@ -1,18 +1,18 @@
-<%--\r
- Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
---%>\r
-<%@ variable name-given="X" scope="AT_BEGIN" %>\r
+<%--
+ 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.
+--%>
+<%@ variable name-given="X" scope="AT_BEGIN" %>
 <jsp:doBody/>
\ No newline at end of file

diff --git a/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag b/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag
index ad701a7..a884e9b 100644 (file)
--- a/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag
+++ b/test/webapp-3.0/WEB-INF/tags/echo-deferred.tag
@@ -1,17 +1,17 @@
-<%--\r
- Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
---%><%@ tag %><%@ attribute name="echo" deferredValue="true" %><%@\r
+<%--
+ 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.
+--%><%@ tag %><%@ attribute name="echo" deferredValue="true" %><%@
 tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file

diff --git a/test/webapp-3.0/WEB-INF/tags/echo-double.tag b/test/webapp-3.0/WEB-INF/tags/echo-double.tag
index 460a9d4..4ba9cc6 100644 (file)
--- a/test/webapp-3.0/WEB-INF/tags/echo-double.tag
+++ b/test/webapp-3.0/WEB-INF/tags/echo-double.tag
@@ -1,20 +1,20 @@
-<%--\r
- Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
---%>\r
-<%@ tag %><%@\r
-attribute name="echo" type="java.lang.Double"%><%@\r
-attribute name="index" type="java.lang.String" %><%@\r
+<%--
+ 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.
+--%>
+<%@ tag %><%@
+attribute name="echo" type="java.lang.Double"%><%@
+attribute name="index" type="java.lang.String" %><%@
 tag body-content="empty" %><p>${index}-${echo}</p>
\ No newline at end of file

diff --git a/test/webapp-3.0/WEB-INF/tags/echo-long.tag b/test/webapp-3.0/WEB-INF/tags/echo-long.tag
index 78151b7..47852ff 100644 (file)
--- a/test/webapp-3.0/WEB-INF/tags/echo-long.tag
+++ b/test/webapp-3.0/WEB-INF/tags/echo-long.tag
@@ -1,20 +1,20 @@
-<%--\r
- Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
---%>\r
-<%@ tag %><%@\r
-attribute name="echo" type="java.lang.Long"%><%@\r
-attribute name="index" type="java.lang.String" %><%@\r
+<%--
+ 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.
+--%>
+<%@ tag %><%@
+attribute name="echo" type="java.lang.Long"%><%@
+attribute name="index" type="java.lang.String" %><%@
 tag body-content="empty" %><p>${index}-${echo}</p>
\ No newline at end of file

diff --git a/test/webapp-3.0/WEB-INF/tags/echo.tag b/test/webapp-3.0/WEB-INF/tags/echo.tag
index e14eb49..fcadc9b 100644 (file)
--- a/test/webapp-3.0/WEB-INF/tags/echo.tag
+++ b/test/webapp-3.0/WEB-INF/tags/echo.tag
@@ -1,18 +1,18 @@
-<%--\r
- Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
---%><%@ tag %><%@\r
-attribute name="echo" type="java.lang.String"%><%@\r
+<%--
+ 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.
+--%><%@ tag %><%@
+attribute name="echo" type="java.lang.String"%><%@
 tag body-content="empty" %><p>${echo}</p>
\ No newline at end of file

diff --git a/test/webapp-3.0/bug45nnn/bug45451.jspf b/test/webapp-3.0/bug45nnn/bug45451.jspf
index e4483e3..a317ca5 100644 (file)
--- a/test/webapp-3.0/bug45nnn/bug45451.jspf
+++ b/test/webapp-3.0/bug45nnn/bug45451.jspf
@@ -1,35 +1,35 @@
-<%--\r
- Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
---%>\r
-<p>00-${1+1}</p>\r
-<p>01-\${1+1}</p>\r
-<p>02-\\${1+1}</p>\r
-<p>03-\\\${1+1}</p>\r
-<tags:echo echo="04-${1+1}" />\r
-<tags:echo echo="05-\${1+1}" />\r
-<tags:echo echo="06-\\${1+1}" />\r
-<tags:echo echo="07-\\\${1+1}" />\r
-<tags:echo echo="08-\\\\${1+1}" />\r
-<tags:echo echo="04-${1+1}" />\r
-<tags:echo echo="05-\${1+1}" />\r
-<tags:echo echo="06-\\${1+1}" />\r
-<tags:echo echo="07-\\\${1+1}" />\r
-<tags:echo echo="08-\\\\${1+1}" />\r
-<tags:echo-deferred echo="09-#{1+1}" />\r
-<tags:echo-deferred echo="10-\#{1+1}" />\r
-<tags:echo-deferred echo="11-\\#{1+1}" />\r
-<tags:echo-deferred echo="12-\\\#{1+1}" />\r
-<tags:echo-deferred echo="13-\\\\#{1+1}" />\r
+<%--
+ 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.
+--%>
+<p>00-${1+1}</p>
+<p>01-\${1+1}</p>
+<p>02-\\${1+1}</p>
+<p>03-\\\${1+1}</p>
+<tags:echo echo="04-${1+1}" />
+<tags:echo echo="05-\${1+1}" />
+<tags:echo echo="06-\\${1+1}" />
+<tags:echo echo="07-\\\${1+1}" />
+<tags:echo echo="08-\\\\${1+1}" />
+<tags:echo echo="04-${1+1}" />
+<tags:echo echo="05-\${1+1}" />
+<tags:echo echo="06-\\${1+1}" />
+<tags:echo echo="07-\\\${1+1}" />
+<tags:echo echo="08-\\\\${1+1}" />
+<tags:echo-deferred echo="09-#{1+1}" />
+<tags:echo-deferred echo="10-\#{1+1}" />
+<tags:echo-deferred echo="11-\\#{1+1}" />
+<tags:echo-deferred echo="12-\\\#{1+1}" />
+<tags:echo-deferred echo="13-\\\\#{1+1}" />

diff --git a/test/webapp-3.0/bug45nnn/bug45451d.jspx b/test/webapp-3.0/bug45nnn/bug45451d.jspx
index 5a0039f..2cc9fde 100644 (file)
--- a/test/webapp-3.0/bug45nnn/bug45451d.jspx
+++ b/test/webapp-3.0/bug45nnn/bug45451d.jspx
@@ -1,40 +1,40 @@
-<!--\r
-  Licensed to the Apache Software Foundation (ASF) under one or more\r
-  contributor license agreements.  See the NOTICE file distributed with\r
-  this work for additional information regarding copyright ownership.\r
-  The ASF licenses this file to You under the Apache License, Version 2.0\r
-  (the "License"); you may not use this file except in compliance with\r
-  the License.  You may obtain a copy of the License at\r
-\r
-      http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-  Unless required by applicable law or agreed to in writing, software\r
-  distributed under the License is distributed on an "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-  See the License for the specific language governing permissions and\r
-  limitations under the License.\r
--->\r
-<jsp:root\r
-  xmlns:bug45451="urn:jsptagdir:/WEB-INF/tags/bug45451"\r
-  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"\r
-  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >\r
-  <jsp:directive.page isELIgnored="false" />\r
-<html>\r
-  <body>\r
-    <p>00-${1+1}</p>\r
-    <p>01-\${1+1}</p>\r
-    <p>02-\\${1+1}</p>\r
-    <p>03-\\\${1+1}</p>\r
-    <tags:echo echo="04-${1+1}" />\r
-    <tags:echo echo="05-\${1+1}" />\r
-    <tags:echo echo="06-\\${1+1}" />\r
-    <tags:echo echo="07-\\\${1+1}" />\r
-    <tags:echo echo="08-\\\\${1+1}" />\r
-    <tags:echo-deferred echo="09-#{1+1}" />\r
-    <tags:echo-deferred echo="10-\#{1+1}" />\r
-    <tags:echo-deferred echo="11-\\#{1+1}" />\r
-    <tags:echo-deferred echo="12-\\\#{1+1}" />\r
-    <tags:echo-deferred echo="13-\\\\#{1+1}" />\r
-  </body>\r
-</html>\r
+<!--
+  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:bug45451="urn:jsptagdir:/WEB-INF/tags/bug45451"
+  xmlns:jsp="http://java.sun.com/JSP/Page" version="2.2"
+  xmlns:tags="urn:jsptagdir:/WEB-INF/tags" >
+  <jsp:directive.page isELIgnored="false" />
+<html>
+  <body>
+    <p>00-${1+1}</p>
+    <p>01-\${1+1}</p>
+    <p>02-\\${1+1}</p>
+    <p>03-\\\${1+1}</p>
+    <tags:echo echo="04-${1+1}" />
+    <tags:echo echo="05-\${1+1}" />
+    <tags:echo echo="06-\\${1+1}" />
+    <tags:echo echo="07-\\\${1+1}" />
+    <tags:echo echo="08-\\\\${1+1}" />
+    <tags:echo-deferred echo="09-#{1+1}" />
+    <tags:echo-deferred echo="10-\#{1+1}" />
+    <tags:echo-deferred echo="11-\\#{1+1}" />
+    <tags:echo-deferred echo="12-\\\#{1+1}" />
+    <tags:echo-deferred echo="13-\\\\#{1+1}" />
+  </body>
+</html>
 </jsp:root>
\ No newline at end of file