aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-08-31 10:49:49 +0100
committerSteve Holme <steve_holme@hotmail.com>2013-08-31 10:49:49 +0100
commitf3849a7b84f90101ceb1145c69a97ac3048b1fd9 (patch)
tree83a17cd7ba6e3702358044bc148bc5f95c5b991c
parent1ca6ed7b75cad03ca47fc28453e0f28123579e05 (diff)
imap: Fixed response check for EXPUNGE command
-rw-r--r--RELEASE-NOTES3
-rw-r--r--lib/imap.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8215ae3fd..b317c7b2a 100644
--- 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 302cc73ca..22a0c4246 100644
--- 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;