Skip to content

Commit 5636598

Browse files
committed
Merge branch 'PHP-7.0'
2 parents caf007c + 97a9470 commit 5636598

File tree

113 files changed

+115
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+115
-115
lines changed

TSRM/tsrm_nw.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 7 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1997-2015 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 |

TSRM/tsrm_nw.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 7 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1997-2015 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 |

TSRM/tsrm_win32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 7 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1997-2015 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 |

TSRM/tsrm_win32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| PHP Version 7 |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1997-2015 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 |

Zend/zend.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| Zend Engine |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
5+
| Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 2.00 of the Zend license, |
88
| that is bundled with this package in the file LICENSE, and is |
@@ -156,7 +156,7 @@ ZEND_API zend_utility_values zend_uv;
156156
/* version information */
157157
static char *zend_version_info;
158158
static uint zend_version_info_length;
159-
#define ZEND_CORE_VERSION_INFO "Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2015 Zend Technologies\n"
159+
#define ZEND_CORE_VERSION_INFO "Zend Engine v" ZEND_VERSION ", Copyright (c) 1998-2016 Zend Technologies\n"
160160
#define PRINT_ZVAL_INDENT 4
161161

162162
static void print_hash(zend_write_func_t write_func, HashTable *ht, int indent, zend_bool is_object) /* {{{ */

Zend/zend.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| Zend Engine |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
5+
| Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 2.00 of the Zend license, |
88
| that is bundled with this package in the file LICENSE, and is |

Zend/zend_API.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| Zend Engine |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
5+
| Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 2.00 of the Zend license, |
88
| that is bundled with this package in the file LICENSE, and is |

Zend/zend_API.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| Zend Engine |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
5+
| Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 2.00 of the Zend license, |
88
| that is bundled with this package in the file LICENSE, and is |

Zend/zend_alloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| Zend Engine |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
5+
| Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 2.00 of the Zend license, |
88
| that is bundled with this package in the file LICENSE, and is |

Zend/zend_alloc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
+----------------------------------------------------------------------+
33
| Zend Engine |
44
+----------------------------------------------------------------------+
5-
| Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) |
5+
| Copyright (c) 1998-2016 Zend Technologies Ltd. (http://www.zend.com) |
66
+----------------------------------------------------------------------+
77
| This source file is subject to version 2.00 of the Zend license, |
88
| that is bundled with this package in the file LICENSE, and is |

0 commit comments

Comments
 (0)