Mercurial > prosody-hg
comparison plugins/mod_http.lua @ 6964:ed5440a6ef7f
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 03 Dec 2015 16:13:12 +0000 |
| parents | 61b6a4fc65f1 |
| children | 3e3a83be7e14 |
comparison
equal
deleted
inserted
replaced
| 6962:2bb6586eacdd | 6964:ed5440a6ef7f |
|---|---|
| 156 module:provides("net", { | 156 module:provides("net", { |
| 157 name = "https"; | 157 name = "https"; |
| 158 listener = server.listener; | 158 listener = server.listener; |
| 159 default_port = 5281; | 159 default_port = 5281; |
| 160 encryption = "ssl"; | 160 encryption = "ssl"; |
| 161 ssl_config = { | 161 ssl_config = default_ssl_config; |
| 162 verify = { | |
| 163 peer = false, | |
| 164 client_once = false, | |
| 165 "none", | |
| 166 } | |
| 167 }; | |
| 168 multiplex = { | 162 multiplex = { |
| 169 pattern = "^[A-Z]"; | 163 pattern = "^[A-Z]"; |
| 170 }; | 164 }; |
| 171 }); | 165 }); |
