2004-03-21 Kenichi Okada <okada@opaopa.org>

  * configure.in (VERSION): Bump up to 0.10.

2004-03-21  AIDA Shinra <shinra@j10n.org>

    * starttls.c (main): Fix for small BUFSIZE OS.

diff --git a/ChangeLog b/ChangeLog
index 886f9df..9278e1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-21  Kenichi Okada  <okada@opaopa.org>
+
+       * configure.in (VERSION): Bump up to 0.10.
+
+2004-03-21  AIDA Shinra <shinra@j10n.org>
+
+       * starttls.c (main): Fix for small BUFSIZE OS.
+
 2004-02-17  Daiki Ueno  <ueno@unixuser.org>
 
        * configure.in: Use AC_LIBOBJ rather than manually modify LIBOBJS.

diff --git a/configure.in b/configure.in
index f5e8bf3..9b530a8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(starttls.el)
 AC_PREREQ(2.13)
-AM_INIT_AUTOMAKE(starttls, 0.9)
+AM_INIT_AUTOMAKE(starttls, 0.10)
 
 AM_PATH_LISPDIR
 

diff --git a/starttls.c b/starttls.c
index 4c95786..f0d61ce 100644 (file)
--- a/starttls.c
+++ b/starttls.c
@@ -344,6 +344,7 @@ main (argc, argv)
       if (FD_ISSET (tls_fd, &readfds))
 #endif
        {
+readtop:
          if (tls_conn)
            nbuffer = SSL_read (tls_conn, buffer, sizeof buffer -1);
          else
@@ -367,6 +368,8 @@ main (argc, argv)
              wrote = write (out, retry, nbuffer);
              if (wrote < 0) goto finish;
            }
+         if (tls_conn && SSL_pending(tls_conn))
+           goto readtop;
        }
     }