From 3744533468767441f13ebbdda52f354ada0764fc Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 12 Apr 2019 12:09:09 +0200
Subject: [PATCH 1/2] Enable -Wall on release builds for GCC

-Wall was already enabled for debug builds, enable it for release
builds as well.
---
 Zend/Zend.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index 0755a58f14c..44cdcee71e4 100644
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -101,13 +101,13 @@ if test "$ZEND_DEBUG" = "yes"; then
   if test "$CFLAGS" = "-g -O2"; then
   	CFLAGS=-g
   fi
-  test -n "$GCC" && DEBUG_CFLAGS="$DEBUG_CFLAGS -Wall"
   test -n "$GCC" && test "$USE_MAINTAINER_MODE" = "yes" && \
     DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations"
 else
   AC_DEFINE(ZEND_DEBUG,0,[ ])
 fi
 
+test -n "$GCC" && CFLAGS="$CFLAGS -Wall"
 test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
 
 if test "$ZEND_MAINTAINER_ZTS" = "yes"; then

From 4f28bbda51e1a74a69da61ac875e17656f710f4f Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 12 Apr 2019 12:47:39 +0200
Subject: [PATCH 2/2] Fix SOAP bailout handling

This code was reusing the _bailout variable from
SOAP_CLIENT_BEGIN/END_CODE(). As _bailout is not volatile, modifying
it after the setjmp call and then reading it back on return is
illegal. Use a separate local bailout variable instead.

This fixes the miscompile introduced by marking zend_bailout() as
noreturn.
---
 ext/soap/soap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index c224d24759f..0209125bbca 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -2597,6 +2597,7 @@ static void do_soap_call(zend_execute_data *execute_data,
 	int old_features;
 	HashTable *old_typemap, *typemap = NULL;
 	smart_str action = {0};
+	int bailout = 0;
 
 	SOAP_CLIENT_BEGIN_CODE();
 
@@ -2763,7 +2764,7 @@ static void do_soap_call(zend_execute_data *execute_data,
 		}
 
 	} zend_catch {
-		_bailout = 1;
+		bailout = 1;
 	} zend_end_try();
 
 	if (SOAP_GLOBAL(encoding) != NULL) {
@@ -2775,12 +2776,11 @@ static void do_soap_call(zend_execute_data *execute_data,
 	SOAP_GLOBAL(class_map) = old_class_map;
 	SOAP_GLOBAL(encoding) = old_encoding;
 	SOAP_GLOBAL(sdl) = old_sdl;
-	if (_bailout) {
+	if (bailout) {
 		smart_str_free(&action);
 		if (request) {
 			xmlFreeDoc(request);
 		}
-		_bailout = 0;
 		zend_bailout();
 	}
 	SOAP_CLIENT_END_CODE();