@@ -46,8 +46,7 @@ var process = function(app, request, response) {
var env = {};
// copy HTTP headers over, converting where appropriate
- for (var e = request.getNames().iterator(); e.hasNext();)
- {
+ for (var e = request.getNames().iterator(); e.hasNext();) {
var name = String(e.next()),
value = String(request.getValue(name)), // FIXME: only gets the first of multiple
key = name.replace(/-/g, "_").toUpperCase();
@@ -60,21 +59,23 @@ var process = function(app, request, response) {
var address = request.getAddress();
- if (env["HTTP_HOST"])
- {
+ if (env["HTTP_HOST"]) {
var parts = env["HTTP_HOST"].split(":");
- if (parts.length === 2)
- {
+ if (parts.length === 1) {
+ env["SERVER_NAME"] = parts[0];
+ }
+ else if (parts.length === 2) {
env["SERVER_NAME"] = parts[0];
env["SERVER_PORT"] = parts[1];
}
}
- var uri = URI.parse(String(request.getTarget()));
-
- env["SERVER_NAME"] = env["SERVER_NAME"] || String(address.getDomain() || "");
- env["SERVER_PORT"] = env["SERVER_PORT"] || String(address.getPort() || "");
+ var name = address.getDomain(),
+ port = address.getPort();
+ env["SERVER_NAME"] = env["SERVER_NAME"] || String(name || "");
+ env["SERVER_PORT"] = env["SERVER_PORT"] || String(port >= 0 ? port : "");
+ var uri = URI.parse(String(request.getTarget()));
env["SCRIPT_NAME"] = "";
env["PATH_INFO"] = uri.path || "";
@@ -83,7 +84,7 @@ var process = function(app, request, response) {
env["SERVER_PROTOCOL"] = "HTTP/"+request.getMajor()+"."+request.getMinor();
env["HTTP_VERSION"] = env["SERVER_PROTOCOL"]; // legacy
- var cAddr, addr;
+ var cAddr;
if (cAddr = request.getClientAddress())
env["REMOTE_ADDR"] = String(cAddr.getHostName() || cAddr.getAddress() || "");
lib/jack/handler/simple.js
18179f6f79bc59b6d5f01680ea03c1dc9554d279
Tom Robinson
tom@280north.com
http://github.com/tlrobinson/jack/commit/12c9bdde11641e52d0652289b4d5fb0d592bf99b
12c9bdde11641e52d0652289b4d5fb0d592bf99b
2009-10-21T14:35:24-07:00
2009-10-21T14:07:00-07:00
fix Simple's SERVER_NAME, SERVER_PORT. other misc cleanup
cba430d5c05640d74c97f5aa7ac55238b0150310
Tom Robinson
tom@280north.com