Skip to content

Commit 1222ae9

Browse files
authored
Merge pull request #15 from osokin/tab2space
Convert tabs to spaces
2 parents 9a1c369 + 41ceed5 commit 1222ae9

File tree

6 files changed

+33
-33
lines changed

6 files changed

+33
-33
lines changed

‎njs/http/authorization/auth_request.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@ function authorize(r) {
22
var signature = r.headersIn.Signature;
33

44
if (!signature) {
5-
r.error("No signature");
5+
r.error("No signature");
66
r.return(401);
77
return;
88
}
99

10-
if (r.method != 'GET') {
11-
r.error(`Unsupported method: ${r.method}`);
10+
if (r.method != 'GET') {
11+
r.error(`Unsupported method: ${r.method}`);
1212
r.return(401);
1313
return;
14-
}
14+
}
1515

16-
var args = r.variables.args;
16+
var args = r.variables.args;
1717

1818
var h = require('crypto').createHmac('sha1', process.env.SECRET_KEY);
1919

20-
h.update(r.uri).update(args ? args : "");
20+
h.update(r.uri).update(args ? args : "");
2121

2222
var req_sig = h.digest("base64");
2323

2424
if (req_sig != signature) {
2525
r.error(`Invalid signature: ${req_sig}\n`);
26-
r.return(401);
26+
r.return(401);
2727
return;
2828
}
2929

30-
r.return(200);
30+
r.return(200);
3131
}
3232

3333
export default {authorize}

‎njs/http/authorization/request_body.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function authorize(r) {
88

99
var h = require('crypto').createHmac('sha1', process.env.SECRET_KEY);
1010

11-
h.update(r.uri);
11+
h.update(r.uri);
1212

1313
switch (r.method) {
1414
case 'GET':

‎njs/http/complex_redirects.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function commit_db(map) {
2424

2525
try {
2626
fs.writeFileSync(DB, JSON.stringify(map));
27-
} catch (e) {
27+
} catch (e) {
2828
ret = 500;
2929
}
3030

‎njs/http/join_subrequests.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
async function join(r) {
2-
join_subrequests(r, ['/foo', '/bar']);
2+
join_subrequests(r, ['/foo', '/bar']);
33
}
44

55
async function join_subrequests(r, subs) {
66
let results = await Promise.all(subs.map(uri => r.subrequest(uri)));
77

8-
let response = results.map(reply => ({
8+
let response = results.map(reply => ({
99
uri: reply.uri,
1010
code: reply.status,
1111
body: reply.responseBody,
12-
}));
12+
}));
1313

1414
r.return(200, JSON.stringify(response));
1515
}

‎njs/misc/file_io.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@ var fs = require('fs');
22
var STORAGE = "/tmp/njs_storage"
33

44
function push(r) {
5-
fs.appendFileSync(STORAGE, r.requestBody);
6-
r.return(200);
5+
fs.appendFileSync(STORAGE, r.requestBody);
6+
r.return(200);
77
}
88

99
function flush(r) {
10-
fs.writeFileSync(STORAGE, "");
11-
r.return(200);
10+
fs.writeFileSync(STORAGE, "");
11+
r.return(200);
1212
}
1313

1414
function read(r) {
15-
var data = "";
16-
try {
17-
data = fs.readFileSync(STORAGE);
18-
} catch (e) {
19-
}
15+
var data = "";
16+
try {
17+
data = fs.readFileSync(STORAGE);
18+
} catch (e) {
19+
}
2020

21-
r.return(200, data);
21+
r.return(200, data);
2222
}
2323

2424
export default {push, flush, read};

‎njs/stream/detect_http.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
var is_http = 0;
22

33
function detect_http(s) {
4-
s.on('upload', function (data, flags) {
5-
var n = data.indexOf('\r\n');
6-
if (n != -1 && data.substr(0, n - 1).endsWith(" HTTP/1.")) {
7-
is_http = 1;
8-
}
4+
s.on('upload', function (data, flags) {
5+
var n = data.indexOf('\r\n');
6+
if (n != -1 && data.substr(0, n - 1).endsWith(" HTTP/1.")) {
7+
is_http = 1;
8+
}
99

10-
if (data.length || flags.last) {
11-
s.done();
12-
}
13-
});
10+
if (data.length || flags.last) {
11+
s.done();
12+
}
13+
});
1414
}
1515

1616
function upstream_type(s) {
17-
return is_http ? "httpback" : "tcpback";
17+
return is_http ? "httpback" : "tcpback";
1818
}
1919

2020
export default {detect_http, upstream_type}

0 commit comments

Comments
 (0)