* elmo-nntp.el (elmo-nntp-read-response): Fixed for Response '400'

	(elmo-network-initialize-session): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index a07a0c7..31b9b34 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-27  Kenichi OKADA  <okada@opaopa.org>
+
+       * elmo-nntp.el (elmo-nntp-read-response): Fixed for Response '400'
+       (elmo-network-initialize-session): Ditto.
+
 2001-12-26  Yuuichi Teranishi  <teranisi@gohome.org>
 
        * elmo-imap4.el (elmo-imap4-message-fetch): Fixed '100%' message.

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 33a4991..2ef9232 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -263,7 +263,7 @@ Don't cache if nil.")
       (while (and (memq (process-status process) '(open run))
                  (goto-char (point-max))
                  (forward-line -1)
-                 (not (looking-at "20[01]")))
+                 (not (looking-at "^[3-5][0-9][0-9]")))
        (accept-process-output process 1))
       (setq elmo-nntp-read-point (point))
       (or (elmo-nntp-read-response session t)
@@ -337,14 +337,14 @@ Don't cache if nil.")
        (setq response-string
              (buffer-substring elmo-nntp-read-point (- match-end 2)))
        (goto-char elmo-nntp-read-point)
-       (if (looking-at "[23][0-9]+ .*$")
+       (if (looking-at "[234][0-9]+ .*$")
            (progn (setq response-continue nil)
                   (setq elmo-nntp-read-point match-end)
                   (setq response
                         (if response
                             (concat response "\n" response-string)
                           response-string)))
-         (if (looking-at "[^23][0-9]+ .*$")
+         (if (looking-at "[^234][0-9]+ .*$")
              (progn (setq response-continue nil)
                     (setq elmo-nntp-read-point match-end)
                     (setq response nil))