Skip to content
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.

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

Concatenate POST body data instead of using Array.prototype.join. #2

Merged
merged 1 commit into from
Aug 21, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion bin/mk-server
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env node

// Generated by CoffeeScript 1.4.0
// Generated by CoffeeScript 1.6.3
(function() {
var cs, filename, fs, full_filename, js, text, _ref, _ref1;

Expand Down
54 changes: 36 additions & 18 deletions lib/router.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions src/router.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,15 @@ Router = (options = {}) ->

_make_request_wrapper = (cb) ->
wrapper = (req, res) ->
body = []
body = ''
contentType = 'application/x-www-form-urlencoded'
if req.headers['content-type']
contentType = req.headers['content-type']
mp_index = contentType.indexOf('multipart/form-data')
req.setEncoding('binary') if (mp_index isnt -1)
req.on 'data', (chunk) ->
body.push chunk
body += chunk
req.on 'end', () ->
body = body.join('')
if contentType is 'text/plain'
body = body.replace('\r\n', '')
req.post = if mp_index is -1 then _bodyparser(body) else _multipartparser(body, contentType)
Expand Down
2 changes: 1 addition & 1 deletion test/common/public/scgi/hellonode/hello.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/common/scgi.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/common/test_router.coffee
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env coffee


Router = require '../../src/router'
Router = require '../../lib/router'

http = require 'http'

Expand Down
38 changes: 28 additions & 10 deletions test/common/test_router.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
#!/usr/bin/env node

// Generated by CoffeeScript 1.4.0
// Generated by CoffeeScript 1.6.3
(function() {
var Router, argv, http, router, server;

try {
Router = require('../../src/router');
} catch (e) {
Router = require('../../lib/router');
}
Router = require('../../lib/router');

http = require('http');

Expand All @@ -33,7 +29,7 @@
});

router.post("/users", function(req, res) {
var key, val, _ref, _ref1, _ref2;
var e, key, val, _ref, _ref1, _ref2;
router.log("\n\nBody of request is: " + (req.body.toString()) + "\nRequest content type is: " + req.headers['content-type']);
router.log("\nRequest Headers");
_ref = req.headers;
Expand All @@ -49,7 +45,8 @@
val = _ref1[key];
router.log("" + key + ": " + val);
}
} catch (e) {
} catch (_error) {
e = _error;
res.write("Looks like you did something dumb: " + (e.toString()) + "\n");
}
_ref2 = req.body;
Expand All @@ -72,7 +69,7 @@
});

router.post("/showrequest", function(req, res) {
var key, stri, val;
var e, key, stri, val;
res.writeHead(200, {
'Content-type': 'text/plain'
});
Expand All @@ -87,7 +84,8 @@
router.log(stri);
}
res.write(stri);
} catch (e) {
} catch (_error) {
e = _error;
res.write("NASTY ERROR: " + e.message + "\n");
}
}
Expand All @@ -101,6 +99,26 @@
return res.end("<title>Request vars discovery</title>\n<form action=\"/showrequest\" method=\"post\" enctype=\"application/x-www-form-urlencoded\">\n <p>Name:<input type=\"text\" required=\"required\" size=\"40\" name=\"name\" /></p>\n <p>Age:&nbsp;&nbsp;&nbsp;<input type=\"number\" required=\"required\" size=\"4\" name=\"age\" /></p>\n <p><input type=\"submit\" value=\"Submit to /showrequest\" /><input type=\"reset\" value=\"Reset\" /></p>\n</form>");
});

router.get("/google", function(req, res) {
return router.proxy_pass("http://www.google.com.ar", res);
});

router.get("/testing", function(req, res) {
return router.proxy_pass("http://testing.savos.ods.org/", res);
});

router.get("/testing/:route", function(req, res) {
return router.proxy_pass("http://testing.savos.ods.org/" + req.params.route + "/", res);
});

router.get("/login", function(req, res) {
res.setHeader("WWW-Authenticate", 'Basic realm="node-simple-router"');
res.writeHead(200, {
'Content-type': 'text/html'
});
return res.end("Login here.");
});

/*
End of example routes
*/
Expand Down
7 changes: 4 additions & 3 deletions test/uploader/server.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env node

// Generated by CoffeeScript 1.4.0
// Generated by CoffeeScript 1.6.3
(function() {
var Router, argv, fs, http, router, server;
var Router, argv, e, fs, http, router, server;

fs = require('fs');

Expand All @@ -24,7 +24,8 @@

try {
Router = require('../../src/router');
} catch (e) {
} catch (_error) {
e = _error;
Router = require('../../lib/router');
}

Expand Down