Control: tag -1 patch

Hi,

On  Sa 14 Feb 2015 08:45:19 UTC, Mike Gabriel wrote:

Package: php5-common
Version: 5.6.5+dfsg-1
Severity: grave
Tags: upstream


Dear PHP5 maintainers,

the latest migration of php5 to Debian jessie unfortunately broke the
complete Horde5 software that is in Debian jessie.

The latest php5 upstream branches (5.5 and 5.6) introduced a severe
regression as discussed at [1].

I am currently test-building a PHP 5.6.5+dfsg-1.1 with that patch
reverted. I will get back to you soon, if that fixes the observed
issue.

Breaking Horde5 means: no communication via IMAP with an MDA (IMAP
server) is possible anymore.

light+love,
Mike


[1] https://bugs.php.net/bug.php?id=68948

The attached patch against php5 allows Horde to start again.

With that patched php5 version on my Debian jessie system, IMP (Horde's mail client) seems to work ok again. However, I also see regressions in Kronolith (calenadaring tool), Turba (address book) and Nag (task planner). I will investigate this further later today.

Mike
--

DAS-NETZWERKTEAM
mike gabriel, herweg 7, 24357 fleckeby
fon: +49 (1520) 1976 148

GnuPG Key ID 0x25771B31
mail: mike.gabr...@das-netzwerkteam.de, http://das-netzwerkteam.de

freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
reverted:
--- a/ext/standard/tests/file/bug68532.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-Bug #68532: convert.base64-encode omits padding bytes
---FILE--
-<?php
-$testString = 'test';
-$stream = fopen('php://memory','r+');
-fwrite($stream, $testString);
-rewind($stream);
-$filter = stream_filter_append($stream, 'convert.base64-encode');
-echo "memoryStream = " . stream_get_contents($stream).PHP_EOL;
-
-
-$fileStream = fopen(__DIR__ . '/base64test.txt','w+');
-fwrite($fileStream , $testString);
-rewind($fileStream );
-$filter = stream_filter_append($fileStream , 'convert.base64-encode');
-echo "fileStream = " . stream_get_contents($fileStream ).PHP_EOL;
-?>
---CLEAN--
-<?php
-unlink(__DIR__ . '/base64test.txt');
-?>
---EXPECT--
-memoryStream = dGVzdA==
-fileStream = dGVzdA==
--- a/ext/standard/tests/file/stream_rfc2397_007.phpt
+++ b/ext/standard/tests/file/stream_rfc2397_007.phpt
@@ -95,7 +95,6 @@
 bool(false)
 ===GETC===
 string(1) "5"
-bool(false)
 int(6)
 bool(true)
 ===REWIND===
--- a/main/streams/memory.c
+++ b/main/streams/memory.c
@@ -87,19 +87,15 @@
 	php_stream_memory_data *ms = (php_stream_memory_data*)stream->abstract;
 	assert(ms != NULL);
 
-	if (ms->fpos == ms->fsize) {
+	if (ms->fpos + count >= ms->fsize) {
+		count = ms->fsize - ms->fpos;
 		stream->eof = 1;
-		count = 0;
-	} else {
-		if (ms->fpos + count >= ms->fsize) {
-			count = ms->fsize - ms->fpos;
-		}
-		if (count) {
-			assert(ms->data!= NULL);
-			assert(buf!= NULL);
-			memcpy(buf, ms->data+ms->fpos, count);
-			ms->fpos += count;
-		}
+	}
+	if (count) {
+		assert(ms->data!= NULL);
+		assert(buf!= NULL);
+		memcpy(buf, ms->data+ms->fpos, count);
+		ms->fpos += count;
 	}
 	return count;
 }

Attachment: pgpICL5X7yiqs.pgp
Description: Digitale PGP-Signatur

Reply via email to