archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.6' into PHP-7.0

Browse source 
* PHP-5.6:
  Happy new year (Update copyright to 2016)

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c
This commit is contained in:
Julien Pauli 2016-01-04 18:13:38 +01:00
commit 736b91c650
14 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/build2.mk
View file

@ -1,7 +1,7 @@
# +----------------------------------------------------------------------+ # +----------------------------------------------------------------------+
# | PHP Version 7 | # | PHP Version 7 |
# +----------------------------------------------------------------------+ # +----------------------------------------------------------------------+
# | Copyright (c) 1997-2007 The PHP Group | # | Copyright (c) 1997-2016 The PHP Group |
# +----------------------------------------------------------------------+ # +----------------------------------------------------------------------+
# | This source file is subject to version 3.01 of the PHP license, | # | This source file is subject to version 3.01 of the PHP license, |
# | that is bundled with this package in the file LICENSE, and is | # | that is bundled with this package in the file LICENSE, and is |

2
build/buildcheck.sh
View file

@ -2,7 +2,7 @@
# +----------------------------------------------------------------------+ # +----------------------------------------------------------------------+
# | PHP Version 7 | # | PHP Version 7 |
# +----------------------------------------------------------------------+ # +----------------------------------------------------------------------+
# | Copyright (c) 1997-2007 The PHP Group | # | Copyright (c) 1997-2016 The PHP Group |
# +----------------------------------------------------------------------+ # +----------------------------------------------------------------------+
# | This source file is subject to version 3.01 of the PHP license, | # | This source file is subject to version 3.01 of the PHP license, |
# | that is bundled with this package in the file LICENSE, and is | # | that is bundled with this package in the file LICENSE, and is |

2
ext/mysqli/mysqli_mysqlnd.h
View file

@ -2,7 +2,7 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP Version 7 | | PHP Version 7 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 2006-2009 The PHP Group | | Copyright (c) 2006-2016 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, | | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is | | that is bundled with this package in the file LICENSE, and is |

2
ext/phar/phar.1.in
View file

@ -1,4 +1,4 @@
.TH PHAR 1 "2013" "The PHP Group" "User Commands" .TH PHAR 1 "2016" "The PHP Group" "User Commands"
.SH NAME .SH NAME
phar, phar.phar \- PHAR (PHP archive) command line tool phar, phar.phar \- PHAR (PHP archive) command line tool
.SH SYNOPSIS .SH SYNOPSIS

2
ext/standard/dns_win32.c
View file

@ -2,7 +2,7 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP Version 7 | | PHP Version 7 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 2008-2009 The PHP Group | | Copyright (c) 2008-2016 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, | | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is | | that is bundled with this package in the file LICENSE, and is |

2
main/build-defs.h.in
View file

@ -2,7 +2,7 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP Version 7 | | PHP Version 7 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1997-2007 The PHP Group | | Copyright (c) 1997-2016 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, | | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is | | that is bundled with this package in the file LICENSE, and is |

2
main/internal_functions.c.in
View file

@ -2,7 +2,7 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP Version 7 | | PHP Version 7 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1997-2007 The PHP Group | | Copyright (c) 1997-2016 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, | | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is | | that is bundled with this package in the file LICENSE, and is |

2
run-tests.php
View file

@ -4,7 +4,7 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP Version 7 | | PHP Version 7 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1997-2010 The PHP Group | | Copyright (c) 1997-2016 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, | | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is | | that is bundled with this package in the file LICENSE, and is |

2
sapi/cli/php.1.in
View file

@ -1,4 +1,4 @@
.TH @program_prefix@php 1 "2014" "The PHP Group" "Scripting Language" .TH @program_prefix@php 1 "2016" "The PHP Group" "Scripting Language"
.SH NAME .SH NAME
@program_prefix@php \- PHP Command Line Interface 'CLI' @program_prefix@php \- PHP Command Line Interface 'CLI'
.P .P

4
sapi/fpm/php-fpm.8.in
View file

@ -1,4 +1,4 @@
.TH PHP-FPM 8 "2009" "The PHP Group" "Scripting Language" .TH PHP-FPM 8 "2016" "The PHP Group" "Scripting Language"
.SH NAME .SH NAME
.TP 15 .TP 15
php-fpm \- PHP FastCGI Process Manager 'PHP-FPM' php-fpm \- PHP FastCGI Process Manager 'PHP-FPM'
@ -213,7 +213,7 @@ contributors all around the world.
.SH VERSION INFORMATION .SH VERSION INFORMATION
This manpage describes \fBphp-fpm\fP, version @PHP_VERSION@. This manpage describes \fBphp-fpm\fP, version @PHP_VERSION@.
.SH COPYRIGHT .SH COPYRIGHT
Copyright \(co 1997\-2009 The PHP Group Copyright \(co 1997\-2016 The PHP Group
.PD 0 .PD 0
.P .P
Copyright (c) 2007-2009, Andrei Nigmatulin Copyright (c) 2007-2009, Andrei Nigmatulin

2
scripts/man1/php-config.1.in
View file

@ -1,4 +1,4 @@
.TH @program_prefix@php\-config 1 "2014" "The PHP Group" "Scripting Language" .TH @program_prefix@php\-config 1 "2016" "The PHP Group" "Scripting Language"
.SH NAME .SH NAME
@program_prefix@php\-config \- get information about PHP configuration and compile options @program_prefix@php\-config \- get information about PHP configuration and compile options
.SH SYNOPSIS .SH SYNOPSIS

2
scripts/man1/phpize.1.in
View file

@ -1,4 +1,4 @@
.TH @program_prefix@phpize 1 "2014" "The PHP Group" "Scripting Language" .TH @program_prefix@phpize 1 "2016" "The PHP Group" "Scripting Language"
.SH NAME .SH NAME
@program_prefix@phpize \- prepare a PHP extension for compiling @program_prefix@phpize \- prepare a PHP extension for compiling
.SH SYNOPSIS .SH SYNOPSIS

2
server-tests.php
View file

@ -3,7 +3,7 @@
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| PHP Version 7 | | PHP Version 7 |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| Copyright (c) 1997-2010 The PHP Group | | Copyright (c) 1997-2016 The PHP Group |
+----------------------------------------------------------------------+ +----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, | | This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is | | that is bundled with this package in the file LICENSE, and is |

2
win32/build/Makefile
View file

@ -1,7 +1,7 @@
# +----------------------------------------------------------------------+ # +----------------------------------------------------------------------+
# | PHP Version 7 | # | PHP Version 7 |
# +----------------------------------------------------------------------+ # +----------------------------------------------------------------------+
# | Copyright (c) 1997-2008 The PHP Group | # | Copyright (c) 1997-2016 The PHP Group |
# +----------------------------------------------------------------------+ # +----------------------------------------------------------------------+
# | This source file is subject to version 3.01 of the PHP license, | # | This source file is subject to version 3.01 of the PHP license, |
# | that is bundled with this package in the file LICENSE, and is | # | that is bundled with this package in the file LICENSE, and is |