Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 10 Mar 2004 21:22:12 -0000
Message-ID: <20040310212212.90597.qmail@minotaur.apache.org>
From: jorton@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/modules/ssl Makefile.in config.m4

jorton      2004/03/10 13:22:12

  Modified:    modules/ssl Tag: APACHE_2_0_BRANCH Makefile.in config.m4
  Log:
  Relicense.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.4.2.1   +13 -47    httpd-2.0/modules/ssl/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -w -d -u -r1.4 -r1.4.2.1
  --- Makefile.in	13 Mar 2002 20:47:54 -0000	1.4
  +++ Makefile.in	10 Mar 2004 21:22:12 -0000	1.4.2.1
  @@ -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 2000-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
  
  
  
  1.11.2.1  +12 -47    httpd-2.0/modules/ssl/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/config.m4,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -w -d -u -r1.11 -r1.11.2.1
  --- config.m4	29 Mar 2002 07:36:01 -0000	1.11
  +++ config.m4	10 Mar 2004 21:22:12 -0000	1.11.2.1
  @@ -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 2000-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.
   
   dnl #  start of module specific part
   APACHE_MODPATH_INIT(ssl)