-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #44 from roelvanmeer/dev-issue-43
Update the license to BSD-2-clause
- Loading branch information
Showing
4 changed files
with
51 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,23 @@ | ||
| -------------------------------------------------------------------- | ||
| The PHP License, version 3.01 | ||
| Copyright (c) 2002-2015 Jon Parise and Chuck Hagenbuch. | ||
| All rights reserved. | ||
| -------------------------------------------------------------------- | ||
| Copyright 2002-2017 Jon Parise and Chuck Hagenbuch. | ||
| All rights reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, is 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 name "PHP" must not be used to endorse or promote products | ||
| derived from this software without prior written permission. For | ||
| written permission, please contact [email protected]. | ||
|
|
||
| 4. Products derived from this software may not be called "PHP", nor | ||
| may "PHP" appear in their name, without prior written permission | ||
| from [email protected]. You may indicate that your software works in | ||
| conjunction with PHP by saying "Foo for PHP" instead of calling | ||
| it "PHP Foo" or "phpfoo" | ||
|
|
||
| 5. The PHP Group may publish revised and/or new versions of the | ||
| license from time to time. Each version will be given a | ||
| distinguishing version number. | ||
| Once covered code has been published under a particular version | ||
| of the license, you may always continue to use it under the terms | ||
| of that version. You may also choose to use such covered code | ||
| under the terms of any subsequent version of the license | ||
| published by the PHP Group. No one other than the PHP Group has | ||
| the right to modify the terms applicable to covered code created | ||
| under this License. | ||
|
|
||
| 6. Redistributions of any form whatsoever must retain the following | ||
| acknowledgment: | ||
| "This product includes PHP software, freely available from | ||
| <http://www.php.net/software/>". | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``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 PHP | ||
| DEVELOPMENT TEAM 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. | ||
|
|
||
| -------------------------------------------------------------------- | ||
|
|
||
| This software consists of voluntary contributions made by many | ||
| individuals on behalf of the PHP Group. | ||
|
|
||
| The PHP Group can be contacted via Email at [email protected]. | ||
|
|
||
| For more information on the PHP Group and the PHP project, | ||
| please see <http://www.php.net>. | ||
|
|
||
| PHP includes the Zend Engine, freely available at | ||
| <http://www.zend.com>. | ||
| 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.. | ||
|
|
||
| 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. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,15 +3,33 @@ | |
| // +----------------------------------------------------------------------+ | ||
| // | PHP Version 5 and 7 | | ||
| // +----------------------------------------------------------------------+ | ||
| // | Copyright (c) 1997-2015 Jon Parise and Chuck Hagenbuch | | ||
| // +----------------------------------------------------------------------+ | ||
| // | This source file is subject to version 3.01 of the PHP license, | | ||
| // | that is bundled with this package in the file LICENSE, and is | | ||
| // | available at through the world-wide-web at | | ||
| // | http://www.php.net/license/3_01.txt. | | ||
| // | If you did not receive a copy of the PHP license and are unable to | | ||
| // | obtain it through the world-wide-web, please send a note to | | ||
| // | [email protected] so we can mail you a copy immediately. | | ||
| // | Copyright (c) 1997-2017 Jon Parise and Chuck Hagenbuch | | ||
| // | 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. | | ||
| // | | | ||
| // | 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. | | ||
| // +----------------------------------------------------------------------+ | ||
| // | Authors: Chuck Hagenbuch <[email protected]> | | ||
| // | Jon Parise <[email protected]> | | ||
|
|
@@ -29,6 +47,7 @@ | |
| * @author Chuck Hagenbuch <[email protected]> | ||
| * @author Jon Parise <[email protected]> | ||
| * @author Damian Alejandro Fernandez Sosa <[email protected]> | ||
| * @license http://opensource.org/licenses/bsd-license.php BSD-2-Clause | ||
| * | ||
| * @example basic.php A basic implementation of the Net_SMTP package. | ||
| */ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters