From e8a35adcfb812db1356e15d478cc795e571b1286 Mon Sep 17 00:00:00 2001 From: Ben Ramsey Date: Sat, 11 Apr 2026 23:11:55 -0500 Subject: [PATCH] Updated to be the most minimal changes possible with the fewest whitespace changes possible --- license/3_01.txt | 17 ++++++++++++++++- license/4_0.txt | 27 +++++++++++++++++++++++++++ license/contrib-guidelines-code.php | 5 ++--- license/distrib-guidelines-code.php | 8 +------- license/index.php | 9 +++------ software.php | 2 +- 6 files changed, 50 insertions(+), 18 deletions(-) create mode 100644 license/4_0.txt diff --git a/license/3_01.txt b/license/3_01.txt index 4076fe994f..7f0e87eb91 100644 --- a/license/3_01.txt +++ b/license/3_01.txt @@ -1,6 +1,21 @@ +============= An example PHP License, version 3.01 file ============ + +This is the original PHP License, version 3.01, which applies only to +old versions of PHP software (such as versions 8.5 and earlier). + +The PHP License, version 3.01, is an Open Source Initiative approved +license, available at . This +license is provided for historical purposes only. + +This license has been superseded by the PHP License, version 4, +available at . The PHP License, version 4 +is the Modified BSD License (BSD-3-Clause). All new works using the PHP +License should use the Modified BSD License. + + -------------------------------------------------------------------- The PHP License, version 3.01 -Copyright (c) 1999 - 2019 The PHP Group. All rights reserved. +Copyright (c) 1999 - 2026 The PHP Group. All rights reserved. -------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without diff --git a/license/4_0.txt b/license/4_0.txt new file mode 100644 index 0000000000..e64f6647ec --- /dev/null +++ b/license/4_0.txt @@ -0,0 +1,27 @@ +Copyright © The PHP Group and Contributors. +Copyright © Zend Technologies Ltd., a subsidiary company of Perforce Software, Inc. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +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. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS 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 COPYRIGHT HOLDER OR 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. diff --git a/license/contrib-guidelines-code.php b/license/contrib-guidelines-code.php index 7e54d6586e..5369c13a4a 100644 --- a/license/contrib-guidelines-code.php +++ b/license/contrib-guidelines-code.php @@ -10,9 +10,8 @@ itself is developed. These are summarised in the next paragraph.

- Any code contributed to PHP must be contributed under the PHP license (or a compatible BSD-style license). - PHP will be redistributed under the PHP license (currently - version 3.01). + Any code contributed to PHP must be contributed under the Modified BSD License (or a compatible BSD-style license). + PHP will be redistributed under the Modified BSD License. This includes implementation code, test cases, utility scripts and tools - that is, all code associated with the PHP project. If you contribute code that isn't entirely your own (for example it may be partially derived from other Open Source software) you are asked to add a comment diff --git a/license/distrib-guidelines-code.php b/license/distrib-guidelines-code.php index b88ff552ee..cd3fb2bc9f 100644 --- a/license/distrib-guidelines-code.php +++ b/license/distrib-guidelines-code.php @@ -8,7 +8,7 @@

The PHP code can be redistributed in source or binary form provided that the terms of the PHP license are respected (see - version 3.01). + license).

In plain English, this means that you have to include the full license text @@ -54,12 +54,6 @@ the PHP codebase are distributed in human-readable form with every copy, as described above. -

  • - you don't use the name "PHP" without permission, either - to promote your own product or within your product's name - (see clauses #3 and #4 in the PHP license - version 3.01). -
  • - Starting with PHP 4, versions of the PHP software are distributed under the - PHP License v3.01, copyright (c) the PHP Group. + Starting with PHP 8.6, versions of the PHP software are distributed under the + Modified BSD License, copyright (c) the PHP Group.
    • This is an Open Source license, @@ -97,10 +97,7 @@

      A. We cannot really stop you from using PHP in the name of -your project unless you include any code from the PHP distribution, in -which case you would be violating the license. -See Clause 4 in the -PHP License v3.01. +your project.
      But we would really prefer if people would come up with their own names independent of the PHP name.

      diff --git a/software.php b/software.php index d608236248..c586ebe1c7 100644 --- a/software.php +++ b/software.php @@ -8,7 +8,7 @@

      This page contains a list of sites where you can find software distributed - under the PHP license. + under the PHP license.