]> granicus.if.org Git - libevent/commitdiff
Merge branch 'be-openssl-more-common-with-be-sock'
authorAzat Khuzhin <a3at.mail@gmail.com>
Fri, 6 Nov 2015 07:36:18 +0000 (10:36 +0300)
committerAzat Khuzhin <a3at.mail@gmail.com>
Fri, 6 Nov 2015 07:36:18 +0000 (10:36 +0300)
* be-openssl-more-common-with-be-sock:
  be_openssl: use bufferevent_enable() instead of bufferevent_add_event_()
  be_sock: drop be_sock_add() macro (useless and debug unfriendly)
  be: introduce bufferevent_generic_adj_existing_timeouts_()
  be_openssl: don't add events during bev creation (like be_sock)
  be: add_event: use evutil_timerisset()


Trivial merge