Mercurial > prosody-hg
comparison plugins/mod_http.lua @ 5431:19d537b5aacc
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 05 Apr 2013 10:05:18 +0100 |
| parents | 199e7989f713 |
| children | bd0ff8ae98a8 583e5c1365fe |
comparison
equal
deleted
inserted
replaced
| 5420:706053e3f9f5 | 5431:19d537b5aacc |
|---|---|
| 137 module:provides("net", { | 137 module:provides("net", { |
| 138 name = "https"; | 138 name = "https"; |
| 139 listener = server.listener; | 139 listener = server.listener; |
| 140 default_port = 5281; | 140 default_port = 5281; |
| 141 encryption = "ssl"; | 141 encryption = "ssl"; |
| 142 ssl_config = { verify = "none" }; | |
| 142 multiplex = { | 143 multiplex = { |
| 143 pattern = "^[A-Z]"; | 144 pattern = "^[A-Z]"; |
| 144 }; | 145 }; |
| 145 }); | 146 }); |
