Author: arekm Date: Wed Aug 19 09:41:57 2009 GMT
Module: packages Tag: PHP_5_2
---- Log message:
- rel 11; fix for bug 48619 (imap segfaults)
---- Files affected:
packages/php:
php.spec (1.805.2.5 -> 1.805.2.6) , php-bug-48619.patch (NONE -> 1.1.2.1)
(NEW)
---- Diffs:
================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.805.2.5 packages/php/php.spec:1.805.2.6
--- packages/php/php.spec:1.805.2.5 Tue Aug 18 12:22:20 2009
+++ packages/php/php.spec Wed Aug 19 11:41:51 2009
@@ -95,7 +95,7 @@
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів,
виконувана на сервері
Name: php
Version: 5.2.10
-Release: 10
+Release: 11
Epoch: 4
License: PHP
Group: Libraries
@@ -163,6 +163,7 @@
Patch47: suhosin.patch
Patch48: %{name}-bug-48697.patch
Patch49: %{name}-m4-divert.patch
+Patch50: %{name}-bug-48619.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}
@@ -1678,6 +1679,7 @@
%endif
%patch48 -R -p3
%patch49 -p1
+%patch50 -p1
# conflict seems to be resolved by recode patches
rm -f ext/recode/config9.m4
@@ -2885,6 +2887,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.805.2.6 2009/08/19 09:41:51 arekm
+- rel 11; fix for bug 48619 (imap segfaults)
+
Revision 1.805.2.5 2009/08/18 10:22:20 arekm
- rel 10; fix build with autoconf 2.64
================================================================
Index: packages/php/php-bug-48619.patch
diff -u /dev/null packages/php/php-bug-48619.patch:1.1.2.1
--- /dev/null Wed Aug 19 11:41:57 2009
+++ packages/php/php-bug-48619.patch Wed Aug 19 11:41:51 2009
@@ -0,0 +1,40 @@
+commit 19db2c409fce51c612ce673550b186163c6e72d6
+Author: pajoye <paj...@c90b9560-bf6c-de11-be94-00142212c4b1>
+Date: Mon Jun 22 20:42:04 2009 +0000
+
+ - MF53: #48619, imap_search ALL segfaults
+
+
+ git-svn-id:
http://svn.php.net/repository/php/php-src/branches/php_...@282598
c90b9560-bf6c-de11-be94-00142212c4b1
+
+diff --git a/ext/imap/php_imap.c b/ext/imap/php_imap.c
+index ea4e8d5..24111e1 100644
+--- a/ext/imap/php_imap.c
++++ b/ext/imap/php_imap.c
+@@ -2670,7 +2670,7 @@ PHP_FUNCTION(imap_sort)
+
+ slst = mail_sort(imap_le_struct->imap_stream, (myargc == 6 ?
Z_STRVAL_PP(charset) : NIL), spg, mypgm, (myargc >= 4 ? Z_LVAL_PP(flags) :
NIL));
+
+- if (spg) {
++ if (spg && !(flags & SE_FREE)) {
+ mail_free_searchpgm(&spg);
+ }
+
+@@ -3712,7 +3712,7 @@ PHP_FUNCTION(imap_search)
+
+ mail_search_full(imap_le_struct->imap_stream, (argc == 4 ?
Z_STRVAL_PP(charset) : NIL), pgm, flags);
+
+- if (pgm) {
++ if (pgm && !(flags & SE_FREE)) {
+ mail_free_searchpgm(&pgm);
+ }
+
+@@ -4341,7 +4341,7 @@ PHP_FUNCTION(imap_thread)
+
+ pgm = mail_criteria(criteria);
+ top = mail_thread(imap_le_struct->imap_stream, "REFERENCES", NIL, pgm,
flags);
+- if (pgm) {
++ if (pgm && !(flags & SE_FREE)) {
+ mail_free_searchpgm(&pgm);
+ }
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.805.2.5&r2=1.805.2.6&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
