Skip to content

Commit 34b215d

Browse files
committed
Change license to BSD-2-Clause [pear bug 17526]
Update the license to a BSD-2-Clause. Both authors have agreed to this license change. Fixes pear bug 17526: https://pear.php.net/bugs/bug.php?id=17526
1 parent 960599d commit 34b215d

3 files changed

Lines changed: 32 additions & 15 deletions

File tree

Net/Socket.php

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,42 @@
44
*
55
* PHP Version 5
66
*
7-
* Copyright (c) 1997-2013 The PHP Group
7+
* LICENSE:
88
*
9-
* This source file is subject to version 2.0 of the PHP license,
10-
* that is bundled with this package in the file LICENSE, and is
11-
* available at through the world-wide-web at
12-
* http://www.php.net/license/2_02.txt.
13-
* If you did not receive a copy of the PHP license and are unable to
14-
* obtain it through the world-wide-web, please send a note to
15-
* license@php.net so we can mail you a copy immediately.
9+
* Copyright (c) 1997-2003 The PHP Group
10+
* All rights reserved.
1611
*
17-
* Authors: Stig Bakken <ssb@php.net>
18-
* Chuck Hagenbuch <chuck@horde.org>
12+
* Redistribution and use in source and binary forms, with or without
13+
* modification, are permitted provided that the following conditions
14+
* are met:
15+
*
16+
* o Redistributions of source code must retain the above copyright
17+
* notice, this list of conditions and the following disclaimer.
18+
* o Redistributions in binary form must reproduce the above copyright
19+
* notice, this list of conditions and the following disclaimer in the
20+
* documentation and/or other materials provided with the distribution.
21+
* o The names of the authors may not be used to endorse or promote
22+
* products derived from this software without specific prior written
23+
* permission.
24+
*
25+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
26+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
27+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
28+
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
29+
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
30+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
31+
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
32+
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
33+
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
34+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
35+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1936
*
2037
* @category Net
2138
* @package Net_Socket
2239
* @author Stig Bakken <ssb@php.net>
2340
* @author Chuck Hagenbuch <chuck@horde.org>
2441
* @copyright 1997-2003 The PHP Group
25-
* @license http://www.php.net/license/2_02.txt PHP 2.02
42+
* @license http://opensource.org/licenses/bsd-license.php BSD-2-Clause
2643
* @link http://pear.php.net/packages/Net_Socket
2744
*/
2845

@@ -40,7 +57,7 @@
4057
* @author Stig Bakken <ssb@php.net>
4158
* @author Chuck Hagenbuch <chuck@horde.org>
4259
* @copyright 1997-2003 The PHP Group
43-
* @license http://www.php.net/license/2_02.txt PHP 2.02
60+
* @license http://opensource.org/licenses/bsd-license.php BSD-2-Clause
4461
* @link http://pear.php.net/packages/Net_Socket
4562
*/
4663
class Net_Socket extends PEAR
@@ -706,4 +723,4 @@ public function enableCrypto($enabled, $type)
706723
}
707724
}
708725

709-
}
726+
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"include-path": [
2626
"./"
2727
],
28-
"license": "PHP License",
28+
"license": "BSD-2-Clause",
2929
"name": "pear/net_socket",
3030
"support": {
3131
"issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Net_Socket",

package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<release>stable</release>
3535
<api>stable</api>
3636
</stability>
37-
<license uri="http://www.php.net/license/2_02.txt">PHP License</license>
37+
<license uri="http://www.opensource.org/licenses/bsd-license.php">BSD-2-Clause</license>
3838
<notes>
3939
* Set minimum PHP version to 5.4.0
4040
* Set minimum PEAR version to 1.10.1

0 commit comments

Comments
 (0)