[SCM] GNU gnutls branch, master, updated. gnutls_2_9_10-345-gaa5d64e

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

The branch, master has been updated
       via  aa5d64e9992c683bf50b92a9088adaf545a2e5a0 (commit)
       via  6645b7c1b8997c49f19c3a31a1983fc0346772b5 (commit)
       via  1afb6b5b16d59424550573342c16f87af5ba8094 (commit)
      from  93b9289429954195472d9a885492d67d08d0cccd (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 aa5d64e9992c683bf50b92a9088adaf545a2e5a0
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Aug 20 19:05:53 2010 +0200

    By default lowat is set to zero.

commit 6645b7c1b8997c49f19c3a31a1983fc0346772b5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Aug 19 15:55:16 2010 +0200

    Revert "When scanning for terminator character for PKCS #11 URLs ignore 
escaped \;."
    
    This reverts commit 583fad076506421c9007a3349784496e2927dcd1.

commit 1afb6b5b16d59424550573342c16f87af5ba8094
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Aug 18 19:40:02 2010 +0200

    Added Sjoerd.

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

Summary of changes:
 NEWS             |    4 ++++
 THANKS           |    2 +-
 lib/gnutls_int.h |    2 +-
 lib/pkcs11.c     |    4 +---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 415664b..3009b73 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ See the end for copying conditions.
 
 * Version 2.11.1 (unreleased)
 
+** libgnutls: by default lowat level has been set to zero to avoid unnecessary
+system calls. Applications that depended on it being 1 should explicitly call
+gnutls_transport_set_lowat().
+
 ** libgnutls: Nettle is the default crypto back end. Use --with-libgcrypt
 to use the libgcrypt back end.
 
diff --git a/THANKS b/THANKS
index 196a8fa..5351a52 100644
--- a/THANKS
+++ b/THANKS
@@ -107,7 +107,7 @@ Steve Dispensa                  <address@hidden>
 Vitaly Mayatskikh               <address@hidden>
 Claudio Saavedra                <address@hidden>
 Vincent Torri                   <address@hidden>
-
+Sjoerd Simons                   <address@hidden>
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 1475951..6d3ef8a 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -103,7 +103,7 @@ typedef struct
 #define INITIAL_RECV_BUFFER_SIZE 256
 
 /* the default for TCP */
-#define DEFAULT_LOWAT 1
+#define DEFAULT_LOWAT 0
 
 /* expire time for resuming sessions */
 #define DEFAULT_EXPIRE_TIME 3600
diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 2b25d04..365303c 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -473,9 +473,7 @@ static int unescape_string(char *output, const char *input, 
size_t * size,
        _gnutls_buffer_init(&str);
 
        /* find terminator */
-       do {
-               p = strchr(input, terminator);
-        } while(p != NULL && *(p-1) == '\\');
+       p = strchr(input, terminator);
        if (p != NULL)
                len = p - input;
        else


hooks/post-receive
-- 
GNU gnutls