License update

1 files changed, 116 insertions, 46 deletions

diff --git a/Zend/LICENSE b/Zend/LICENSE
index 8353c3db20..1dd42f1ff3 100644
--- a/Zend/LICENSE
+++ b/Zend/LICENSE
@@ -1,46 +1,116 @@
-------------------------------------------------------------------------
-                    The Zend License, version 0.90
-Copyright (c) 1999 Andi Gutmans, Zeev Suraski.  All Rights Reserved.
-------------------------------------------------------------------------
-
-1. The Zend engine (``SOFTWARE'') can be distributed or redistributed
-   free of charge as an integral part of PHP;  It may not be embedded in
-   other products nor reused separately from PHP, without prior written
-   permission from both Andi Gutmans and Zeev Suraski (``AUTHORS'').
-
-2. Distribution or redistribution of larger works derived from or works
-   which bundle the SOFTWARE require prior written permission from the
-   AUTHORS.
-
-3. Any modifications made to the SOFTWARE will not grant the modifier
-   any rights whatsoever to the SOFTWARE.  Moreover, by publishing any
-   modifications made to the SOFTWARE, the publisher explicitly signs
-   over to the AUTHORS all and any rights to the published modified
-   code.
-
-4. Redistribution of the SOFTWARE in both source and binary forms must
-   retain the above copyright notice, a copy of these license terms and
-   the following disclaimer.
-
-5. The name Zend must not be used to endorse or promote products
-   derived from this software without prior written permission from
-   the AUTHORS.
-
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
-
-
------------------------------------------------------------------------
-
-- For more information about Zend, please visit http://www.zend.com/
-- For more information about PHP, please visit http://www.php.net/
+---------------------------------------------------------------------------
+                    The Zend License, version 0.91
+           Copyright (C) 1999    Andi Gutmans & Zeev Suraski
+---------------------------------------------------------------------------
+
+The Zend scripting engine library is a product of Andi Gutmans and
+Zeev Suraski.  It may be used and/or distributed under the terms of the
+Q Public License (QPL) version 1.0, enclosed below.
+
+For more information about Zend please visit http://www.zend.com/
+For license related questions please mail license@zend.com
+
+===========================================================================
+
+			     THE Q PUBLIC LICENSE
+				  version 1.0
+
+		   Copyright (C) 1999 Troll Tech AS, Norway.
+		       Everyone is permitted to copy and
+		       distribute this license document.
+
+The intent of this license is to establish freedom to share and change the
+software regulated by this license under the open source model.
+
+This license applies to any software containing a notice placed by the
+copyright holder saying that it may be distributed under the terms of
+the Q Public License version 1.0.  Such software is herein referred to as
+the Software.  This license covers modification and distribution of the
+Software, use of third-party application programs based on the Software,
+and development of free software which uses the Software.
+
+				 Granted Rights
+
+1. You are granted the non-exclusive rights set forth in this license
+   provided you agree to and comply with any and all conditions in this
+   license.  Whole or partial distribution of the Software, or software
+   items that link with the Software, in any form signifies acceptance of
+   this license.
+
+2. You may copy and distribute the Software in unmodified form provided
+   that the entire package, including - but not restricted to - copyright,
+   trademark notices and disclaimers, as released by the initial developer
+   of the Software, is distributed.
+
+3. You may make modifications to the Software and distribute your
+   modifications, in a form that is separate from the Software, such as
+   patches. The following restrictions apply to modifications:
+
+     a. Modifications must not alter or remove any copyright notices in
+        the Software.
+
+     b. When modifications to the Software are released under this
+        license, a non-exclusive royalty-free right is granted to the
+        initial developer of the Software to distribute your modification
+        in future versions of the Software provided such versions remain
+        available under these terms in addition to any other license(s) of
+        the initial developer.
+
+4. You may distribute machine-executable forms of the Software or
+   machine-executable forms of modified versions of the Software, provided
+   that you meet these restrictions:
+
+     a. You must include this license document in the distribution.
+
+     b. You must ensure that all recipients of the machine-executable forms
+        are also able to receive the complete machine-readable source code
+        to the distributed Software, including all modifications, without
+        any charge beyond the costs of data transfer, and place prominent
+        notices in the distribution explaining this.
+
+     c. You must ensure that all modifications included in the
+        machine-executable forms are available under the terms of this
+        license.
+
+5. You may use the original or modified versions of the Software to
+   compile, link and run application programs legally developed by you
+   or by others.
+
+6. You may develop application programs, reusable components and other
+   software items that link with the original or modified versions of the
+   Software.  These items, when distributed, are subject to the following
+   requirements:
+
+     a. You must ensure that all recipients of machine-executable forms of
+        these items are also able to receive and use the complete
+        machine-readable source code to the items without any charge
+        beyond the costs of data transfer.
+
+     b. You must explicitly license all recipients of your items to use
+        and re-distribute original and modified versions of the items in
+        both machine-executable and source code forms. The recipients must
+        be able to do so without any charges whatsoever, and they must be
+        able to re-distribute to anyone they choose.
+
+
+     c. If the items are not available to the general public, and the
+        initial developer of the Software requests a copy of the items,
+        then you must supply one.
+
+			    Limitations of Liability
+
+In no event shall the initial developers or copyright holders be liable
+for any damages whatsoever, including - but not restricted to - lost
+revenue or profits or other direct, indirect, special, incidental or
+consequential damages, even if they have been advised of the possibility
+of such damages, except to the extent invariable law, if any, provides
+otherwise.
+
+			          No Warranty
+
+The Software and this license document are provided AS IS with NO WARRANTY
+OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE.
+
+
+===========================================================================
\ No newline at end of file