prosody
ee445e658848
net/http.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

net/http.lua @ 4258:ee445e658848

mod_legacyauth: Disallow on unencrypted connections by default, heed allow_unencrypted_plain_auth config option (thanks Maranda/Zash)
author Matthew Wild <mwild1@gmail.com>
date Wed, 20 Apr 2011 18:19:28 +0100
parent 3569:f30da46e0add
child 4338:5d5d6c6d121a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1522
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1331
diff changeset
1 -- Prosody IM
2923
b7049746bd29 Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents: 2810
diff changeset
2 -- Copyright (C) 2008-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents: 2810
diff changeset
3 -- Copyright (C) 2008-2010 Waqas Hussain
1522
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1331
diff changeset
4 --
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1331
diff changeset
5 -- This project is MIT/X11 licensed. Please see the
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1331
diff changeset
6 -- COPYING file in the source package for more information.
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1331
diff changeset
7 --
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1331
diff changeset
8
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
9
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
10 local socket = require "socket"
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
11 local mime = require "mime"
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
12 local url = require "socket.url"
3569
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
13 local httpstream_new = require "util.httpstream".new;
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
14
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
15 local server = require "net.server"
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
16
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
17 local connlisteners_get = require "net.connlisteners".get;
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
18 local listener = connlisteners_get("httpclient") or error("No httpclient listener!");
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
19
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
20 local t_insert, t_concat = table.insert, table.concat;
3470
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
21 local pairs, ipairs = pairs, ipairs;
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
22 local tonumber, tostring, xpcall, select, debug_traceback, char, format =
3540
bc139431830b Monster whitespace commit (beware the whitespace monster).
Waqas Hussain <waqas20@gmail.com>
parents: 3470
diff changeset
23 tonumber, tostring, xpcall, select, debug.traceback, string.char, string.format;
678
1859edec2237 Protected call for HTTP request callbacks, to catch errors
Matthew Wild <mwild1@gmail.com>
parents: 677
diff changeset
24
1859edec2237 Protected call for HTTP request callbacks, to catch errors
Matthew Wild <mwild1@gmail.com>
parents: 677
diff changeset
25 local log = require "util.logger".init("http");
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
26
1331
4443309b5528 net.http: (Re-)add url[en|de]code functions
Matthew Wild <mwild1@gmail.com>
parents: 1112
diff changeset
27 module "http"
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
28
1331
4443309b5528 net.http: (Re-)add url[en|de]code functions
Matthew Wild <mwild1@gmail.com>
parents: 1112
diff changeset
29 function urlencode(s) return s and (s:gsub("%W", function (c) return format("%%%02x", c:byte()); end)); end
4443309b5528 net.http: (Re-)add url[en|de]code functions
Matthew Wild <mwild1@gmail.com>
parents: 1112
diff changeset
30 function urldecode(s) return s and (s:gsub("%%(%x%x)", function (c) return char(tonumber(c,16)); end)); end
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
31
3470
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
32 local function _formencodepart(s)
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
33 return s and (s:gsub("%W", function (c)
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
34 if c ~= " " then
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
35 return format("%%%02x", c:byte());
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
36 else
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
37 return "+";
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
38 end
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
39 end));
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
40 end
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
41 function formencode(form)
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
42 local result = {};
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
43 for _, field in ipairs(form) do
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
44 t_insert(result, _formencodepart(field.name).."=".._formencodepart(field.value));
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
45 end
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
46 return t_concat(result, "&");
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
47 end
0e59b5cdd57b net.http: Add http.formencode() for www-form-urlencoded from an array of fields (thanks dersd)
Matthew Wild <mwild1@gmail.com>
parents: 2925
diff changeset
48
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
49 local function request_reader(request, data, startpos)
3569
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
50 if not request.parser then
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
51 local function success_cb(r)
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
52 if request.callback then
3569
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
53 for k,v in pairs(r) do request[k] = v; end
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
54 request.callback(r.body, r.code, request);
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
55 request.callback = nil;
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
56 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
57 destroy_request(request);
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
58 end
3569
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
59 local function error_cb(r)
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
60 if request.callback then
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
61 request.callback(r or "connection-closed", 0, request);
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
62 request.callback = nil;
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
63 end
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
64 destroy_request(request);
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
65 end
3569
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
66 local function options_cb()
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
67 return request;
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
68 end
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
69 request.parser = httpstream_new(success_cb, error_cb, "client", options_cb);
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
70 end
3569
f30da46e0add net.http: Removed old HTTP parser, and updated to use util.httpstream.
Waqas Hussain <waqas20@gmail.com>
parents: 3540
diff changeset
71 request.parser:feed(data);
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
72 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
73
678
1859edec2237 Protected call for HTTP request callbacks, to catch errors
Matthew Wild <mwild1@gmail.com>
parents: 677
diff changeset
74 local function handleerr(err) log("error", "Traceback[http]: %s: %s", tostring(err), debug_traceback()); end
646
90da4c9b34b5 HTTP requests now have status code as a number instead of a string. Switched parameters on both http.request() and the callback to better match LuaSocket's http module
Matthew Wild <mwild1@gmail.com>
parents: 633
diff changeset
75 function request(u, ex, callback)
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
76 local req = url.parse(u);
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
77
903
6737d005a84a net.http: Don't throw error on invalid URLs. Fixes #56.
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
78 if not (req and req.host) then
923
c63f9bc45a85 Fixed: net/http.lua: HTTP request callback wasn't being called on some errors
Waqas Hussain <waqas20@gmail.com>
parents: 903
diff changeset
79 callback(nil, 0, req);
903
6737d005a84a net.http: Don't throw error on invalid URLs. Fixes #56.
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
80 return nil, "invalid-url";
6737d005a84a net.http: Don't throw error on invalid URLs. Fixes #56.
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
81 end
6737d005a84a net.http: Don't throw error on invalid URLs. Fixes #56.
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
82
6737d005a84a net.http: Don't throw error on invalid URLs. Fixes #56.
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
83 if not req.path then
6737d005a84a net.http: Don't throw error on invalid URLs. Fixes #56.
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
84 req.path = "/";
6737d005a84a net.http: Don't throw error on invalid URLs. Fixes #56.
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
85 end
6737d005a84a net.http: Don't throw error on invalid URLs. Fixes #56.
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
86
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
87 local custom_headers, body;
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
88 local default_headers = { ["Host"] = req.host, ["User-Agent"] = "Prosody XMPP Server" }
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
89
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
90
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
91 if req.userinfo then
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
92 default_headers["Authorization"] = "Basic "..mime.b64(req.userinfo);
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
93 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
94
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
95 if ex then
738
cf70342985df net.http: custom_headers -> headers
Matthew Wild <mwild1@gmail.com>
parents: 720
diff changeset
96 custom_headers = ex.headers;
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
97 req.onlystatus = ex.onlystatus;
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
98 body = ex.body;
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
99 if body then
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
100 req.method = "POST ";
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
101 default_headers["Content-Length"] = tostring(#body);
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
102 default_headers["Content-Type"] = "application/x-www-form-urlencoded";
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
103 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
104 if ex.method then req.method = ex.method; end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
105 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
106
739
1def06cd9311 Port to new server.lua, quite some changes, but I believe everything to be working
Matthew Wild <mwild1@gmail.com>
parents: 738
diff changeset
107 req.handler, req.conn = server.wrapclient(socket.tcp(), req.host, req.port or 80, listener, "*a");
2130
828e161cdfc7 net.httpserver, net.http: Update for new net.server API (untested)
Matthew Wild <mwild1@gmail.com>
parents: 1522
diff changeset
108 req.write = function (...) return req.handler:write(...); end
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
109 req.conn:settimeout(0);
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
110 local ok, err = req.conn:connect(req.host, req.port or 80);
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
111 if not ok and err ~= "timeout" then
903
6737d005a84a net.http: Don't throw error on invalid URLs. Fixes #56.
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
112 callback(nil, 0, req);
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
113 return nil, err;
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
114 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
115
719
b1eb112478b8 net.http: Fix to send query part of URL to server
Matthew Wild <mwild1@gmail.com>
parents: 714
diff changeset
116 local request_line = { req.method or "GET", " ", req.path, " HTTP/1.1\r\n" };
b1eb112478b8 net.http: Fix to send query part of URL to server
Matthew Wild <mwild1@gmail.com>
parents: 714
diff changeset
117
b1eb112478b8 net.http: Fix to send query part of URL to server
Matthew Wild <mwild1@gmail.com>
parents: 714
diff changeset
118 if req.query then
b1eb112478b8 net.http: Fix to send query part of URL to server
Matthew Wild <mwild1@gmail.com>
parents: 714
diff changeset
119 t_insert(request_line, 4, "?");
b1eb112478b8 net.http: Fix to send query part of URL to server
Matthew Wild <mwild1@gmail.com>
parents: 714
diff changeset
120 t_insert(request_line, 5, req.query);
b1eb112478b8 net.http: Fix to send query part of URL to server
Matthew Wild <mwild1@gmail.com>
parents: 714
diff changeset
121 end
b1eb112478b8 net.http: Fix to send query part of URL to server
Matthew Wild <mwild1@gmail.com>
parents: 714
diff changeset
122
b1eb112478b8 net.http: Fix to send query part of URL to server
Matthew Wild <mwild1@gmail.com>
parents: 714
diff changeset
123 req.write(t_concat(request_line));
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
124 local t = { [2] = ": ", [4] = "\r\n" };
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
125 if custom_headers then
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
126 for k, v in pairs(custom_headers) do
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
127 t[1], t[3] = k, v;
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
128 req.write(t_concat(t));
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
129 default_headers[k] = nil;
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
130 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
131 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
132
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
133 for k, v in pairs(default_headers) do
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
134 t[1], t[3] = k, v;
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
135 req.write(t_concat(t));
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
136 default_headers[k] = nil;
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
137 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
138 req.write("\r\n");
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
139
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
140 if body then
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
141 req.write(body);
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
142 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
143
720
8f22e9fb2291 net.http: Don't log content from server
Matthew Wild <mwild1@gmail.com>
parents: 719
diff changeset
144 req.callback = function (content, code, request) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request) end, handleerr)); end
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
145 req.reader = request_reader;
678
1859edec2237 Protected call for HTTP request callbacks, to catch errors
Matthew Wild <mwild1@gmail.com>
parents: 677
diff changeset
146 req.state = "status";
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
147
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
148 listener.register_request(req.handler, req);
619
6d720aba51cb Oops, don't call server.loop() because we'll be running inside the server
Matthew Wild <mwild1@gmail.com>
parents: 618
diff changeset
149
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
150 return req;
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
151 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
152
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
153 function destroy_request(request)
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
154 if request.conn then
2673
61ae351c19b5 net.http: destroy_request(): Remove update for new server API, pass request.handler instead of request.conn to ondisconnect
Matthew Wild <mwild1@gmail.com>
parents: 2672
diff changeset
155 request.conn = nil;
61ae351c19b5 net.http: destroy_request(): Remove update for new server API, pass request.handler instead of request.conn to ondisconnect
Matthew Wild <mwild1@gmail.com>
parents: 2672
diff changeset
156 request.handler:close()
61ae351c19b5 net.http: destroy_request(): Remove update for new server API, pass request.handler instead of request.conn to ondisconnect
Matthew Wild <mwild1@gmail.com>
parents: 2672
diff changeset
157 listener.ondisconnect(request.handler, "closed");
616
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
158 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
159 end
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
160
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
161 _M.urlencode = urlencode;
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
162
69bc5782b25e Non-blocking HTTP requests (adding net.http)
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
163 return _M;