Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2011-07-04 11:48:41 -04:00
commit c3d362858c

View File

@ -428,6 +428,11 @@ evbuffer_run_callbacks(struct evbuffer *buffer, int running_deferred)
static inline void
evbuffer_invoke_callbacks(struct evbuffer *buffer)
{
if (TAILQ_EMPTY(&buffer->callbacks)) {
buffer->n_add_for_cb = buffer->n_del_for_cb = 0;
return;
}
if (buffer->deferred_cbs) {
if (buffer->deferred.queued)
return;