diff options
| author | Andrea Shepard <andrea@torproject.org> | 2014-01-22 02:50:40 -0800 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2014-09-30 23:14:23 -0700 |
| commit | 5a24ff0563ed916abffcde083019d23142197fdf (patch) | |
| tree | 895a3e386a3e9097afca2098fe9a4f0e19f158dc /src/or/channel.c | |
| parent | 9740a07b8c5b2608f0a937799f9e24ce0f468de7 (diff) | |
| download | tor-5a24ff0563ed916abffcde083019d23142197fdf.tar.gz tor-5a24ff0563ed916abffcde083019d23142197fdf.zip | |
What the hell was I on?
Diffstat (limited to 'src/or/channel.c')
| -rw-r--r-- | src/or/channel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/channel.c b/src/or/channel.c index 18c236fe66..94cca5caf8 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2263,7 +2263,8 @@ channel_flush_some_cells(channel_t *chan, ssize_t num_cells) /* Now process the queue if necessary */ - if (q_len_after > q_len_before && num_cells < flushed) { + if ((q_len_after > q_len_before) && + (unlimited || (flushed < num_cells))) { flushed += channel_flush_some_cells_from_outgoing_queue(chan, (unlimited ? -1 : num_cells - flushed)); } |