Mercurial > prosody-modules
comparison mod_welcome_page/mod_welcome_page.lua @ 4976:75b6e5df65f9
various: Improve error reporting if missing file server module on 0.12
If there is some error loading net.http.files then it would be swallowed
by the pcall and then it would proceed to trying mod_http_files, which
might cause unexpected behavior on 0.12
Ref #1765
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 18 Jul 2022 22:47:54 +0200 |
| parents | 733e5513f691 |
| children |
comparison
equal
deleted
inserted
replaced
| 4975:733e5513f691 | 4976:75b6e5df65f9 |
|---|---|
| 60 | 60 |
| 61 return 303; | 61 return 303; |
| 62 end | 62 end |
| 63 | 63 |
| 64 local http_files | 64 local http_files |
| 65 if not pcall(function() | 65 if prosody.process_type == "prosody" then |
| 66 -- Prosody >= 0.12 | 66 -- Prosody >= 0.12 |
| 67 http_files = require "net.http.files"; | 67 http_files = require "net.http.files"; |
| 68 end) then | 68 else |
| 69 -- Prosody <= 0.11 | 69 -- Prosody <= 0.11 |
| 70 http_files = module:depends "http_files"; | 70 http_files = module:depends "http_files"; |
| 71 end | 71 end |
| 72 | 72 |
| 73 module:provides("http", { | 73 module:provides("http", { |