If a _guessed_ compression method fails, it is never PROTOCOL_WARN.

Rationale: When use a guessed compression method, we already gave a
PROTOCOL_WARN when our guess differed from the declared method,
AND we gave a PROTOCOL_WARN when the declared method failed.  It is
not a protocol problem that the guessed method failed too; it's just
a recovery attempt that failed.
This commit is contained in:
Nick Mathewson
2017-06-20 11:49:54 -04:00
parent 7b3161f008
commit d8cd68caf1
2 changed files with 5 additions and 1 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor bugfixes (logging, compression):
- When decompressing, do not warn if we fail to decompress using a
compression method that we merely guessed. Fixes part of
bug 22670; bugfix on 0.1.1.14-alpha.
+1 -1
View File
@@ -2271,7 +2271,7 @@ dir_client_decompress_response_body(char **bodyp, size_t *bodylenp,
if (!new_body && tor_compress_supports_method(guessed) &&
compression != guessed) {
tor_uncompress(&new_body, &new_len, body, body_len, guessed,
!allow_partial, LOG_PROTOCOL_WARN);
!allow_partial, LOG_INFO);
tried_both = 1;
}
/* If we're pretty sure that we have a compressed directory, and