Merge branch 'cvs-head' of git://git.sip-router.org/ser_modules into ser_modules
authorAndrei Pelinescu-Onciul <andrei@iptel.org>
Thu, 23 Apr 2009 10:48:41 +0000 (12:48 +0200)
committerAndrei Pelinescu-Onciul <andrei@iptel.org>
Thu, 23 Apr 2009 10:48:41 +0000 (12:48 +0200)
commit35ce8821dd8065830ac14939fa562ab5e658247a
tree09325a42df67e511a68ecbfdec5339215f378852
parent410bd8e452d94ff6d27c0bb1e325957327ca15a3
parentd9b7afae582a4d497eddc6eacbbc1690d030cbb4
Merge branch 'cvs-head' of git://git.sip-router.org/ser_modules into ser_modules

* 'cvs-head' of git://git.sip-router.org/ser_modules:
  tls: don't start if tcp is in async mode
  tls: fixed missing TCP_BUF_SIZE