From 974c46b89bdb0b84e36890907d17f7a6ae7d058a Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Sat, 26 May 2018 19:34:38 +0200
Subject: [PATCH 1/2] Add missing opcache.opt_debug_level ini directive

---
 php.ini-development | 4 ++++
 php.ini-production  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/php.ini-development b/php.ini-development
index bad30176953..9e7094c4fb0 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1905,6 +1905,10 @@ ldap.max_links = -1
 ; Prevent name collisions in chroot'ed environment.
 ;opcache.validate_root=0
 
+; If specified, it produces opcode dumps for debugging different stages of
+; optimizations.
+;opcache.opt_debug_level=0
+
 [curl]
 ; A default value for the CURLOPT_CAINFO option. This is required to be an
 ; absolute path.
diff --git a/php.ini-production b/php.ini-production
index 2232d75a597..dafddedac10 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1905,6 +1905,10 @@ ldap.max_links = -1
 ; Prevent name collisions in chroot'ed environment.
 ;opcache.validate_root=0
 
+; If specified, it produces opcode dumps for debugging different stages of
+; optimizations.
+;opcache.opt_debug_level=0
+
 [curl]
 ; A default value for the CURLOPT_CAINFO option. This is required to be an
 ; absolute path.

From 34fb42970a40673e17778ae06fdab751046ccf1d Mon Sep 17 00:00:00 2001
From: Mitch Hagstrand <mhagstrand@gmail.com>
Date: Wed, 16 May 2018 15:01:24 -0500
Subject: [PATCH 2/2] Adds print_global_vars to gdbinit

---
 .gdbinit | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.gdbinit b/.gdbinit
index 5a2675d37e4..f33a72bc681 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -16,9 +16,11 @@ define ____executor_globals
 		end
 		set $eg = ((zend_executor_globals*) (*((void ***) $tsrm_ls))[executor_globals_id-1])
 		set $cg = ((zend_compiler_globals*) (*((void ***) $tsrm_ls))[compiler_globals_id-1])
+		set $eg_ptr = $eg
 	else
 		set $eg = executor_globals
 		set $cg = compiler_globals
+		set $eg_ptr = (zend_executor_globals*) &executor_globals
 	end
 end
 
@@ -289,6 +291,16 @@ define ____printzv
 	end
 end
 
+define print_global_vars
+	____executor_globals
+	set $symtable = ((HashTable *)&($eg_ptr->symbol_table))
+	print_ht $symtable
+end
+
+document print_global_vars
+	Prints the global variables
+end
+
 define print_const_table
 	set $ind = 1
 	printf "[%p] {\n", $arg0