[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-339-g18cff36

[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=18cff36027f8fc0f71a31b3b12dc989e0674a744

The branch, master has been updated
       via  18cff36027f8fc0f71a31b3b12dc989e0674a744 (commit)
      from  2a539ad961affeffee32cb6148f421c8e66ab693 (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 18cff36027f8fc0f71a31b3b12dc989e0674a744
Author: Sjoerd Simons <address@hidden>
Date:   Wed Aug 11 13:49:46 2010 +0100

    Remember the amount of user data we're sending out
    
    Partially reverts 3ef62950845f551ebc629e50d5ddf75f71b84294. 
gnutls_record_send
    needs to return the amount of user-data we sent, so we need to keep this
    information somewhere to return it when we succeed in sending that data.
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

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

Summary of changes:
 lib/gnutls_int.h    |    5 +++++
 lib/gnutls_record.c |    5 ++++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index ef38fb7..1475951 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -548,6 +548,11 @@ typedef struct
                                         * for the gnutls_io_write_buffered()
                                         * function.
                                         */
+  size_t record_send_buffer_user_size; /* holds the
+                                        * size of the user specified data to
+                                        * send.
+                                        */
+
 
   /* 0 if no peeked data was kept, 1 otherwise.
    */
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
index a10a6fd..ba5564a 100644
--- a/lib/gnutls_record.c
+++ b/lib/gnutls_record.c
@@ -392,7 +392,7 @@ _gnutls_send_int (gnutls_session_t session, content_type_t 
type,
       else
        cipher_size = 0;
 
-      retval = session->internals.record_send_buffer.byte_length;
+      retval = session->internals.record_send_buffer_user_size;
     }
   else
     {
@@ -422,6 +422,7 @@ _gnutls_send_int (gnutls_session_t session, content_type_t 
type,
        }
 
       retval = data2send_size;
+      session->internals.record_send_buffer_user_size = data2send_size;
 
       /* increase sequence number
        */
@@ -460,6 +461,8 @@ _gnutls_send_int (gnutls_session_t session, content_type_t 
type,
       return ret;
     }
 
+  session->internals.record_send_buffer_user_size = 0;
+
   _gnutls_record_log ("REC[%p]: Sent Packet[%d] %s(%d) with length: %d\n",
                      session,
                      (int)


hooks/post-receive
-- 
GNU gnutls