From: Joe Orton Date: Sat, 28 Feb 2004 11:55:46 +0000 (+0000) Subject: Relicense. X-Git-Tag: pre_ajp_proxy~616 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b3113012fad10ac464a3f9b93bd28fc696f65d9;p=apache Relicense. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102799 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/ssl/Makefile.in b/modules/ssl/Makefile.in index 14cccddc18..836ad3e5a5 100644 --- a/modules/ssl/Makefile.in +++ b/modules/ssl/Makefile.in @@ -1,50 +1,16 @@ -## ==================================================================== -## The Apache Software License, Version 1.1 -## -## Copyright (c) 2000-2002 The Apache Software Foundation. All rights -## reserved. -## -## Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions -## are met: -## -## 1. Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## -## 2. Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## -## 3. The end-user documentation included with the redistribution, -## if any, must include the following acknowledgment: -## "This product includes software developed by the -## Apache Software Foundation (http://www.apache.org/)." -## Alternately, this acknowledgment may appear in the software itself, -## if and wherever such third-party acknowledgments normally appear. -## -## 4. The names "Apache" and "Apache Software Foundation" must -## not be used to endorse or promote products derived from this -## software without prior written permission. For written -## permission, please contact apache@apache.org. -## -## 5. Products derived from this software may not be called "Apache", -## nor may "Apache" appear in their name, without prior written -## permission of the Apache Software Foundation. -## -## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -## OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -## DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR -## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -## SUCH DAMAGE. -## ==================================================================== +# Copyright 2001-2004 The Apache Software Foundation +# +# 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 +# +# 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. # # standard stuff diff --git a/modules/ssl/config.m4 b/modules/ssl/config.m4 index 825893246c..b7313e951a 100644 --- a/modules/ssl/config.m4 +++ b/modules/ssl/config.m4 @@ -1,50 +1,15 @@ -dnl ## ==================================================================== -dnl ## The Apache Software License, Version 1.1 -dnl ## -dnl ## Copyright (c) 2000-2002 The Apache Software Foundation. All rights -dnl ## reserved. -dnl ## -dnl ## Redistribution and use in source and binary forms, with or without -dnl ## modification, are permitted provided that the following conditions -dnl ## are met: -dnl ## -dnl ## 1. Redistributions of source code must retain the above copyright -dnl ## notice, this list of conditions and the following disclaimer. -dnl ## -dnl ## 2. Redistributions in binary form must reproduce the above copyright -dnl ## notice, this list of conditions and the following disclaimer in -dnl ## the documentation and/or other materials provided with the -dnl ## distribution. -dnl ## -dnl ## 3. The end-user documentation included with the redistribution, -dnl ## if any, must include the following acknowledgment: -dnl ## "This product includes software developed by the -dnl ## Apache Software Foundation (http://www.apache.org/)." -dnl ## Alternately, this acknowledgment may appear in the software itself, -dnl ## if and wherever such third-party acknowledgments normally appear. -dnl ## -dnl ## 4. The names "Apache" and "Apache Software Foundation" must -dnl ## not be used to endorse or promote products derived from this -dnl ## software without prior written permission. For written -dnl ## permission, please contact apache@apache.org. -dnl ## -dnl ## 5. Products derived from this software may not be called "Apache", -dnl ## nor may "Apache" appear in their name, without prior written -dnl ## permission of the Apache Software Foundation. -dnl ## -dnl ## THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -dnl ## WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -dnl ## OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -dnl ## DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR -dnl ## ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -dnl ## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -dnl ## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -dnl ## USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -dnl ## ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -dnl ## OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -dnl ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -dnl ## SUCH DAMAGE. -dnl ## ==================================================================== +dnl Copyright 2001-2004 The Apache Software Foundation +dnl Licensed under the Apache License, Version 2.0 (the "License"); +dnl you may not use this file except in compliance with the License. +dnl You may obtain a copy of the License at +dnl +dnl http://www.apache.org/licenses/LICENSE-2.0 +dnl +dnl Unless required by applicable law or agreed to in writing, software +dnl distributed under the License is distributed on an "AS IS" BASIS, +dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +dnl See the License for the specific language governing permissions and +dnl limitations under the License. AC_DEFUN([CHECK_DISTCACHE], [ AC_MSG_CHECKING(whether Distcache is required)