[packages/php-ZendFramework] bugfix for Zend\Mail\Headers::fromString
glen
glen at pld-linux.org
Thu Mar 10 20:32:18 CET 2016
commit c15f090bc5000fcd7675df05ffb2134f0e25be34
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Thu Mar 10 21:31:42 2016 +0200
bugfix for Zend\Mail\Headers::fromString
https://github.com/zendframework/zend-mail/issues/64
bug-64.patch | 29 +++++++++++++++++++++++++++++
php-ZendFramework.spec | 4 +++-
2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/php-ZendFramework.spec b/php-ZendFramework.spec
index 687e5fb..ffef348 100644
--- a/php-ZendFramework.spec
+++ b/php-ZendFramework.spec
@@ -9,7 +9,7 @@
Summary: Zend Framework 2
Name: php-ZendFramework
Version: 2.4.9
-Release: 1
+Release: 2
License: BSD
Group: Development/Languages/PHP
Source0: https://packages.zendframework.com/releases/ZendFramework-%{version}/ZendFramework-%{version}.tgz
@@ -19,6 +19,7 @@ Source0: https://packages.zendframework.com/releases/ZendFramework-%{version}/Ze
# tar czf ../ZendFramework-tests-2.4.8.tgz tests
#Source1: ZendFramework-tests-%{version}.tgz
Source2: autoload.php
+Patch0: bug-64.patch
URL: http://framework.zend.com/
Requires: php(core) >= 5.3.23
%if %{with tests}
@@ -1279,6 +1280,7 @@ usage. If the XML document uses ENTITY the library throw an Exception.
%prep
%setup -q -n ZendFramework-%{version} %{?with_tests:-a 1}
+%patch -p2 -d library/Zend/Mail
%build
%if %{with tests}
diff --git a/bug-64.patch b/bug-64.patch
new file mode 100644
index 0000000..157e3ff
--- /dev/null
+++ b/bug-64.patch
@@ -0,0 +1,29 @@
+https://github.com/zendframework/zend-mail/issues/64
+
+diff --git a/src/Header/HeaderWrap.php b/src/Header/HeaderWrap.php
+index df532ed..e0be2f5 100644
+--- a/src/Header/HeaderWrap.php
++++ b/src/Header/HeaderWrap.php
+@@ -116,7 +116,21 @@ abstract class HeaderWrap
+ */
+ public static function canBeEncoded($value)
+ {
+- $encoded = iconv_mime_encode('x-test', $value, array('scheme' => 'Q'));
++ // avoid any wrapping by specifying line length long enough
++ // "test" -> 4
++ // "x-test: =?ISO-8859-1?B?dGVzdA==?=" -> 33
++ // 8 +2 +3 +3 -> 16
++ $charset = 'UTF-8';
++ $line_length = strlen($value) * 4 + strlen($charset) + 16;
++
++ $preferences = array(
++ 'scheme' => 'Q',
++ 'input-charset' => $charset,
++ 'output-charset' => $charset,
++ 'line-length' => $line_length,
++ );
++
++ $encoded = iconv_mime_encode('x-test', $value, $preferences);
+
+ return (false !== $encoded);
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-ZendFramework.git/commitdiff/c15f090bc5000fcd7675df05ffb2134f0e25be34
More information about the pld-cvs-commit
mailing list