dev-lang/php: version bump the 5.6.x series.

This is a straightforward version bump, and also removes a patch
against 5.6.15 that was fixed in 5.6.16.

Package-Manager: portage-2.2.20.1

1 files changed, 0 insertions, 59 deletions

diff --git a/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch b/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch
deleted file mode 100644
index 29876a9f97f6..000000000000
--- a/dev-lang/php/files/fix-5.6.15-fpm-const-crash.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 37ed0dafe47fb1053aee7822113bacc1f213337a Mon Sep 17 00:00:00 2001
-From: Xinchen Hui <laruence@gmail.com>
-Date: Mon, 2 Nov 2015 10:47:02 +0800
-Subject: [PATCH] Fixed bug #70828 (php-fpm 5.6 with opcache crashes when
- referencing a non-existent constant)
-
----
- NEWS                     |  2 ++
- Zend/tests/bug70828.phpt | 24 ++++++++++++++++++++++++
- Zend/zend_compile.c      |  2 +-
- 3 files changed, 27 insertions(+), 1 deletion(-)
- create mode 100644 Zend/tests/bug70828.phpt
-
-diff --git a/Zend/tests/bug70828.phpt b/Zend/tests/bug70828.phpt
-new file mode 100644
-index 0000000..dd285b5
---- /dev/null
-+++ b/Zend/tests/bug70828.phpt
-@@ -0,0 +1,24 @@
-+--TEST--
-+Bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant)
-+--FILE--
-+<?php
-+
-+namespace test {
-+	use const nonexistent;
-+
-+	class test {
-+		static function run(){
-+			var_dump(nonexistent);
-+			existent;
-+		}
-+	}
-+}
-+
-+namespace {
-+	define("test\\existent", "bug!", 1);
-+	test\test::run();
-+}
-+?>
-+--EXPECTF--
-+Notice: Use of undefined constant nonexistent - assumed 'nonexistent' in /home/huixinchen/opensource/php-5.6/Zend/tests/bug70828.php on line 8
-+string(11) "nonexistent"
-diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
-index 5ff1b04..fca4e2a 100644
---- a/Zend/zend_compile.c
-+++ b/Zend/zend_compile.c
-@@ -5804,7 +5804,7 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con
- 				opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 0 TSRMLS_CC);
- 			} else {
- 				opline->extended_value = IS_CONSTANT_UNQUALIFIED;
--				if (CG(current_namespace)) {
-+				if (check_namespace && CG(current_namespace)) {
- 					opline->extended_value |= IS_CONSTANT_IN_NAMESPACE;
- 					opline->op2.constant = zend_add_const_name_literal(CG(active_op_array), &constant_name->u.constant, 1 TSRMLS_CC);
- 				} else {
--- 
-2.1.4
-