You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2008/04/24 23:07:59 UTC
svn commit: r651424 - in /httpd/mod_ftp/trunk: ./ docs/manual/ftp/
docs/manual/mod/ include/ modules/ftp/
Author: wrowe
Date: Thu Apr 24 14:07:39 2008
New Revision: 651424
URL: http://svn.apache.org/viewvc?rev=651424&view=rev
Log:
Update sources to conform to the new copyright/license labeling policy,
correct the date format of the Original copyrights, and promote the inet_pton
notice into NOTICE-FTP and LICENSE-FTP
Modified:
httpd/mod_ftp/trunk/LICENSE-FTP
httpd/mod_ftp/trunk/NOTICE-FTP
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.html.en
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.xml
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.html.en
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.xml
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.html.en
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.xml
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.html.en
httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.xml
httpd/mod_ftp/trunk/docs/manual/ftp/index.html.en
httpd/mod_ftp/trunk/docs/manual/ftp/index.xml
httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en
httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml
httpd/mod_ftp/trunk/include/mod_ftp.h
httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c
httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c
httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c
httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c
httpd/mod_ftp/trunk/modules/ftp/ftp_log.c
httpd/mod_ftp/trunk/modules/ftp/ftp_message.c
httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
httpd/mod_ftp/trunk/modules/ftp/ftp_request.c
httpd/mod_ftp/trunk/modules/ftp/ftp_util.c
httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c
httpd/mod_ftp/trunk/modules/ftp/mod_ftp_cmd_pwd.c
Modified: httpd/mod_ftp/trunk/LICENSE-FTP
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/LICENSE-FTP?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/LICENSE-FTP (original)
+++ httpd/mod_ftp/trunk/LICENSE-FTP Thu Apr 24 14:07:39 2008
@@ -200,4 +200,26 @@
See the License for the specific language governing permissions and
limitations under the License.
+APACHE HTTP SERVER mod_ftp SUBCOMPONENTS:
+
+mod_ftp includes an implementation of inet_pton copyrighted by the
+Internet Software Consortium <http://www.isc.org/> with separate
+copyright notice and license terms. Your use of the source code
+for the these subcomponents is subject to the terms and conditions
+of the following license:
+
+Copyright (c) 1996 by Internet Software Consortium.
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
Modified: httpd/mod_ftp/trunk/NOTICE-FTP
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/NOTICE-FTP?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/NOTICE-FTP (original)
+++ httpd/mod_ftp/trunk/NOTICE-FTP Thu Apr 24 14:07:39 2008
@@ -7,3 +7,6 @@
This product includes software developed at
Covalent Technologies (http://www.covalent.net/).
+This product includes software copyrighted by
+the Internet Software Consortium (http://www.isc.org).
+
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.html.en
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.html.en?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.html.en (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.html.en Thu Apr 24 14:07:39 2008
@@ -25,6 +25,6 @@
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/ftp/ftp_faq.html" title="English"> en </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.xml?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_faq.xml Thu Apr 24 14:07:39 2008
@@ -21,7 +21,7 @@
-->
<!--
- Original Copyright (c) Covalent Technologies 2001-2005
+ Original Copyright (c) 2005 Covalent Technologies
FTP Protocol module for Apache 2.0
-->
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.html.en
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.html.en?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.html.en (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.html.en Thu Apr 24 14:07:39 2008
@@ -25,6 +25,6 @@
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/ftp/ftp_howto.html" title="English"> en </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.xml?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_howto.xml Thu Apr 24 14:07:39 2008
@@ -21,7 +21,7 @@
-->
<!--
- Original Copyright (c) Covalent Technologies 2001-2005
+ Original Copyright (c) 2005 Covalent Technologies
FTP Protocol module for Apache 2.0
-->
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.html.en
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.html.en?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.html.en (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.html.en Thu Apr 24 14:07:39 2008
@@ -106,6 +106,6 @@
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/ftp/ftp_intro.html" title="English"> en </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.xml?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_intro.xml Thu Apr 24 14:07:39 2008
@@ -21,7 +21,7 @@
-->
<!--
- Original Copyright (c) Covalent Technologies 2001-2005
+ Original Copyright (c) 2005 Covalent Technologies
FTP Protocol module for Apache 2.0
-->
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.html.en
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.html.en?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.html.en (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.html.en Thu Apr 24 14:07:39 2008
@@ -214,6 +214,6 @@
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/ftp/ftp_tls.html" title="English"> en </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.xml?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/ftp_tls.xml Thu Apr 24 14:07:39 2008
@@ -21,7 +21,7 @@
-->
<!--
- Original Copyright (c) Covalent Technologies 2001-2005
+ Original Copyright (c) 2005 Covalent Technologies
FTP Protocol module for Apache 2.0
-->
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/index.html.en
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/index.html.en?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/index.html.en (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/index.html.en Thu Apr 24 14:07:39 2008
@@ -70,6 +70,6 @@
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/ftp/" title="English"> en </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>
Modified: httpd/mod_ftp/trunk/docs/manual/ftp/index.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/ftp/index.xml?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/ftp/index.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/ftp/index.xml Thu Apr 24 14:07:39 2008
@@ -21,7 +21,7 @@
-->
<!--
- Original Copyright (c) Covalent Technologies 2001-2005
+ Original Copyright (c) 2005 Covalent Technologies
FTP Protocol module for Apache 2.0
-->
Modified: httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en (original)
+++ httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.html.en Thu Apr 24 14:07:39 2008
@@ -724,6 +724,6 @@
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_ftp.html" title="English"> en </a></p>
</div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
<p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
-</body></html>
\ No newline at end of file
+</body></html>
Modified: httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml (original)
+++ httpd/mod_ftp/trunk/docs/manual/mod/mod_ftp.xml Thu Apr 24 14:07:39 2008
@@ -18,7 +18,7 @@
limitations under the License.
-->
<!--
- Original Copyright (c) Covalent Technologies 2001-2005
+ Original Copyright (c) 2005 Covalent Technologies
FTP Protocol module for Apache 2.0
-->
Modified: httpd/mod_ftp/trunk/include/mod_ftp.h
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/include/mod_ftp.h?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/include/mod_ftp.h (original)
+++ httpd/mod_ftp/trunk/include/mod_ftp.h Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_commands.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_connection.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_data_connection.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_data_filters.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_filters.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_inet_pton.c Thu Apr 24 14:07:39 2008
@@ -1,3 +1,25 @@
+/* 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.
+ */
+
+/*
+ * Original Copyright (c) 2005 Covalent Technologies
+ *
+ * FTP Protocol module for Apache 2.0
+ */
+
/* Copyright (c) 1996 by Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_limitlogin.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_log.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_log.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_log.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_log.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_message.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_message.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_message.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_message.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_protocol.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_request.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_request.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_request.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_request.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_util.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_util.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_util.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_util.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/mod_ftp.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/
Modified: httpd/mod_ftp/trunk/modules/ftp/mod_ftp_cmd_pwd.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/mod_ftp_cmd_pwd.c?rev=651424&r1=651423&r2=651424&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/mod_ftp_cmd_pwd.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/mod_ftp_cmd_pwd.c Thu Apr 24 14:07:39 2008
@@ -1,9 +1,9 @@
-/* Copyright 1999-2005 The Apache Software Foundation or its licensors, as
- * applicable.
- *
- * Licensed 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
+/* 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
*
@@ -15,7 +15,7 @@
*/
/*
- * Original Copyright (c) Covalent Technologies 2001-2005
+ * Original Copyright (c) 2005 Covalent Technologies
*
* FTP Protocol module for Apache 2.0
*/