Skip to content

Commit 736b91c

Browse files
author
Julien Pauli
committed
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Happy new year (Update copyright to 2016) Conflicts: ext/json/php_json_encoder.h sapi/continuity/capi.c
2 parents 0ea63cb + 53fb2f1 commit 736b91c

14 files changed

+15
-15
lines changed

‎build/build2.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# +----------------------------------------------------------------------+
22
# | PHP Version 7 |
33
# +----------------------------------------------------------------------+
4-
# | Copyright (c) 1997-2007 The PHP Group |
4+
# | Copyright (c) 1997-2016 The PHP Group |
55
# +----------------------------------------------------------------------+
66
# | This source file is subject to version 3.01 of the PHP license, |
77
# | that is bundled with this package in the file LICENSE, and is |

‎build/buildcheck.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# +----------------------------------------------------------------------+
33
# | PHP Version 7 |
44
# +----------------------------------------------------------------------+
5-
# | Copyright (c) 1997-2007 The PHP Group |
5+
# | Copyright (c) 1997-2016 The PHP Group |
66
# +----------------------------------------------------------------------+
77
# | This source file is subject to version 3.01 of the PHP license, |
88
# | that is bundled with this package in the file LICENSE, and is |

‎ext/mysqli/mysqli_mysqlnd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 7 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2006-2009 The PHP Group |
5+
| Copyright (c) 2006-2016 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎ext/phar/phar.1.in

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

‎ext/standard/dns_win32.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 7 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 2008-2009 The PHP Group |
5+
| Copyright (c) 2008-2016 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎main/build-defs.h.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 7 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1997-2007 The PHP Group |
5+
| Copyright (c) 1997-2016 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎main/internal_functions.c.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 7 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1997-2007 The PHP Group |
5+
| Copyright (c) 1997-2016 The PHP Group |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 3.01 of the PHP license, |
88
| that is bundled with this package in the file LICENSE, and is |

‎run-tests.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
+----------------------------------------------------------------------+
55
| PHP Version 7 |
66
+----------------------------------------------------------------------+
7-
| Copyright (c) 1997-2010 The PHP Group |
7+
| Copyright (c) 1997-2016 The PHP Group |
88
+----------------------------------------------------------------------+
99
| This source file is subject to version 3.01 of the PHP license, |
1010
| that is bundled with this package in the file LICENSE, and is |

‎sapi/cli/php.1.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH @program_prefix@php 1 "2014" "The PHP Group" "Scripting Language"
1+
.TH @program_prefix@php 1 "2016" "The PHP Group" "Scripting Language"
22
.SH NAME
33
@program_prefix@php \- PHP Command Line Interface 'CLI'
44
.P

‎sapi/fpm/php-fpm.8.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH PHP-FPM 8 "2009" "The PHP Group" "Scripting Language"
1+
.TH PHP-FPM 8 "2016" "The PHP Group" "Scripting Language"
22
.SH NAME
33
.TP 15
44
php-fpm \- PHP FastCGI Process Manager 'PHP-FPM'
@@ -213,7 +213,7 @@ contributors all around the world.
213213
.SH VERSION INFORMATION
214214
This manpage describes \fBphp-fpm\fP, version @PHP_VERSION@.
215215
.SH COPYRIGHT
216-
Copyright \(co 1997\-2009 The PHP Group
216+
Copyright \(co 1997\-2016 The PHP Group
217217
.PD 0
218218
.P
219219
Copyright (c) 2007-2009, Andrei Nigmatulin

‎scripts/man1/php-config.1.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH @program_prefix@php\-config 1 "2014" "The PHP Group" "Scripting Language"
1+
.TH @program_prefix@php\-config 1 "2016" "The PHP Group" "Scripting Language"
22
.SH NAME
33
@program_prefix@php\-config \- get information about PHP configuration and compile options
44
.SH SYNOPSIS

‎scripts/man1/phpize.1.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH @program_prefix@phpize 1 "2014" "The PHP Group" "Scripting Language"
1+
.TH @program_prefix@phpize 1 "2016" "The PHP Group" "Scripting Language"
22
.SH NAME
33
@program_prefix@phpize \- prepare a PHP extension for compiling
44
.SH SYNOPSIS

‎server-tests.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
+----------------------------------------------------------------------+
44
| PHP Version 7 |
55
+----------------------------------------------------------------------+
6-
| Copyright (c) 1997-2010 The PHP Group |
6+
| Copyright (c) 1997-2016 The PHP Group |
77
+----------------------------------------------------------------------+
88
| This source file is subject to version 3.01 of the PHP license, |
99
| that is bundled with this package in the file LICENSE, and is |

‎win32/build/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# +----------------------------------------------------------------------+
22
# | PHP Version 7 |
33
# +----------------------------------------------------------------------+
4-
# | Copyright (c) 1997-2008 The PHP Group |
4+
# | Copyright (c) 1997-2016 The PHP Group |
55
# +----------------------------------------------------------------------+
66
# | This source file is subject to version 3.01 of the PHP license, |
77
# | that is bundled with this package in the file LICENSE, and is |

0 commit comments

Comments
 (0)