steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabmailboxfilter.php.in, 1.5, 1.6 kolabmailtransport.php, 1.6, 1.7
cvs at intevation.de
cvs at intevation.de
Tue Feb 28 22:20:40 CET 2006
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv24663/kolab-resource-handlers/resmgr
Modified Files:
kolabmailboxfilter.php.in kolabmailtransport.php
Log Message:
Fix for Issue1042 (thanks bh!)
Index: kolabmailboxfilter.php.in
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailboxfilter.php.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- kolabmailboxfilter.php.in 21 Feb 2006 10:26:01 -0000 1.5
+++ kolabmailboxfilter.php.in 28 Feb 2006 21:20:38 -0000 1.6
@@ -77,7 +77,7 @@
$add_headers = array();
$headers_done = false;
$from = false;
-while (!feof(STDIN)) {
+while (!feof(STDIN) && !$headers_done) {
$buffer = fgets(STDIN, 8192);
$line = rtrim( $buffer, "\r\n");
if( $line == '' ) {
@@ -91,6 +91,12 @@
myLog("Found iCal data in message", RM_LOG_DEBUG);
$ical = true;
}
+ if( fwrite($tmpf, $buffer) === false ) {
+ exit(EX_TEMPFAIL);
+ }
+}
+while (!feof(STDIN)) {
+ $buffer = fread( STDIN, 8192 );
if( fwrite($tmpf, $buffer) === false ) {
exit(EX_TEMPFAIL);
}
Index: kolabmailtransport.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailtransport.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- kolabmailtransport.php 21 Feb 2006 10:26:01 -0000 1.6
+++ kolabmailtransport.php 28 Feb 2006 21:20:38 -0000 1.7
@@ -106,7 +106,8 @@
*/
if( $this->got_newline && $data[0] == '.' ) $data = '.'.$data;
$data = str_replace("\n.", "\n..", $data);
- if( $data[count($data)] == "\n" ) $this->got_newline = true;
+ $len = strlen($data);
+ if( $len>0 && $data[$len-1] == "\n" ) $this->got_newline = true;
else $this->got_newline = false;
}
More information about the commits
mailing list