[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-151-gcf2059a

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=cf2059a9c27cd4972a4ba714d3c0cccd5746231c

The branch, master has been updated
       via  cf2059a9c27cd4972a4ba714d3c0cccd5746231c (commit)
      from  67ff3f2cedabcf1a831129466360280cd571ab85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cf2059a9c27cd4972a4ba714d3c0cccd5746231c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Mar 3 13:13:32 2010 +0100

    gnutls-serv will terminate connection on rehandshake errors.

-----------------------------------------------------------------------

Summary of changes:
 src/serv.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/serv.c b/src/serv.c
index 79859c7..a66915e 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -1222,7 +1222,7 @@ main (int argc, char **argv)
                        ret =
                          gnutls_alert_send_appropriate (j->tls_session, r);
                      }
-                   while (ret == GNUTLS_E_AGAIN);
+                   while (ret == GNUTLS_E_AGAIN || ret == 
GNUTLS_E_INTERRUPTED);
                    j->http_state = HTTP_STATE_CLOSING;
                  }
                else if (r == 0)
@@ -1261,6 +1261,18 @@ main (int argc, char **argv)
                            r = gnutls_handshake (j->tls_session);
                           } 
                         while (r == GNUTLS_E_INTERRUPTED || r == 
GNUTLS_E_AGAIN);
+                        if (r < 0) 
+                          {
+
+                           do
+                             {
+                               ret = gnutls_alert_send_appropriate 
(j->tls_session, r);
+                             }
+                           while (ret == GNUTLS_E_AGAIN || ret == 
GNUTLS_E_INTERRUPTED);
+
+                            GERR (r);
+                           j->http_state = HTTP_STATE_CLOSING;
+                          }
                       }
                     else
                       { 


hooks/post-receive
-- 
GNU gnutls