From: Julien Pauli <jpauli@php.net>
Date: Mon, 4 Jan 2016 17:13:38 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.3RC1~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=736b91c6507b196e9ddd84aba3f98ee7ed66c63d;p=php

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
---

736b91c6507b196e9ddd84aba3f98ee7ed66c63d
diff --cc build/build2.mk
index 335bec3654,caaa53faa7..af325ad4a5
--- a/build/build2.mk
+++ b/build/build2.mk
@@@ -1,7 -1,7 +1,7 @@@
  #  +----------------------------------------------------------------------+
 -#  | PHP Version 5                                                        |
 +#  | 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,      |
  #  | that is bundled with this package in the file LICENSE, and is        |
diff --cc build/buildcheck.sh
index f8f827d671,7c42bad5f4..61225117de
--- a/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@@ -1,8 -1,8 +1,8 @@@
  #! /bin/sh
  #  +----------------------------------------------------------------------+
 -#  | PHP Version 5                                                        |
 +#  | 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,      |
  #  | that is bundled with this package in the file LICENSE, and is        |
diff --cc ext/mysqli/mysqli_mysqlnd.h
index a1656e59eb,96b9be23b5..099d80871c
--- a/ext/mysqli/mysqli_mysqlnd.h
+++ b/ext/mysqli/mysqli_mysqlnd.h
@@@ -1,8 -1,8 +1,8 @@@
  /*
    +----------------------------------------------------------------------+
 -  | PHP Version 5                                                        |
 +  | 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,      |
    | that is bundled with this package in the file LICENSE, and is        |
diff --cc ext/standard/dns_win32.c
index 00908b722f,f94ef35504..22c606eb0a
--- a/ext/standard/dns_win32.c
+++ b/ext/standard/dns_win32.c
@@@ -1,8 -1,8 +1,8 @@@
  /*
     +----------------------------------------------------------------------+
 -   | PHP Version 5                                                        |
 +   | 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,      |
     | that is bundled with this package in the file LICENSE, and is        |
diff --cc main/build-defs.h.in
index 6821b631f5,1ed7508e63..0ee7174985
--- a/main/build-defs.h.in
+++ b/main/build-defs.h.in
@@@ -1,8 -1,8 +1,8 @@@
  /*                                                                -*- C -*-
     +----------------------------------------------------------------------+
 -   | PHP Version 5                                                        |
 +   | 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,      |
     | that is bundled with this package in the file LICENSE, and is        |
diff --cc main/internal_functions.c.in
index d04eea3103,7a0d84ce22..5cefe7d30e
--- a/main/internal_functions.c.in
+++ b/main/internal_functions.c.in
@@@ -1,8 -1,8 +1,8 @@@
  /* -*- C -*-
     +----------------------------------------------------------------------+
 -   | PHP Version 5                                                        |
 +   | 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,      |
     | that is bundled with this package in the file LICENSE, and is        |
diff --cc run-tests.php
index bc9de7fdcf,5df1c5f42b..96733e58a9
--- a/run-tests.php
+++ b/run-tests.php
@@@ -2,9 -2,9 +2,9 @@@
  <?php
  /*
     +----------------------------------------------------------------------+
 -   | PHP Version 5                                                        |
 +   | 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,      |
     | that is bundled with this package in the file LICENSE, and is        |
diff --cc server-tests.php
index 8c2ae8607b,43352981aa..af4ce018e8
--- a/server-tests.php
+++ b/server-tests.php
@@@ -1,9 -1,9 +1,9 @@@
  <?php
  /*
     +----------------------------------------------------------------------+
 -   | PHP Version 5                                                        |
 +   | 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,      |
     | that is bundled with this package in the file LICENSE, and is        |
diff --cc win32/build/Makefile
index 28e317edab,568b9e42d7..19ee82e7b9
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  #  +----------------------------------------------------------------------+
 -#  | PHP Version 5                                                        |
 +#  | 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,      |
  #  | that is bundled with this package in the file LICENSE, and is        |