Skip to content

Commit da499ef

Browse files
author
Andre Malo
committed
apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@102575 13f79535-47bb-0310-9956-ffa450edef68
1 parent 38c203f commit da499ef

39 files changed

Lines changed: 670 additions & 2012 deletions

‎modules/ssl/mod_ssl.c‎

Lines changed: 20 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,26 @@
1-
/* _ _
2-
** _ __ ___ ___ __| | ___ ___| | mod_ssl
3-
** | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
4-
** | | | | | | (_) | (_| | \__ \__ \ | www.modssl.org
5-
** |_| |_| |_|\___/ \__,_|___|___/___/_| ftp.modssl.org
6-
** |_____|
7-
** mod_ssl.c
8-
** Apache API interface structures
9-
*/
10-
11-
/* ====================================================================
12-
* The Apache Software License, Version 1.1
13-
*
14-
* Copyright (c) 2000-2004 The Apache Software Foundation. All rights
15-
* reserved.
16-
*
17-
* Redistribution and use in source and binary forms, with or without
18-
* modification, are permitted provided that the following conditions
19-
* are met:
20-
*
21-
* 1. Redistributions of source code must retain the above copyright
22-
* notice, this list of conditions and the following disclaimer.
23-
*
24-
* 2. Redistributions in binary form must reproduce the above copyright
25-
* notice, this list of conditions and the following disclaimer in
26-
* the documentation and/or other materials provided with the
27-
* distribution.
1+
/* Copyright 2001-2004 Apache Software Foundation
282
*
29-
* 3. The end-user documentation included with the redistribution,
30-
* if any, must include the following acknowledgment:
31-
* "This product includes software developed by the
32-
* Apache Software Foundation (http://www.apache.org/)."
33-
* Alternately, this acknowledgment may appear in the software itself,
34-
* if and wherever such third-party acknowledgments normally appear.
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
356
*
36-
* 4. The names "Apache" and "Apache Software Foundation" must
37-
* not be used to endorse or promote products derived from this
38-
* software without prior written permission. For written
39-
* permission, please contact apache@apache.org.
7+
* http://www.apache.org/licenses/LICENSE-2.0
408
*
41-
* 5. Products derived from this software may not be called "Apache",
42-
* nor may "Apache" appear in their name, without prior written
43-
* permission of the Apache Software Foundation.
44-
*
45-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
49-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56-
* SUCH DAMAGE.
57-
* ====================================================================
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
14+
*/
15+
16+
/* _ _
17+
* _ __ ___ ___ __| | ___ ___| | mod_ssl
18+
* | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
19+
* | | | | | | (_) | (_| | \__ \__ \ |
20+
* |_| |_| |_|\___/ \__,_|___|___/___/_|
21+
* |_____|
22+
* mod_ssl.c
23+
* Apache API interface structures
5824
*/
5925

6026
#include "mod_ssl.h"

‎modules/ssl/mod_ssl.h‎

