Request 2305 (accepted)

Overview

Request 2305 (accepted)

Update php-sabre-vobject

Created by vanmeeuwen over 6 years ago
In state accepted

Submit php-sabre-vobject

Submit package Kolab:Winterfell / php-sabre-vobject to package Kolab:16 / php-sabre-vobject

php-sabre-vobject.spec Changed

vobject_encoding_performance.patch Added

@@ -0,0 +1,68 @@
+diff --git a/lib/Property.php b/lib/Property.php
+index 73686bc..ccb5e5c 100644
+--- a/lib/Property.php
++++ b/lib/Property.php
+@@ -241,17 +241,15 @@ abstract class Property extends Node {
+ 
+         $str.=':' . $this->getRawMimeDirValue();
+ 
+-        $out = '';
+-        while(strlen($str)>0) {
+-            if (strlen($str)>75) {
+-                $out.= mb_strcut($str,0,75,'utf-8') . "\r\n";
+-                $str = ' ' . mb_strcut($str,75,strlen($str),'utf-8');
+-            } else {
+-                $out.=$str . "\r\n";
+-                $str='';
+-                break;
+-            }
+-        }
++        $str = preg_replace(
++            '/(
++                (?:^.)?         # 1 additional byte in first line because of missing single space (see next line)
++                .{1,74}         # max 75 bytes per line (1 byte is used for a single space added after every CRLF)
++                (?![\x80-\xbf]) # prevent splitting multibyte characters
++            )/x',
++            "$1\r\n ",
++            $str
++        );
+ 
+         return $out;
+ 
+diff --git a/lib/Property/Text.php b/lib/Property/Text.php
+index ffd4c4b..30f5e38 100644
+--- a/lib/Property/Text.php
++++ b/lib/Property/Text.php
+@@ -270,20 +270,19 @@ class Text extends Property {
+ 
+         } else {
+             $str.=':' . $val;
+-            $out = '';
+-            while(strlen($str)>0) {
+-                if (strlen($str)>75) {
+-                    $out.= mb_strcut($str,0,75,'utf-8') . "\r\n";
+-                    $str = ' ' . mb_strcut($str,75,strlen($str),'utf-8');
+-                } else {
+-                    $out.=$str . "\r\n";
+-                    $str='';
+-                    break;
+-                }
+-            }
+-
+-            return $out;
+ 
++            $str = \preg_replace(
++                '/(
++                    (?:^.)?         # 1 additional byte in first line because of missing single space (see next line)
++                    .{1,74}         # max 75 bytes per line (1 byte is used for a single space added after every CRLF)
++                    (?![\x80-\xbf]) # prevent splitting multibyte characters
++                )/x',
++                "$1\r\n ",
++                $str
++            );
++
++            // remove single space after last CRLF
++            return \substr($str, 0, -1);
+ 
+         }
+

debian.changelog Changed

debian.rules Changed

debian.series Changed

php-sabre-vobject.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2305 0

Request History

vanmeeuwen created request over 6 years ago

Update php-sabre-vobject

vanmeeuwen accepted review over 6 years ago

vanmeeuwen approved review over 6 years ago

vanmeeuwen accepted request over 6 years ago