Mercurial > prosody-hg
comparison plugins/mod_http.lua @ 5182:9b93b0698d7e
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 15 Nov 2012 14:07:53 -0500 |
| parents | 4ef69555a879 |
| children | 8461e8ed7c09 |
comparison
equal
deleted
inserted
replaced
| 5178:fa6d61f2fe20 | 5182:9b93b0698d7e |
|---|---|
| 65 end | 65 end |
| 66 end | 66 end |
| 67 end | 67 end |
| 68 | 68 |
| 69 function module.add_host(module) | 69 function module.add_host(module) |
| 70 local host = module.host; | 70 local host = module:get_option_string("http_host", module.host); |
| 71 local apps = {}; | 71 local apps = {}; |
| 72 module.environment.apps = apps; | 72 module.environment.apps = apps; |
| 73 local function http_app_added(event) | 73 local function http_app_added(event) |
| 74 local app_name = event.item.name; | 74 local app_name = event.item.name; |
| 75 local default_app_path = event.item.default_path or "/"..app_name; | 75 local default_app_path = event.item.default_path or "/"..app_name; |
