summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins2 <jenkins2@gerrit.asterisk.org>2018-01-22 08:35:13 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2018-01-22 08:35:13 -0600
commit8f7b45efbfd1df92a2fbdd71fd5f39cd58593343 (patch)
treea77ac9c5343a551e1143ed88f60e0212af7436c7
parentd427bb84a2ca3e76ae96b29f560f0e7db7fac8f2 (diff)
parent5964061a21b9db528ee13a520e2d3d19e313ce40 (diff)
Merge "res_pjsip: Document tlsv1_1 and tlsv1_2 methods"
-rw-r--r--res/res_pjsip.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index 07fc980ef..ff262c9dc 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -1238,6 +1238,8 @@
<para>This option is equivalent to setting 'default'</para>
</enum>
<enum name="tlsv1" />
+ <enum name="tlsv1_1" />
+ <enum name="tlsv1_2" />
<enum name="sslv2" />
<enum name="sslv3" />
<enum name="sslv23" />