[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-212-g01a8666

[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=01a8666e47640d69e66f31fe4307a11c6f20a378

The branch, master has been updated
       via  01a8666e47640d69e66f31fe4307a11c6f20a378 (commit)
      from  4faf7eeb97f7c8bc56cf67b3d927183a9c36e35f (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 01a8666e47640d69e66f31fe4307a11c6f20a378
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Feb 20 17:13:41 2011 +0100

    Epoch garbage collector is being run when handshake is being cleaned up.

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

Summary of changes:
 lib/gnutls_constate.c |    2 --
 lib/gnutls_mbuffers.c |    2 +-
 lib/gnutls_state.c    |    3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/gnutls_constate.c b/lib/gnutls_constate.c
index 9e25d32..33548e0 100644
--- a/lib/gnutls_constate.c
+++ b/lib/gnutls_constate.c
@@ -568,7 +568,6 @@ _gnutls_read_connection_state_init (gnutls_session_t 
session)
                           security_parameters.current_cipher_suite));
 
   session->security_parameters.epoch_read = epoch_next;
-  _gnutls_epoch_gc (session);
 
   return 0;
 }
@@ -619,7 +618,6 @@ _gnutls_write_connection_state_init (gnutls_session_t 
session)
     ("HSK[%p]: Initializing internal [write] cipher sessions\n", session);
 
   session->security_parameters.epoch_write = epoch_next;
-  _gnutls_epoch_gc (session);
 
   return 0;
 }
diff --git a/lib/gnutls_mbuffers.c b/lib/gnutls_mbuffers.c
index b964771..e58a3c3 100644
--- a/lib/gnutls_mbuffers.c
+++ b/lib/gnutls_mbuffers.c
@@ -213,7 +213,7 @@ _mbuffer_remove_bytes (mbuffer_head_st * buf, size_t bytes)
         }
     }
 
-  return 0;
+  return ret;
 }
 
 /* Allocate a buffer segment. The segment is not initially "owned" by
diff --git a/lib/gnutls_state.c b/lib/gnutls_state.c
index 2ba28af..6ba5dd1 100644
--- a/lib/gnutls_state.c
+++ b/lib/gnutls_state.c
@@ -271,7 +271,8 @@ _gnutls_handshake_internal_state_clear (gnutls_session_t 
session)
   _gnutls_free_datum (&session->internals.recv_buffer);
 
   deinit_internal_params (session);
-
+  
+  _gnutls_epoch_gc(session);
 }
 
 #define MIN_DH_BITS 727


hooks/post-receive
-- 
GNU gnutls