-
Notifications
You must be signed in to change notification settings - Fork 7.9k
Update Zend Engine license and doc headers referencing it #7358
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,56 +1,53 @@ | ||
-------------------------------------------------------------------- | ||
The Zend Engine License, Version 2.00 | ||
Copyright (c) 1999-2006 Zend Technologies Ltd. All rights reserved. | ||
-------------------------------------------------------------------- | ||
------------------------------------------------------------------------ | ||
The Zend Engine License, version 2.01 | ||
Copyright (c) 1999-2021, Zend Technologies USA, Inc.(“Zend”), | ||
a subsidiary of Perforce Software, Inc. All rights reserved. | ||
------------------------------------------------------------------------ | ||
|
||
Redistribution and use in source and binary forms, with or without | ||
modification, is permitted provided that the following conditions | ||
are met: | ||
modification, is permitted provided that the following conditions are | ||
met: | ||
salathe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
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 names "Zend" and "Zend Engine" must not be used to endorse | ||
or promote products derived from this software without prior | ||
permission from Zend Technologies Ltd. For written permission, | ||
please contact license@zend.com. | ||
|
||
4. Zend Technologies Ltd. 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 Zend Technologies Ltd. No one other than Zend | ||
Technologies Ltd. has the right to modify the terms applicable | ||
to covered code created under this License. | ||
|
||
5. Redistributions of any form whatsoever must retain the following | ||
acknowledgment: | ||
"This product includes the Zend Engine, freely available at | ||
http://www.zend.com" | ||
|
||
6. All advertising materials mentioning features or use of this | ||
software must display the following acknowledgment: | ||
"The Zend Engine is freely available at http://www.zend.com" | ||
|
||
THIS SOFTWARE IS PROVIDED BY ZEND TECHNOLOGIES LTD. ``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 ZEND | ||
TECHNOLOGIES LTD. 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. | ||
|
||
-------------------------------------------------------------------- | ||
notice, this list of conditions and the following disclaimer. | ||
salathe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
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 names "Zend" and "Zend Engine" must not be used to endorse or | ||
promote products derived from this software without | ||
prior permission from Zend. For written permission, please | ||
contact:license@zend.com. | ||
salathe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
4. Zend 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 Zend. No one other than Zend has the right to modify | ||
the terms applicable to covered code created under this License. | ||
|
||
5. Redistributions of any form whatsoever must retain the following | ||
acknowledgment: “This product includes the Zend Engine, freely | ||
available at: https://github.com/php/php-src/tree/master/Zend.” | ||
salathe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
6. All advertising materials mentioning features or use of this | ||
software must display the following acknowledgment: "The Zend | ||
Engine is freely available at: | ||
https://github.com/php/php-src/tree/master/Zend.” | ||
salathe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
THIS SOFTWARE IS PROVIDED BY ZEND ``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 ZEND BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES(INCLUDING, BUT NOT LIMITED | ||
salathe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | ||
PROFITS; OR BUSINESS INTERRUPTION)HOWEVER CAUSED AND ON ANY THEORY OF | ||
salathe marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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. | ||
|
||
---------------------------------------------------------------------- |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,12 +2,12 @@ | |
+----------------------------------------------------------------------+ | ||
| Zend Engine | | ||
+----------------------------------------------------------------------+ | ||
| Copyright (c) Zend Technologies Ltd. (http://www.zend.com) | | ||
| Copyright (c) Zend Technologies USA, Inc. (https://www.zend.com) | | ||
+----------------------------------------------------------------------+ | ||
| This source file is subject to version 2.00 of the Zend license, | | ||
| This source file is subject to version 2.01 of the Zend license, | | ||
| that is bundled with this package in the file LICENSE, and is | | ||
| available through the world-wide-web at the following url: | | ||
| http://www.zend.com/license/2_00.txt. | | ||
| https://www.zend.com/sites/zend/files/pdfs/zend-engine-license-2.01.txt | | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the "nice" boxes need to be extended. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I was trying to keep the patch minimal. Would like to hear from the release managers on this; @ramsey - what are your opinions? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Or maybe we could remove Could Zend devops move this file to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unfortunately, no. :-/ There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you rename the file to |
||
| If you did not receive a copy of the Zend license and are unable to | | ||
| obtain it through the world-wide-web, please send a note to | | ||
| license@zend.com so we can mail you a copy immediately. | | ||
|
Uh oh!
There was an error while loading. Please reload this page.