Lines changed: 20 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,26 @@
1-
/* _ _
2-
** _ __ ___ ___ __| | ___ ___| | mod_ssl
3-
** | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
4-
** | | | | | | (_) | (_| | \__ \__ \ | www.modssl.org
5-
** |_| |_| |_|\___/ \__,_|___|___/___/_| ftp.modssl.org
6-
** |_____|
7-
** mod_ssl.h
8-
** Global header
9-
*/
10-
11-
/* ====================================================================
12-
* The Apache Software License, Version 1.1
13-
*
14-
* Copyright (c) 2000-2004 The Apache Software Foundation. All rights
15-
* reserved.
16-
*
17-
* Redistribution and use in source and binary forms, with or without
18-
* modification, are permitted provided that the following conditions
19-
* are met:
20-
*
21-
* 1. Redistributions of source code must retain the above copyright
22-
* notice, this list of conditions and the following disclaimer.
23-
*
24-
* 2. Redistributions in binary form must reproduce the above copyright
25-
* notice, this list of conditions and the following disclaimer in
26-
* the documentation and/or other materials provided with the
27-
* distribution.
1+
/* Copyright 2001-2004 Apache Software Foundation
282
*
29-
* 3. The end-user documentation included with the redistribution,
30-
* if any, must include the following acknowledgment:
31-
* "This product includes software developed by the
32-
* Apache Software Foundation (http://www.apache.org/)."
33-
* Alternately, this acknowledgment may appear in the software itself,
34-
* if and wherever such third-party acknowledgments normally appear.
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
356
*
36-
* 4. The names "Apache" and "Apache Software Foundation" must
37-
* not be used to endorse or promote products derived from this
38-
* software without prior written permission. For written
39-
* permission, please contact apache@apache.org.
7+
* http://www.apache.org/licenses/LICENSE-2.0
408
*
41-
* 5. Products derived from this software may not be called "Apache",
42-
* nor may "Apache" appear in their name, without prior written
43-
* permission of the Apache Software Foundation.
44-
*
45-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
49-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56-
* SUCH DAMAGE.
57-
* ====================================================================
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
14+
*/
15+
16+
/* _ _
17+
* _ __ ___ ___ __| | ___ ___| | mod_ssl
18+
* | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
19+
* | | | | | | (_) | (_| | \__ \__ \ |
20+
* |_| |_| |_|\___/ \__,_|___|___/___/_|
21+
* |_____|
22+
* mod_ssl.h
23+
* Global header
5824
*/
5925
/* ``The Apache Group: a collection
6026
of talented individuals who are

‎modules/ssl/ssl_engine_config.c‎

Lines changed: 19 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,27 @@
1-
/* _ _
2-
** _ __ ___ ___ __| | ___ ___| | mod_ssl
3-
** | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
4-
** | | | | | | (_) | (_| | \__ \__ \ | www.modssl.org
5-
** |_| |_| |_|\___/ \__,_|___|___/___/_| ftp.modssl.org
6-
** |_____|
7-
** ssl_engine_config.c
8-
** Apache Configuration Directives
9-
*/
10-
11-
/* ====================================================================
12-
* The Apache Software License, Version 1.1
13-
*
14-
* Copyright (c) 2000-2004 The Apache Software Foundation. All rights
15-
* reserved.
16-
*
17-
* Redistribution and use in source and binary forms, with or without
18-
* modification, are permitted provided that the following conditions
19-
* are met:
1+
/* Copyright 2001-2004 Apache Software Foundation
202
*
21-
* 1. Redistributions of source code must retain the above copyright
22-
* notice, this list of conditions and the following disclaimer.
3+
* Licensed under the Apache License, Version 2.0 (the "License");
4+
* you may not use this file except in compliance with the License.
5+
* You may obtain a copy of the License at
236
*
24-
* 2. Redistributions in binary form must reproduce the above copyright
25-
* notice, this list of conditions and the following disclaimer in
26-
* the documentation and/or other materials provided with the
27-
* distribution.
7+
* http://www.apache.org/licenses/LICENSE-2.0
288
*
29-
* 3. The end-user documentation included with the redistribution,
30-
* if any, must include the following acknowledgment:
31-
* "This product includes software developed by the
32-
* Apache Software Foundation (http://www.apache.org/)."
33-
* Alternately, this acknowledgment may appear in the software itself,
34-
* if and wherever such third-party acknowledgments normally appear.
35-
*
36-
* 4. The names "Apache" and "Apache Software Foundation" must
37-
* not be used to endorse or promote products derived from this
38-
* software without prior written permission. For written
39-
* permission, please contact apache@apache.org.
40-
*
41-
* 5. Products derived from this software may not be called "Apache",
42-
* nor may "Apache" appear in their name, without prior written
43-
* permission of the Apache Software Foundation.
44-
*
45-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
46-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
47-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
48-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
49-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
50-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
51-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
53-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
54-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
55-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
56-
* SUCH DAMAGE.
57-
* ====================================================================
9+
* Unless required by applicable law or agreed to in writing, software
10+
* distributed under the License is distributed on an "AS IS" BASIS,
11+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
* See the License for the specific language governing permissions and
13+
* limitations under the License.
5814
*/
5915

