@@ -9,7 +9,7 @@ export REQUEST_METHOD="GET" export SERVER_NAME="localhost" export SERVER_PORT="80" export QUERY_STRING="" -export HTTP_VERSION="HTTP/1.1" +export SERVER_PROTOCOL="HTTP/1.1" export REMOTE_HOST="127.0.0.1" bin/cgi-test.sh @@ -49,7 +49,7 @@ CommonLogger.Context.prototype.forEach = function(block) { method = this.env["REQUEST_METHOD"], path = (this.env["SCRIPT_NAME"]||"") + (this.env["PATH_INFO"]||""), query = this.env["QUERY_STRING"] ? "?"+this.env["QUERY_STRING"] : "", - version = this.env["HTTP_VERSION"], + version = this.env["SERVER_PROTOCOL"], status = String(this.status).substring(0,3), size = length === 0 ? "-" : length.toString(), duration = now.getTime() - this.time.getTime(); lib/jack/commonlogger.js @@ -21,7 +21,8 @@ exports.run = function(app, options) { env["SERVER_NAME"] = "localhost";//String(request.getServerName() || ""); env["SERVER_PORT"] = "";//String(request.getServerPort() || ""); env["QUERY_STRING"] = "";//String(request.getQueryString() || ""); - env["HTTP_VERSION"] = "HTTP/1.1";//String(request.getProtocol() || ""); + env["SERVER_PROTOCOL"] = "HTTP/1.1";//String(request.getProtocol() || ""); + env["HTTP_VERSION"] = env["SERVER_PROTOCOL"]; // legacy env["REMOTE_HOST"] = "127.0.0.1"; lib/jack/handler/fastcgi-rhino-jna.js @@ -70,7 +70,8 @@ var process = function(app, request, response) { env["REQUEST_METHOD"] = request.method || ""; env["QUERY_STRING"] = uri.query || request.queryString || ""; - env["HTTP_VERSION"] = ["HTTP/", request.httpVersion || "1.1"].join(""); + env["SERVER_PROTOCOL"] = ["HTTP/", request.httpVersion || "1.1"].join(""); + env["HTTP_VERSION"] = env["SERVER_PROTOCOL"]; // legacy var cAddr, addr; //if (cAddr = request.getClientAddress()) @@ -104,7 +105,7 @@ var process = function(app, request, response) { print(key + " : " + response[key]); }); // set the status - Log.debug("set the status", env["HTTP_VERSION"], res.status, HTTP_STATUS_CODES[res.status]); + Log.debug("set the status", env["SERVER_PROTOCOL"], res.status, HTTP_STATUS_CODES[res.status]); response.setStatusLine(request.httpVersion || "1.1", res.status, HTTP_STATUS_CODES[res.status]); // check to see if X-Sendfile was used, remove the header lib/jack/handler/mozhttpd.js @@ -37,7 +37,8 @@ Servlet.process = function(app, request, response) { env["SERVER_NAME"] = String(request.getServerName() || ""); env["SERVER_PORT"] = String(request.getServerPort() || ""); env["QUERY_STRING"] = String(request.getQueryString() || ""); - env["HTTP_VERSION"] = String(request.getProtocol() || ""); + env["SERVER_PROTOCOL"] = String(request.getProtocol() || ""); + env["HTTP_VERSION"] = env["SERVER_PROTOCOL"]; // legacy env["REMOTE_HOST"] = String(request.getRemoteHost() || ""); lib/jack/handler/servlet.js @@ -74,8 +74,10 @@ var process = function(app, request, shttpd) { if (env["PATH_INFO"] === undefined) env["PATH_INFO"] = env["REQUEST_URI"]; - if (env["HTTP_VERSION"] === undefined) - env["HTTP_VERSION"] = env["SERVER_PROTOCOL"] || "HTTP/1.1"; + if (env["SERVER_PROTOCOL"] === undefined) + env["SERVER_PROTOCOL"] = "HTTP/1.1"; + + env["HTTP_VERSION"] = env["SERVER_PROTOCOL"]; // legacy if (env["CONTENT_LENGTH"] === undefined) env["CONTENT_LENGTH"] = "0"; lib/jack/handler/shttpd.js @@ -80,7 +80,8 @@ var process = function(app, request, response) { env["REQUEST_METHOD"] = String(request.getMethod() || ""); env["QUERY_STRING"] = uri.query || ""; - env["HTTP_VERSION"] = "HTTP/"+request.getMajor()+"."+request.getMinor(); + env["SERVER_PROTOCOL"] = "HTTP/"+request.getMajor()+"."+request.getMinor(); + env["HTTP_VERSION"] = env["SERVER_PROTOCOL"]; // legacy var cAddr, addr; if (cAddr = request.getClientAddress()) lib/jack/handler/simple.js @@ -5,7 +5,7 @@ exports.run = function(app, request, response) { for (var key in request._headers) env[key] = request._headers[key]; - env["HTTP_VERSION"] = env["SERVER_PROTOCOL"]; + env["HTTP_VERSION"] = env["SERVER_PROTOCOL"]; // legacy env["jsgi.version"] = [0,2]; env["jsgi.input"] = null; // FIXME lib/jack/handler/v8cgi.js 63b92ab5badbc784fe47af22aa3f171e8cc2e613 Tom Robinson tom@280north.com http://github.com/tlrobinson/jack/commit/1974d3ca9ee309ce5007f8910737db20fafe3346 1974d3ca9ee309ce5007f8910737db20fafe3346 2009-10-01T01:27:40-07:00 2009-10-01T01:27:40-07:00 Change HTTP_VERSION to SERVER_PROTOCOL (conflicts with "Version" header) a1fc917cfc9cc35e95e9aa8f4e341d7662c19aac Tom Robinson tom@280north.com