[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-08-13 15:37:53
Message-ID: 1250177873.722194.9550.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1010909 by tmcguire:

Merged revisions 1008037 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs

........
  r1008037 | mkoller | 2009-08-06 20:34:00 +0200 (Thu, 06 Aug 2009) | 6 lines
  
  backport: BUG: 141699, BUG: 40920
  
  Handle the case when the POP server closes the connection after returning the \
result,  e.g. +OK 0 messages
  after the LIST command
........


 _M            . (directory)  
 M  +2 -2      kioslave/pop3/pop3.cpp  


** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
   - /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,996755,997101,997490,998251,1000615,1007460
  + /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,996755,997101,997490,998251,1000615,1007460,1008037
                
--- branches/kdepim/enterprise4/kdepimlibs/kioslave/pop3/pop3.cpp #1010908:1010909
@@ -483,7 +483,7 @@
         myReadLine(buf, sizeof(buf) - 1);
 
         // HACK: This assumes fread stops at the first \n and not \r
-        if (strcmp(buf, ".\r\n") == 0) {
+        if ( (buf[0] == 0) || (strcmp(buf, ".\r\n") == 0) ) {
           break;              // End of data
         }
         // sanders, changed -2 to -1 below
@@ -852,7 +852,7 @@
         myReadLine(buf, sizeof(buf) - 1);
 
         // HACK: This assumes fread stops at the first \n and not \r
-        if (strcmp(buf, ".\r\n") == 0) {
+        if ( (buf[0] == 0) || (strcmp(buf, ".\r\n") == 0) ) {
           break;                // End of data
         }
         // sanders, changed -2 to -1 below


[prev in list] [next in list] [prev in thread] [next in thread]