16+
/* _ _
17+
* _ __ ___ ___ __| | ___ ___| | mod_ssl
18+
* | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
19+
* | | | | | | (_) | (_| | \__ \__ \ |
20+
* |_| |_| |_|\___/ \__,_|___|___/___/_|
21+
* |_____|
22+
* ssl_engine_config.c
23+
* Apache Configuration Directives
24+
*/
6025
/* ``Damned if you do,
6126
damned if you don't.''
6227
-- Unknown */

‎modules/ssl/ssl_engine_dh.c‎

Lines changed: 20 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,29 @@
11
#if 0
22
=pod
33
#endif
4-
/* _ _
5-
** _ __ ___ ___ __| | ___ ___| | mod_ssl
6-
** | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
7-
** | | | | | | (_) | (_| | \__ \__ \ | www.modssl.org
8-
** |_| |_| |_|\___/ \__,_|___|___/___/_| ftp.modssl.org
9-
** |_____|
10-
** ssl_engine_dh.c
11-
** Diffie-Hellman Built-in Temporary Parameters
12-
*/
13-
14-
/* ====================================================================
15-
* The Apache Software License, Version 1.1
16-
*
17-
* Copyright (c) 2000-2004 The Apache Software Foundation. All rights
18-
* reserved.
19-
*
20-
* Redistribution and use in source and binary forms, with or without
21-
* modification, are permitted provided that the following conditions
22-
* are met:
23-
*
24-
* 1. Redistributions of source code must retain the above copyright
25-
* notice, this list of conditions and the following disclaimer.
4+
/* Copyright 2001-2004 Apache Software Foundation
265
*
27-
* 2. Redistributions in binary form must reproduce the above copyright
28-
* notice, this list of conditions and the following disclaimer in
29-
* the documentation and/or other materials provided with the
30-
* distribution.
6+
* Licensed under the Apache License, Version 2.0 (the "License");
7+
* you may not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
319
*
32-
* 3. The end-user documentation included with the redistribution,
33-
* if any, must include the following acknowledgment:
34-
* "This product includes software developed by the
35-
* Apache Software Foundation (http://www.apache.org/)."
36-
* Alternately, this acknowledgment may appear in the software itself,
37-
* if and wherever such third-party acknowledgments normally appear.
10+
* http://www.apache.org/licenses/LICENSE-2.0
3811
*
39-
* 4. The names "Apache" and "Apache Software Foundation" must
40-
* not be used to endorse or promote products derived from this
41-
* software without prior written permission. For written
42-
* permission, please contact apache@apache.org.
43-
*
44-
* 5. Products derived from this software may not be called "Apache",
45-
* nor may "Apache" appear in their name, without prior written
46-
* permission of the Apache Software Foundation.
47-
*
48-
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
49-
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
50-
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
51-
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
52-
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
53-
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
54-
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
55-
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
56-
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
57-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
58-
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
59-
* SUCH DAMAGE.
60-
* ====================================================================
12+
* Unless required by applicable law or agreed to in writing, software
13+
* distributed under the License is distributed on an "AS IS" BASIS,
14+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
* See the License for the specific language governing permissions and
16+
* limitations under the License.
17+
*/
18+
19+
/* _ _
20+
* _ __ ___ ___ __| | ___ ___| | mod_ssl
21+
* | '_ ` _ \ / _ \ / _` | / __/ __| | Apache Interface to OpenSSL
22+
* | | | | | | (_) | (_| | \__ \__ \ |
23+
* |_| |_| |_|\___/ \__,_|___|___/___/_|
24+
* |_____|
25+
* ssl_engine_dh.c
26+
* Diffie-Hellman Built-in Temporary Parameters
6127
*/
6228

6329
#include "mod_ssl.h"

0 commit comments

Comments
 (0)