Modify the licence clauses for 1.3 to prohibit derived packages

	from claiming to be "Apache" without the AG's permission.  (Always
	the intent, I believe, but previously not explicit enough.)
	Hopefully this will help deter further dilution of the brand.

Reviewed by:	Paul Sutton, Ben Laurie, Jim Jagielski, Randy Terbush,
		Roy Fielding, Chuck Murcko, Mark Cox, Ralf Engeschall,
		Sameer Parekh, Martin Kraemer, Dean Gaudet, Brian Behlendorf


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@80762 13f79535-47bb-0310-9956-ffa450edef68

23 files changed, 115 insertions, 23 deletions

diff --git a/src/include/alloc.h b/src/include/alloc.h
index 490a104679..3d9c2a26fc 100644
--- a/src/include/alloc.h
+++ b/src/include/alloc.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/ap.h b/src/include/ap.h
index e13e339678..9484beca78 100644
--- a/src/include/ap.h
+++ b/src/include/ap.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/ap_alloc.h b/src/include/ap_alloc.h
index 490a104679..3d9c2a26fc 100644
--- a/src/include/ap_alloc.h
+++ b/src/include/ap_alloc.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/ap_config.h b/src/include/ap_config.h
index 4a3497724a..acafcd7051 100644
--- a/src/include/ap_config.h
+++ b/src/include/ap_config.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/buff.h b/src/include/buff.h
index 38f0dfe91a..c78a8b458b 100644
--- a/src/include/buff.h
+++ b/src/include/buff.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/conf.h b/src/include/conf.h
index 4a3497724a..acafcd7051 100644
--- a/src/include/conf.h
+++ b/src/include/conf.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/hide.h b/src/include/hide.h
index 4a3c47211d..be6f51f718 100644
--- a/src/include/hide.h
+++ b/src/include/hide.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/http_conf_globals.h b/src/include/http_conf_globals.h
index e3ab5ee3d6..9a147f8478 100644
--- a/src/include/http_conf_globals.h
+++ b/src/include/http_conf_globals.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/http_config.h b/src/include/http_config.h
index cc9e790b7d..589fddb21b 100644
--- a/src/include/http_config.h
+++ b/src/include/http_config.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/http_core.h b/src/include/http_core.h
index ba6e6ad1bb..dcf8b63561 100644
--- a/src/include/http_core.h
+++ b/src/include/http_core.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/http_log.h b/src/include/http_log.h
index b87ba51667..e133fcdd41 100644
--- a/src/include/http_log.h
+++ b/src/include/http_log.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/http_main.h b/src/include/http_main.h
index 4ebd984d47..6866faf797 100644
--- a/src/include/http_main.h
+++ b/src/include/http_main.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/http_protocol.h b/src/include/http_protocol.h
index 615c8a67ad..2240551ac3 100644
--- a/src/include/http_protocol.h
+++ b/src/include/http_protocol.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/http_request.h b/src/include/http_request.h
index 299d6037de..feb15cc9e6 100644
--- a/src/include/http_request.h
+++ b/src/include/http_request.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/http_vhost.h b/src/include/http_vhost.h
index 5f6ad80bf3..fad71f8716 100644
--- a/src/include/http_vhost.h
+++ b/src/include/http_vhost.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/httpd.h b/src/include/httpd.h
index a71011ea14..01e1fad969 100644
--- a/src/include/httpd.h
+++ b/src/include/httpd.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/md5.h b/src/include/md5.h
index 6b503a9d66..03a0674d3d 100644
--- a/src/include/md5.h
+++ b/src/include/md5.h
@@ -53,7 +53,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/rfc1413.h b/src/include/rfc1413.h
index b8428c3b71..b00e3bcb48 100644
--- a/src/include/rfc1413.h
+++ b/src/include/rfc1413.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/scoreboard.h b/src/include/scoreboard.h
index 4cad72b680..18f48d46ed 100644
--- a/src/include/scoreboard.h
+++ b/src/include/scoreboard.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/util_date.h b/src/include/util_date.h
index 990d1a7f78..5fc983adae 100644
--- a/src/include/util_date.h
+++ b/src/include/util_date.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/util_md5.h b/src/include/util_md5.h
index 5665791a8b..61f043fa7a 100644
--- a/src/include/util_md5.h
+++ b/src/include/util_md5.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/util_script.h b/src/include/util_script.h
index 6558390fdb..68ef3e1b09 100644
--- a/src/include/util_script.h
+++ b/src/include/util_script.h
@@ -23,7 +23,11 @@
  *    prior written permission. For written permission, please contact
  *    apache@apache.org.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."
diff --git a/src/include/util_uri.h b/src/include/util_uri.h
index 922e477704..2c7352db00 100644
--- a/src/include/util_uri.h
+++ b/src/include/util_uri.h
@@ -22,7 +22,11 @@
  *    endorse or promote products derived from this software without
  *    prior written permission.
  *
- * 5. Redistributions of any form whatsoever must retain the following
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
  *    acknowledgment:
  *    "This product includes software developed by the Apache Group
  *    for use in the Apache HTTP server project (http://www.apache.org/)."