steffen: server/kolab-resource-handlers/kolab-resource-handlers/resmgr kolabfilter.php, 1.21, 1.22 kolabmailboxfilter.php, 1.2, 1.3
cvs at intevation.de
cvs at intevation.de
Tue May 3 04:11:27 CEST 2005
Author: steffen
Update of /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr
In directory doto:/tmp/cvs-serv2944/kolab-resource-handlers/resmgr
Modified Files:
kolabfilter.php kolabmailboxfilter.php
Log Message:
Fix for Issue231 (german text in fbview) + performance improvements for kolabfilter
Index: kolabfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabfilter.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- kolabfilter.php 7 Apr 2005 00:09:16 -0000 1.21
+++ kolabfilter.php 3 May 2005 02:11:25 -0000 1.22
@@ -120,7 +120,7 @@
$from = false;
$subject = false;
$senderok = true;
-while (!feof(STDIN)) {
+while (!feof(STDIN) && !$headers_done) {
$buffer = fgets(STDIN, 8192);
$line = rtrim( $buffer, "\r\n");
if( $line == '' ) {
@@ -145,6 +145,12 @@
exit(EX_TEMPFAIL);
}
}
+while (!feof(STDIN)) {
+ $buffer = fread( STDIN, 8192 );
+ if( fwrite($tmpf, $buffer) === false ) {
+ exit(EX_TEMPFAIL);
+ }
+}
fclose($tmpf);
if( !$senderok ) {
@@ -174,7 +180,7 @@
}
$headers_done = false;
-while (!feof($tmpf)) {
+while (!feof($tmpf) && !$headers_done) {
$buffer = fgets($tmpf, 8192);
if( !$headers_done && rtrim( $buffer, "\r\n" ) == '' ) {
$headers_done = true;
@@ -189,6 +195,13 @@
fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL);
}
}
+while (!feof($tmpf) ) {
+ $buffer = fread($tmpf, 8192);
+ if( PEAR::isError($error = $smtp->data( $buffer )) ) {
+ fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL);
+ }
+};
+
//myLog("Calling smtp->end()", RM_LOG_DEBUG);
$smtp->end();
myLog("Kolabfilter successfully completed", RM_LOG_DEBUG);
Index: kolabmailboxfilter.php
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers/resmgr/kolabmailboxfilter.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolabmailboxfilter.php 7 Apr 2005 00:09:16 -0000 1.2
+++ kolabmailboxfilter.php 3 May 2005 02:11:25 -0000 1.3
@@ -128,7 +128,7 @@
}
$headers_done = false;
-while (!feof($tmpf)) {
+while (!feof($tmpf) && !$headers_done) {
$buffer = fgets($tmpf, 8192);
if( !$headers_done && rtrim( $buffer, "\r\n" ) == '' ) {
$headers_done = true;
@@ -143,6 +143,12 @@
fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL);
}
}
+while (!feof($tmpf) ) {
+ $buffer = fread($tmpf, 8192);
+ if( PEAR::isError($error = $lmtp->data( $buffer )) ) {
+ fwrite(STDOUT, $error->getMessage()."\n"); exit(EX_TEMPFAIL);
+ }
+};
//myLog("Calling smtp->end()", RM_LOG_DEBUG);
$lmtp->end();
myLog("Kolabmailboxfilter successfully completed", RM_LOG_DEBUG);
More information about the commits
mailing list