[packages/php4] - rel 50; fix php bug 68486 visible under apache 2.4
arekm
arekm at pld-linux.org
Fri Oct 2 09:47:47 CEST 2015
commit 207ab8a375027afddaa91427b6aa572916555839
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Oct 2 09:47:42 2015 +0200
- rel 50; fix php bug 68486 visible under apache 2.4
php-bug-68486.patch | 18 ++++++++++++++++++
php4.spec | 4 +++-
2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/php4.spec b/php4.spec
index fccd598..e7e4232 100644
--- a/php4.spec
+++ b/php4.spec
@@ -73,7 +73,7 @@
%undefine with_msession
%endif
-%define rel 49
+%define rel 50
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -153,6 +153,7 @@ Patch55: %{name}-libpng.patch
Patch56: %{name}-gmp.patch
Patch57: %{name}-pcre.patch
Patch58: %{name}-apache24.patch
+Patch59: php-bug-68486.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
%{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0}
@@ -1630,6 +1631,7 @@ cp php.ini-dist php.ini
%patch56 -p1
%patch57 -p1
%patch58 -p1
+%patch59 -p1
%if %{with hardening}
zcat %{SOURCE8} | patch -p1
diff --git a/php-bug-68486.patch b/php-bug-68486.patch
new file mode 100644
index 0000000..ad70f8f
--- /dev/null
+++ b/php-bug-68486.patch
@@ -0,0 +1,18 @@
+commit af1cd45d171fbb06712f846cec7bf69438db8ec2
+Author: Stanislav Malyshev <stas at php.net>
+Date: Sat Apr 4 15:03:46 2015 -0700
+
+ Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
+
+diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
+index e97f11c..cfebc5f 100644
+--- a/sapi/apache2handler/sapi_apache2.c
++++ b/sapi/apache2handler/sapi_apache2.c
+@@ -688,6 +688,7 @@ zend_first_try {
+ } zend_end_try();
+ }
+ apr_brigade_cleanup(brigade);
++ apr_pool_cleanup_run(r->pool, (void *)&SG(server_context), php_server_context_cleanup);
+ } else {
+ ctx->r = parent_req;
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php4.git/commitdiff/207ab8a375027afddaa91427b6aa572916555839
More information about the pld-cvs-commit
mailing list