diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-02-01 05:27:12 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-02-01 05:27:12 +0000 |
| commit | 91bac90310c41722d8a50ca9adf9006778f4d575 (patch) | |
| tree | 7ed62dbdc2aabaadc1af415420b08c28a95841fb /src | |
| parent | f013fb5e3177e20b65f1220a35e82f577a138a3b (diff) | |
| download | tor-91bac90310c41722d8a50ca9adf9006778f4d575.tar.gz tor-91bac90310c41722d8a50ca9adf9006778f4d575.zip | |
r17863@catbus: nickm | 2008-02-01 00:27:07 -0500
Bugfix from weasel: possible fix for 593: make connection_write_to_buf("") work when using zlib compression.
svn:r13347
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/connection.c | 2 | ||||
| -rw-r--r-- | src/or/directory.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index e64a623ff1..6564b2d504 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2250,7 +2250,7 @@ _connection_write_to_buf_impl(const char *string, size_t len, /* XXXX This function really needs to return -1 on failure. */ int r; size_t old_datalen; - if (!len) + if (!len && !(zlib<0)) return; /* if it's marked for close, only allow write if we mean to flush it */ if (conn->marked_for_close && !conn->hold_open_until_flushed) diff --git a/src/or/directory.c b/src/or/directory.c index c64f290c04..0a7c562fdd 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2385,7 +2385,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, estimated_len += body_len; SMARTLIST_FOREACH(items, const char *, item, { size_t ln = strlen(item); - if (compressed ) { + if (compressed) { estimated_len += ln/2; } else { body_len += ln; estimated_len += ln; |