[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-160-gde20928

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

The branch, master has been updated
       via  de209286f0fb07ffbc4429d4896f852dd6d7259f (commit)
      from  67a5f42026dc85b837e83aeb9dec57e0a04a2df1 (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 de209286f0fb07ffbc4429d4896f852dd6d7259f
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Mar 15 21:29:29 2010 +0100

    better documentation for %INITIAL_SAFE_RENEGOTIATION

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

Summary of changes:
 doc/manpages/gnutls-cli.1 |    3 ---
 lib/gnutls_priority.c     |    3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/manpages/gnutls-cli.1 b/doc/manpages/gnutls-cli.1
index 3cc95ac..6ca8da4 100644
--- a/doc/manpages/gnutls-cli.1
+++ b/doc/manpages/gnutls-cli.1
@@ -81,9 +81,6 @@ hello. This is to avoid buggy servers from terminating 
connection.
 "%UNSAFE_RENEGOTIATION" will enable unsafe renegotiation (default
 behaviour at 2.8.5 and earlier releases)
 .IP
-"%INITIAL_SAFE_RENEGOTIATION" will force initial safe negotiation even if
-renegotiation wasn't requested (this is enabled by default).
-.IP
 To avoid collisions in order to specify a compression algorithm in
 this string you have to prefix it with "COMP-", protocol versions
 with "VERS-" and certificate types with "CTYPE-". All other
diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c
index 8524dbe..869c525 100644
--- a/lib/gnutls_priority.c
+++ b/lib/gnutls_priority.c
@@ -524,7 +524,8 @@ gnutls_priority_set (gnutls_session_t session, 
gnutls_priority_t priority)
  *
  * "%UNSAFE_RENEGOTIATION" will allow unsafe renegotiation.
  *
- * "%INITIAL_SAFE_RENEGOTIATION" will force initial safe negotiation even if 
renegotiation wasn't requested.
+ * "%INITIAL_SAFE_RENEGOTIATION" will force initial safe negotiation even if 
+ * renegotiation wasn't requested. Only valid for server side.
  *
  * "%DISABLE_SAFE_RENEGOTIATION" will disable safe renegotiation completely. 
Do not use
  * unless you know what you are doing. Testing purposes only.


hooks/post-receive
-- 
GNU gnutls