[SCM] GNU gnutls branch, gnutls_3_0_x, updated. gnutls_3_0_1-100-ged4cfd5

[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=ed4cfd5b34dea9525033e0f4e9b452340a6b5d01

The branch, gnutls_3_0_x has been updated
       via  ed4cfd5b34dea9525033e0f4e9b452340a6b5d01 (commit)
       via  89794af1790d8accdbda1cb422bb077c8a9cf692 (commit)
      from  bed41f730112d81107277eec2af7483a5defcf15 (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 ed4cfd5b34dea9525033e0f4e9b452340a6b5d01
Merge: bed41f7 89794af
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Sep 8 00:12:43 2011 +0200

    Merge branch 'master' into gnutls_3_0_x

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

Summary of changes:
 lib/gnutls_extensions.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c
index 99238a0..0c98f76 100644
--- a/lib/gnutls_extensions.c
+++ b/lib/gnutls_extensions.c
@@ -297,7 +297,7 @@ _gnutls_gen_extensions (gnutls_session_t session, 
gnutls_buffer_st * extdata,
   
   if ( size > 0)
     _gnutls_write_uint16(size, &extdata->data[pos]);
-  else if (size == 0) extdata->length = 0;
+  else if (size == 0) extdata->length -= 2; /* the length bytes */
 
   return size;
 }


hooks/post-receive
-- 
GNU gnutls