diff options
author | Nikos Mavrogiannopoulos <nmav@crystal.(none)> | 2009-02-22 09:29:39 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@crystal.(none)> | 2009-02-22 09:29:39 +0200 |
commit | 61580e915f64364addecee43fbf31c82fa79d052 (patch) | |
tree | 74295bbe843c29ab29b065005c633397d8233f8f | |
parent | f67b105792e527c29b5dacf662b862b3bfa45840 (diff) | |
download | gnutls-61580e915f64364addecee43fbf31c82fa79d052.tar.gz |
Applied patch by Martin von Gagern:
The attached patch fixes gnutls_priority_init(3), but in a very hackish way, treating
a percent sign as indicating a constant only if it is not immediately
preceded by a double quote.
-rwxr-xr-x | doc/scripts/gdoc | 2 | ||||
-rw-r--r-- | lib/gnutls_priority.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/scripts/gdoc b/doc/scripts/gdoc index 09b154a4c5..d142fad70b 100755 --- a/doc/scripts/gdoc +++ b/doc/scripts/gdoc @@ -123,7 +123,7 @@ use POSIX qw(strftime); # match expressions used to find embedded type information -$type_constant = "\\\%(\\w+)"; +$type_constant = "(?<!\")\\\%(\\w+)"; $type_func = "(\\w+\\(\\))"; $type_param = "\\\@(\\w+)"; $type_struct = "\\\#(\\w+)"; diff --git a/lib/gnutls_priority.c b/lib/gnutls_priority.c index 0f6be1e42a..dcf5e9c363 100644 --- a/lib/gnutls_priority.c +++ b/lib/gnutls_priority.c @@ -469,10 +469,10 @@ gnutls_priority_set (gnutls_session_t session, gnutls_priority_t priority) * compression methods. * * Special keywords: - * '!' or '-' appended with an algorithm will remove this algorithm. - * '+' appended with an algorithm will add this algorithm. - * '%COMPAT' will enable compatibility features for a server. - * '%SSL3_RECORD_VERSION' will use SSL3.0 record version in client hello + * "!" or "-" appended with an algorithm will remove this algorithm. + * "+" appended with an algorithm will add this algorithm. + * "%COMPAT" will enable compatibility features for a server. + * "%SSL3_RECORD_VERSION" will use SSL3.0 record version in client hello. * * To avoid collisions in order to specify a compression algorithm in * this string you have to prefix it with "COMP-", protocol versions |