]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge changes from topic 'ASTERISK-24712' into 13
authorJoshua Colp <jcolp@digium.com>
Tue, 28 Mar 2017 23:04:13 +0000 (18:04 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 28 Mar 2017 23:04:13 +0000 (18:04 -0500)
* changes:
  res_xmpp: Use incremental backoff when a read error occurs
  res_xmpp: Try to provide useful errors messages from OpenSSL
  res_xmpp: Correctly check return value of SSL_connect


Trivial merge