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

diff --cc build/build2.mk
index 335bec3654a1e77c21e40921d24ce4bc0c686e90,caaa53faa7b9109d03e41aeec4daf9e8b40d476c..af325ad4a591c44f84cd12b551489ee6167da111
--- 1/build/build2.mk
--- 2/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 f8f827d671fd0f2a58731684b0bb5b9d40b7bb8a,7c42bad5f4bb9869d5428100c34104b793c312b3..61225117ded298474ccd855b274ce6d55ca24f8e
--- 1/build/buildcheck.sh
--- 2/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 a1656e59eb58dd81bd589932522b69d7545e625c,96b9be23b5ac500a8c1ac7ed466b669413d633db..099d80871ccb8b078267e93a2d4b2809b4b3f686
--- 1/ext/mysqli/mysqli_mysqlnd.h
--- 2/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 00908b722f16e32ddeb30bb6d8451d2ce6c91928,f94ef35504f0eea69a7a6a5dc5c34315c7b3fa5c..22c606eb0ad6accd435a79013e3d1f1f66cec572
--- 1/ext/standard/dns_win32.c
--- 2/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 6821b631f55b35b462a81b50fd407d47f5cec637,1ed7508e631f97d19be1a7921ccab32574786b73..0ee7174985ac62a8c2eeeea1f1f0bca302bb9a50
--- 1/main/build-defs.h.in
--- 2/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 d04eea3103549a9aaec3b5a85f5795ac39edc0b2,7a0d84ce22cd0a83dd62b7eee61bc961035ebd1a..5cefe7d30eda80670870e56a1e48fcb3a095fd64
--- 1/main/internal_functions.c.in
--- 2/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 bc9de7fdcf83d5001c152c712194c91a23cf05a2,5df1c5f42bd32569523a99ada0b00a3669179aaf..96733e58a9133e9e6d023f354bf90df03f1c2332
--- 1/run-tests.php
--- 2/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 8c2ae8607b0dc8bbbefaa8b2f26730008d333575,43352981aae481257d598888c19240de5564c967..af4ce018e8b1069de4c7f4c88e306c2989f045ef
--- 1/server-tests.php
--- 2/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 28e317edab54738d1de3537c63d580f17c93a3e9,568b9e42d7504b92824c82c3d38b92d4cd106c69..19ee82e7b983b90a9777220b7ab7b7502608d6f3
--- 1/win32/build/Makefile
--- 2/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        |