commit c503ed1d06ae5be7cc136c6f8b5f7a06180813ab
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Fri Oct 2 09:43:15 2015 +0200
- rel 13; fix php bug 68486 visible under apache 2.4
php-bug-68486.patch | 18 ++++++++++++++++++
php.spec | 4 +++-
2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index 5ac19d5..ddaf16f 100644
--- a/php.spec
+++ b/php.spec
@@ -112,7 +112,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%define magic_mime /usr/share/misc/magic.mime
%endif
-%define rel 12
+%define rel 13
%define orgname php
%define ver_suffix 52
%define php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -222,6 +222,7 @@ Patch74: CVE-2013-4073.patch
Patch75: php-secbug-67498.patch
Patch76: CVE-2015-0232.patch
Patch77: x32.patch
+Patch78: php-bug-68486.patch
# CENTALT patches
# Backport from 5.3.6
Patch311: php-5.3.6-bug-47435.patch
@@ -1947,6 +1948,7 @@ done
%patch75 -p1
%patch76 -p1
%patch77 -p1
+%patch78 -p1
# Bugfix backport from 5.3.6
%patch311 -p1 -b .bug-47435
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 <[email protected]>
+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/php.git/commitdiff/c503ed1d06ae5be7cc136c6f8b5f7a06180813ab
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
