imap: Fixed response check for EXPUNGE command

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8215ae3fd83fd844710d152217248faaab3fc08f..b317c7b2a5a15931550d03d90679d89c3adff494 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -24,7 +24,7 @@ This release includes the following bugfixes:
  o tests 2032, 2033: Don't hardcode port in expected output
  o urlglob: better detect unclosed braces, empty lists and overflows [7]
  o urlglob: error out on range overflow [8]
- o imap: Fixed response check for SEARCH command
+ o imap: Fixed response check for SEARCH and EXPUNGE commands [10]
  o handle arbitrary-length username and password [2]
  o TFTP: make the CURLOPT_LOW_SPEED* options work [4]
  o curl.h: name space pollution by "enum type" [5]
@@ -54,3 +54,4 @@ References to bug reports and discussions on issues:
  [7] = http://curl.haxx.se/bug/view.cgi?id=1264
  [8] = http://curl.haxx.se/bug/view.cgi?id=1267
  [9] = http://curl.haxx.se/mail/lib-2013-08/0234.html
+ [10] = http://curl.haxx.se/mail/lib-2013-08/0136.html

diff --git a/lib/imap.c b/lib/imap.c
index 302cc73ca1d579dcc6b7ff2cf2d9730efd9986c0..22a0c424605591ab080f5fcf18b8cfcf855e7045 100644 (file)
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -309,7 +309,8 @@ static bool imap_endofresp(struct connectdata *conn, char *line, size_t len,
             !imap_matchresp(line, len, "FETCH")) &&
            strcmp(imap->custom, "SELECT") &&
            strcmp(imap->custom, "EXAMINE") &&
-           strcmp(imap->custom, "SEARCH")))
+           strcmp(imap->custom, "SEARCH") &&
+           strcmp(imap->custom, "EXPUNGE")))
           return FALSE;
         break;