cvs: php4 / LICENSE
| From: | Stig Bakken | Date: | Wed, 12 Jun 2002 21:10:41 +0000 |
| Subject: | cvs: php4 / LICENSE | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12337@lists.php.net to get a copy of this message | ||
ssb Wed Jun 12 17:10:41 2002 EDT
Modified files:
/php4 LICENSE
Log:
* this should have been done last year :)
Index: php4/LICENSE
diff -u php4/LICENSE:1.17 php4/LICENSE:1.18
--- php4/LICENSE:1.17 Thu Jan 31 17:39:34 2002
+++ php4/LICENSE Wed Jun 12 17:10:41 2002
@@ -1,5 +1,5 @@
--------------------------------------------------------------------
- The PHP License, version 2.02
+ The PHP License, version 3.0a1
Copyright (c) 1999 - 2002 The PHP Group. All rights reserved.
--------------------------------------------------------------------
@@ -37,20 +37,6 @@
"This product includes PHP, freely available from
http://www.php.net/".
- 6. The software incorporates the Zend Engine, a product of Zend
- Technologies, Ltd. ("Zend"). The Zend Engine is licensed to the
- PHP Association (pursuant to a grant from Zend that can be
- found at http://www.php.net/license/ZendGrant/) for
- distribution to you under this license agreement, only as a
- part of PHP. In the event that you separate the Zend Engine
- (or any portion thereof) from the rest of the software, or
- modify the Zend Engine, or any portion thereof, your use of the
- separated or modified Zend Engine software shall not be governed
- by this license, and instead shall be governed by the license
- set forth at http://www.zend.com/license/ZendLicense/.
-
-
-
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
@@ -73,3 +59,6 @@
For more information on the PHP Group and the PHP project,
please see <http://www.php.net>.
+
+This product includes the Zend Engine, freely available at
+<http://www.zend.com>.