gunnar: server/php-kolab/Kolab_Filter/Filter Incoming.php,1.7,1.8

cvs at kolab.org cvs at kolab.org
Fri Dec 7 19:49:23 CET 2007


Author: gunnar

Update of /kolabrepository/server/php-kolab/Kolab_Filter/Filter
In directory doto:/tmp/cvs-serv1920/php-kolab/Kolab_Filter/Filter

Modified Files:
	Incoming.php 
Log Message:
Fix removal of the empty line between header and body. Added a unit test for that.

Index: Incoming.php
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Filter/Incoming.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Incoming.php	28 Nov 2007 15:36:59 -0000	1.7
+++ Incoming.php	7 Dec 2007 18:49:21 -0000	1.8
@@ -53,12 +53,13 @@
         $headers_done = false;
 
         /* High speed section START */
-        while (!feof($inh)) {
+        $headers_done = false;
+        while (!feof($inh) && !$headers_done) {
             $buffer = fgets($inh, 8192);
             $line = rtrim( $buffer, "\r\n");
             if ($line == '') {
                 /* Done with headers */
-                break;
+                $headers_done = true;
             } else if (eregi('^Content-Type: text/calendar', $line)) {
                 Horde::logMessage(_("Found iCal data in message"), 
                                   __FILE__, __LINE__, PEAR_LOG_DEBUG);





More information about the commits mailing list