Merged revisions 76730 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r76730 | r.david.murray | 2009-12-09 21:08:06 -0500 (Wed, 09 Dec 2009) | 20 lines

  Merged revisions 76726-76727 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  The merge adds a test with an invalid rather than a missing line end, since
  the py3K code passed the original issue 5949 test.  New test also by Scott
  Dial.

  ........
    r76726 | r.david.murray | 2009-12-09 10:15:31 -0500 (Wed, 09 Dec 2009) | 6 lines

    Issue 5949: fixed IMAP4_SSL hang when the IMAP server response is
    missing proper end-of-line termination.  Patch and tests by
    Scott Dial.  The new tests include a test harness which will
    make it easier to add additional tests.
  ........
    r76727 | r.david.murray | 2009-12-09 11:41:39 -0500 (Wed, 09 Dec 2009) | 2 lines

    Skip new imaplib SSL tests if ssl is not available.
  ........
................
diff --git a/Misc/NEWS b/Misc/NEWS
index 700a1ae..d965a11 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -55,6 +55,9 @@
 Library
 -------
 
+- Issue #5949: added check for correct lineends in input from IMAP server
+  in imaplib.
+
 - Fix variations of extending deques:  d.extend(d)  d.extendleft(d)  d+=d
 
 - Issue #6986: Fix crash in the JSON C accelerator when called with the