summaryrefslogtreecommitdiffstats
path: root/802d36c6f158e04eace2a816e38f05b8471b4f64.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-09-19 09:17:35 +0200
committerRemi Collet <remi@remirepo.net>2017-09-19 09:17:35 +0200
commit824933da5fe84784984fb9e2b9bdf39f9c18a3d5 (patch)
tree85a0a4f5ec416300dcea78aaff4c18b183b9c84d /802d36c6f158e04eace2a816e38f05b8471b4f64.patch
parent8070c3b6d9828e48cd3419cd3bc4e7ab8bc3e26f (diff)
add upstream patch to fix segfaults
Diffstat (limited to '802d36c6f158e04eace2a816e38f05b8471b4f64.patch')
-rw-r--r--802d36c6f158e04eace2a816e38f05b8471b4f64.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/802d36c6f158e04eace2a816e38f05b8471b4f64.patch b/802d36c6f158e04eace2a816e38f05b8471b4f64.patch
new file mode 100644
index 0000000..50d2285
--- /dev/null
+++ b/802d36c6f158e04eace2a816e38f05b8471b4f64.patch
@@ -0,0 +1,38 @@
+From 79fb94b4cbca994f0f24fb13dbc4796253d21db0 Mon Sep 17 00:00:00 2001
+From: xbruce <xbruce@xbrucedeMacBook-Pro.local>
+Date: Tue, 19 Sep 2017 11:29:03 +0800
+Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dphp7.1=E7=89=88=E6=9C=ACcli?=
+ =?UTF-8?q?=E4=B8=8B=E8=BF=90=E8=A1=8C=E4=B8=8D=E6=AD=A3=E5=B8=B8=E7=9A=84?=
+ =?UTF-8?q?bug!=20=E5=8E=9F=E5=9B=A0=EF=BC=9A=E8=B6=85=E5=85=A8=E5=B1=80?=
+ =?UTF-8?q?=E5=8F=98=E9=87=8F$=5FSERVER=E4=B8=AD=E4=B8=8D=E5=AD=98?=
+ =?UTF-8?q?=E5=9C=A8SUDO=5FCOMMAND=E5=AF=BC=E8=87=B4SEASLOG=5FG(request=5F?=
+ =?UTF-8?q?variable)->request=5Fmethod=E4=B8=BA=E7=A9=BA=E8=BF=9B=E8=80=8C?=
+ =?UTF-8?q?=E5=AF=BC=E8=87=B4seaslog=5Fclear=5Frequest=5Fvariable=E5=87=BD?=
+ =?UTF-8?q?=E6=95=B0=E4=B8=ADSEASLOG=5FZVAL=5FPTR=5FDTOR(SEASLOG=5FG(reque?=
+ =?UTF-8?q?st=5Fvariable)->request=5Fmethod);=E5=A4=B1=E8=B4=A5?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/Request.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/Request.c b/src/Request.c
+index cc53db1..755ba2c 100644
+--- a/src/Request.c
++++ b/src/Request.c
+@@ -193,7 +193,12 @@ static int seaslog_init_request_variable(TSRMLS_D)
+ static void seaslog_clear_request_variable(TSRMLS_D)
+ {
+ SEASLOG_ZVAL_PTR_DTOR(SEASLOG_G(request_variable)->request_uri);
+- SEASLOG_ZVAL_PTR_DTOR(SEASLOG_G(request_variable)->request_method);
++
++ if( SEASLOG_G(request_variable)->request_method )
++ {
++ SEASLOG_ZVAL_PTR_DTOR(SEASLOG_G(request_variable)->request_method);
++ }
++
+ efree(SEASLOG_G(request_variable)->domain_port);
+ efree(SEASLOG_G(request_variable)->client_ip);
+ efree(SEASLOG_G(request_variable));