Skip to content

Commit 024cdd3

Browse files
committed
fix BSD-2 license text, and add a LICENSE file
1 parent ffb3414 commit 024cdd3

4 files changed

Lines changed: 15 additions & 9 deletions

File tree

LICENSE

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Copyright 1997-2017 The PHP Group
2+
3+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4+
5+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
6+
7+
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.
8+
9+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS 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 COPYRIGHT HOLDER OR 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.

Net/Socket.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,12 @@
1818
* o Redistributions in binary form must reproduce the above copyright
1919
* notice, this list of conditions and the following disclaimer in the
2020
* 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.
2421
*
2522
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
2623
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
2724
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
2825
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
29-
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
26+
* HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
3027
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
3128
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
3229
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@ Run the tests from a local composer installation:
4040

4141

4242
## License
43-
BSD license
43+
BSD-2 license

package.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</lead>
2828
<date>2017-04-06</date>
2929
<version>
30-
<release>1.2.0</release>
30+
<release>1.2.1</release>
3131
<api>1.2.0</api>
3232
</version>
3333
<stability>
@@ -36,13 +36,13 @@
3636
</stability>
3737
<license uri="http://www.opensource.org/licenses/bsd-license.php">BSD-2-Clause</license>
3838
<notes>
39-
* Change license to BSD-2 Clause
40-
41-
* Request #17526: License change
39+
* Fix BSD-2 licensing
4240
</notes>
4341
<contents>
4442
<dir baseinstalldir="/" name="/">
4543
<file baseinstalldir="/" name="Net/Socket.php" role="php" />
44+
<file baseinstalldir="/" name="README.md" role="doc" />
45+
<file baseinstalldir="/" name="LICENSE" role="doc" />
4646
</dir>
4747
</contents>
4848
<dependencies>

0 commit comments

Comments
 (0)