mirror of
https://github.com/bjc/prosody.git
synced 2025-04-06 06:37:37 +03:00
net: Prefix module imports with prosody namespace
This commit is contained in:
parent
ffd1561c5e
commit
869581384d
20 changed files with 108 additions and 108 deletions
|
@ -2,8 +2,8 @@
|
|||
-- and a function to return a util.error object given callback 'code' and 'body'
|
||||
-- parameters.
|
||||
|
||||
local codes = require "net.http.codes";
|
||||
local util_error = require "util.error";
|
||||
local codes = require "prosody.net.http.codes";
|
||||
local util_error = require "prosody.util.error";
|
||||
|
||||
local error_templates = {
|
||||
-- This code is used by us to report a client-side or connection error.
|
||||
|
|
|
@ -6,10 +6,10 @@
|
|||
-- COPYING file in the source package for more information.
|
||||
--
|
||||
|
||||
local server = require"net.http.server";
|
||||
local server = require"prosody.net.http.server";
|
||||
local lfs = require "lfs";
|
||||
local new_cache = require "util.cache".new;
|
||||
local log = require "util.logger".init("net.http.files");
|
||||
local new_cache = require "prosody.util.cache".new;
|
||||
local log = require "prosody.util.logger".init("net.http.files");
|
||||
|
||||
local os_date = os.date;
|
||||
local open = io.open;
|
||||
|
@ -23,7 +23,7 @@ if package.config:sub(1,1) == "\\" then
|
|||
forbidden_chars_pattern = "[/%z\001-\031\127\"*:<>?|]"
|
||||
end
|
||||
|
||||
local urldecode = require "util.http".urldecode;
|
||||
local urldecode = require "prosody.util.http".urldecode;
|
||||
local function sanitize_path(path) --> util.paths or util.http?
|
||||
if not path then return end
|
||||
local out = {};
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
local tonumber = tonumber;
|
||||
local assert = assert;
|
||||
local url_parse = require "socket.url".parse;
|
||||
local urldecode = require "util.http".urldecode;
|
||||
local dbuffer = require "util.dbuffer";
|
||||
local urldecode = require "prosody.util.http".urldecode;
|
||||
local dbuffer = require "prosody.util.dbuffer";
|
||||
|
||||
local function preprocess_path(path)
|
||||
path = urldecode((path:gsub("//+", "/")));
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
|
||||
local t_insert, t_concat = table.insert, table.concat;
|
||||
local parser_new = require "net.http.parser".new;
|
||||
local events = require "util.events".new();
|
||||
local addserver = require "net.server".addserver;
|
||||
local log = require "util.logger".init("http.server");
|
||||
local parser_new = require "prosody.net.http.parser".new;
|
||||
local events = require "prosody.util.events".new();
|
||||
local addserver = require "prosody.net.server".addserver;
|
||||
local log = require "prosody.util.logger".init("http.server");
|
||||
local os_date = os.date;
|
||||
local pairs = pairs;
|
||||
local s_upper = string.upper;
|
||||
local setmetatable = setmetatable;
|
||||
local cache = require "util.cache";
|
||||
local codes = require "net.http.codes";
|
||||
local promise = require "util.promise";
|
||||
local errors = require "util.error";
|
||||
local cache = require "prosody.util.cache";
|
||||
local codes = require "prosody.net.http.codes";
|
||||
local promise = require "prosody.util.promise";
|
||||
local errors = require "prosody.util.error";
|
||||
local blocksize = 2^16;
|
||||
local async = require "util.async";
|
||||
local async = require "prosody.util.async";
|
||||
|
||||
local _M = {};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue