Skip to content

Commit e09352e

Browse files
committed
license-update: update wording about GPL
RFC: https://wiki.php.net/rfc/php_license_update
1 parent a84cee2 commit e09352e

File tree

2 files changed

+20
-21
lines changed

2 files changed

+20
-21
lines changed

license/contrib-guidelines-code.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@
66
<h2>PHP Contributor Guidelines for Code Developers</h2>
77

88
<p>
9-
Before you complete the form to request a Git account, you must understand and accept the principles under which PHP
10-
itself is developed. These are summarized in the next paragraph.
9+
Before you contribute code to PHP, you must understand and accept the principles under which PHP itself is
10+
developed. These are summarized in the next paragraph.
1111
</p>
12+
1213
<p>
13-
Any code contributed to PHP must be contributed under the terms of the Modified BSD License or other compatible,
14-
permissive BSD-style license. PHP is distributed under the <a href="/license/#bsd-3-clause">Modified BSD License</a>.
15-
This includes implementation code, test cases, utility scripts and tools&mdash;that is, all code associated with the PHP
16-
project. If you contribute code that isn't entirely your own (for example, it may be partially derived from other Open
17-
Source software), you should add a comment to the source code indicating the origin and license of the original code.
18-
If you are unsure of the license, you must confirm with the owner that they grant permission to contribute it to PHP
19-
under the Modified BSD License.
14+
Any code contributed to PHP must be contributed under the terms of the Modified BSD License or other compatible,
15+
permissive license. PHP is distributed under the <a href="/license/#bsd-3-clause">Modified BSD License</a>. This
16+
includes implementation code, test cases, utility scripts and tools&mdash;that is, all code associated with the PHP
17+
project. If you contribute code that isn't entirely your own (for example, it may be partially derived from other
18+
Open Source software), you should add a comment to the source code indicating the origin and license of the original
19+
code. If you are unsure of the license, you must confirm with the owner that they grant permission to contribute it
20+
to PHP under the terms of the Modified BSD License or other compatible license.
2021
</p>
22+
2123
<p>
22-
Specifically regarding source code licensed under the GNU General Public License (GPL) or GNU Lesser General Public
23-
License (LGPL):
24+
Specifically regarding source code licensed under the GNU General Public License (GPL):
2425
</p>
26+
2527
<ul>
26-
<li>GPL or LGPL licensed code cannot be used as a basis for any derived work contributed to PHP.</li>
27-
<li>Extensions which link to GPL licensed libraries will not be accepted.</li>
28-
<li>Extensions which link to LGPL licensed libraries are strongly discouraged.</li>
28+
<li>GPL-licensed code cannot be used as a basis for any work contributed to PHP.</li>
29+
<li>Extensions which link to GPL-licensed libraries will not be accepted.</li>
2930
</ul>
3031

31-
3232
<h2>Guidelines for Related Projects</h2>
3333

3434
<p>

license/index.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<li><a href="#web-lic">PHP Website</a></li>
1313
<li><a href="#logo-lic">PHP Logo</a></li>
1414
<li><a href="#faq-lic">FAQ's</a></li>
15-
<li><a href="#other-lic">Licensing information for related projects</a></li>
1615
</ol>
1716
</aside>
1817
EOF;
@@ -193,11 +192,11 @@
193192

194193
<p>
195194
While the OSI approved versions 3.0 and 3.01 of the PHP License through their legacy approval process, the licenses
196-
were not compatible with the GPL. Additionally, some of the wording in clauses 4, 5, and 6 was challenging or
197-
impossible to enforce, and various readings and interpretations sometimes caused confusion among distributors.
198-
As a result, the PHP Group decided to invoke clause 5 of the PHP License to publish a new version. The new version
199-
resolves all problems with the PHP License (perceived or actual) while preserving the rights granted by
200-
contributors and the rights granted to users.
195+
were not compatible with the GPL. Additionally, clauses 4, 5, and 6 were challenging or impossible to enforce, and
196+
various readings and interpretations sometimes caused confusion among distributors. As a result, the PHP Group
197+
decided to invoke clause 5 of the PHP License to publish a new version. The new version resolves all problems with
198+
the PHP License (perceived or actual) while preserving the rights granted by contributors and the rights granted to
199+
users.
201200
</p>
202201

203202
<h3>Change in licensing from PHP 4 and later</h3>

0 commit comments

Comments
 (0)