From: rjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 2 Aug 2010 10:00:40 +0000 (+0000)
Subject: Fix svn properties:
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4c7b88ae63e433c90c4e1757bdf4d9b12a02f8ce;p=tomcat7.0

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 f09357e08..f86b6f594 100644
--- a/java/org/apache/tomcat/util/http/fileupload/InvalidFileNameException.java
+++ b/java/org/apache/tomcat/util/http/fileupload/InvalidFileNameException.java
@@ -1,50 +1,50 @@
-/*
- * 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;
-    }
-}
+/*
+ * 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 2e6840a60..97619ed5c 100644
--- a/test/webapp-3.0/WEB-INF/tags/bug42390.tag
+++ b/test/webapp-3.0/WEB-INF/tags/bug42390.tag
@@ -1,18 +1,18 @@
-<%--
- 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" %>
+<%--
+ 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 ad701a78a..a884e9b18 100644
--- 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 @@
-<%--
- 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" %><%@
+<%--
+ 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 460a9d4d0..4ba9cc6bb 100644
--- 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 @@
-<%--
- 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" %><%@
+<%--
+ 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 78151b7bb..47852ff68 100644
--- 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 @@
-<%--
- 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" %><%@
+<%--
+ 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 e14eb496a..fcadc9b3c 100644
--- a/test/webapp-3.0/WEB-INF/tags/echo.tag
+++ b/test/webapp-3.0/WEB-INF/tags/echo.tag
@@ -1,18 +1,18 @@
-<%--
- 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"%><%@
+<%--
+ 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 e4483e366..a317ca525 100644
--- a/test/webapp-3.0/bug45nnn/bug45451.jspf
+++ b/test/webapp-3.0/bug45nnn/bug45451.jspf
@@ -1,35 +1,35 @@
-<%--
- 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}" />
+<%--
+ 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 5a0039f75..2cc9fde59 100644
--- a/test/webapp-3.0/bug45nnn/bug45451d.jspx
+++ b/test/webapp-3.0/bug45nnn/bug45451d.jspx
@@ -1,40 +1,40 @@
-<!--
-  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>
+<!--
+  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