luci-base: fold luci.http.protocol into luci.http

[project/luci.git] / libs / luci-lib-httpclient / luasrc / httpclient.lua

diff --git a/libs/luci-lib-httpclient/luasrc/httpclient.lua b/libs/luci-lib-httpclient/luasrc/httpclient.lua
index af79695..04175b3 100644 (file)
--- a/libs/luci-lib-httpclient/luasrc/httpclient.lua
+++ b/libs/luci-lib-httpclient/luasrc/httpclient.lua
@@ -7,7 +7,7 @@ local nixio = require "nixio"
 local ltn12 = require "luci.ltn12"
 local util = require "luci.util"
 local table = require "table"
 local ltn12 = require "luci.ltn12"
 local util = require "luci.util"
 local table = require "table"

-local http = require "luci.http.protocol"
+local http = require "luci.http"

 local date = require "luci.http.protocol.date"
 
 local type, pairs, ipairs, tonumber = type, pairs, ipairs, tonumber
 local date = require "luci.http.protocol.date"
 
 local type, pairs, ipairs, tonumber = type, pairs, ipairs, tonumber


@@ -97,7 +97,11 @@ end
 function request_raw(uri, options)
        options = options or {}
        local pr, auth, host, port, path
 function request_raw(uri, options)
        options = options or {}
        local pr, auth, host, port, path

-       
+
+       if options.params then
+               uri = uri .. '?' .. http.urlencode_params(options.params)
+       end
+

        if uri:find("%[") then
                if uri:find("@") then
                        pr, auth, host, port, path = uri:match("(%w+)://(.+)@(%b[]):?([0-9]*)(.*)")
        if uri:find("%[") then
                if uri:find("@") then
                        pr, auth, host, port, path = uri:match("(%w+)://(.+)@(%b[]):?([0-9]*)(.*)")