Skip to content

Commit e8a35ad

Browse files
committed
Updated to be the most minimal changes possible with the fewest
whitespace changes possible
1 parent 72d8ab8 commit e8a35ad

File tree

6 files changed

+50
-18
lines changed

6 files changed

+50
-18
lines changed

license/3_01.txt

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
1+
============= An example PHP License, version 3.01 file ============
2+
3+
This is the original PHP License, version 3.01, which applies only to
4+
old versions of PHP software (such as versions 8.5 and earlier).
5+
6+
The PHP License, version 3.01, is an Open Source Initiative approved
7+
license, available at <https://opensource.org/license/php-3-01>. This
8+
license is provided for historical purposes only.
9+
10+
This license has been superseded by the PHP License, version 4,
11+
available at <https://www.php.net/license/>. The PHP License, version 4
12+
is the Modified BSD License (BSD-3-Clause). All new works using the PHP
13+
License should use the Modified BSD License.
14+
15+
116
--------------------------------------------------------------------
217
The PHP License, version 3.01
3-
Copyright (c) 1999 - 2019 The PHP Group. All rights reserved.
18+
Copyright (c) 1999 - 2026 The PHP Group. All rights reserved.
419
--------------------------------------------------------------------
520

621
Redistribution and use in source and binary forms, with or without

license/4_0.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Copyright © The PHP Group and Contributors.
2+
Copyright © Zend Technologies Ltd., a subsidiary company of Perforce Software, Inc.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
6+
7+
1. Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
9+
10+
2. Redistributions in binary form must reproduce the above copyright notice,
11+
this list of conditions and the following disclaimer in the documentation
12+
and/or other materials provided with the distribution.
13+
14+
3. Neither the name of the copyright holder nor the names of its
15+
contributors may be used to endorse or promote products derived from
16+
this software without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
22+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

license/contrib-guidelines-code.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010
itself is developed. These are summarised in the next paragraph.
1111
</p>
1212
<p>
13-
Any code contributed to PHP must be contributed under the PHP license (or a compatible BSD-style license).
14-
PHP will be redistributed under the PHP license (currently
15-
<a href="http://www.php.net/license/3_01.txt">version 3.01</a>).
13+
Any code contributed to PHP must be contributed under the Modified BSD License (or a compatible BSD-style license).
14+
PHP will be redistributed under the Modified BSD License.
1615
This includes implementation code, test cases, utility scripts and tools - that is, all code associated
1716
with the PHP project. If you contribute code that isn't entirely your own
1817
(for example it may be partially derived from other Open Source software) you are asked to add a comment

license/distrib-guidelines-code.php

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<p>
99
The PHP code can be redistributed in source or binary form provided that
1010
the terms of the PHP license are respected (see
11-
<a href="http://www.php.net/license/3_01.txt">version 3.01</a>).
11+
<a href="http://www.php.net/license/">license</a>).
1212
</p>
1313
<p>
1414
In plain English, this means that you have to include the full license text
@@ -54,12 +54,6 @@
5454
the PHP codebase are distributed in human-readable form with
5555
every copy, as described above.
5656
</li>
57-
<li>
58-
you don't use the name "PHP" without permission, either
59-
to promote your own product or within your product's name
60-
(see clauses #3 and #4 in the PHP license
61-
<a href="http://www.php.net/license/3_01.txt">version 3.01</a>).
62-
</li>
6357
</ul>
6458

6559
<?php site_footer();

license/index.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
<ul>
2929
<li>
30-
Starting with PHP 4, versions of the PHP software are distributed under the
31-
<a href="http://www.php.net/license/3_01.txt">PHP License v3.01</a>, copyright (c) the <a href="/credits.php">PHP Group</a>.
30+
Starting with PHP 8.6, versions of the PHP software are distributed under the
31+
<a href="http://www.php.net/license/4_0.txt">Modified BSD License</a>, copyright (c) the <a href="/credits.php">PHP Group</a>.
3232
<ul>
3333
<li>
3434
This is an <a href="http://www.opensource.org/docs/osd">Open Source license</a>,
@@ -97,10 +97,7 @@
9797
<p>
9898
<strong>A.</strong>
9999
We cannot really stop you from using PHP in the name of
100-
your project unless you include any code from the PHP distribution, in
101-
which case you would be violating the license.
102-
See Clause 4 in the <a href="http://www.php.net/license/3_01.txt">
103-
PHP License v3.01</a>.
100+
your project.
104101
<br>But we would really prefer if people would come up with their own names
105102
independent of the PHP name.
106103
</p>

software.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<p>
1010
This page contains a list of sites where you can find software distributed
11-
under the <a href="/license/3_01.txt">PHP license</a>.
11+
under the <a href="/license/4_0.txt">PHP license</a>.
1212
</p>
1313

1414
<p>

0 commit comments

Comments
 (0)