Skip to content

Implement replacing the HTTP backend #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implement replacing the HTTP backend #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02f8c29
Implement replacing the HTTP backend
THE-FYP Jun 2, 2019
da97d1e
Move loading of socket modules and fix 'check_timeout'
THE-FYP Jun 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/requests.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
-- Lua Requests library for http ease

local http_socket = require('socket.http')
local https_socket = require('ssl.https')
local url_parser = require('socket.url')
local ltn12 = require('ltn12')
local json = require('cjson.safe')
Expand Down Expand Up @@ -75,6 +73,9 @@ function requests.request(method, url, args)
request.url = url
end

requests.http_socket = requests.http_socket or require('socket.http')
requests.https_socket = requests.https_socket or require('ssl.https')

request.method = method
_requests.parse_args(request)

Expand Down Expand Up @@ -102,7 +103,7 @@ function _requests.make_request(request)

local response = {}
local ok
local socket = string.find(full_request.url, '^https:') and not request.proxy and https_socket or http_socket
local socket = string.find(full_request.url, '^https:') and not request.proxy and requests.http_socket or requests.https_socket

ok, response.status_code, response.headers, response.status = socket.request(full_request)

Expand Down Expand Up @@ -186,8 +187,8 @@ end

--Set the timeout
function _requests.check_timeout(timeout)
http_socket.TIMEOUT = timeout or 5
https_socket.TIMEOUT = timeout or 5
requests.http_socket.TIMEOUT = timeout or 5
requests.https_socket.TIMEOUT = timeout or 5
end

--Checks is allow_redirects parameter is set correctly
Expand Down