Skip to content

Commit

Permalink
Patched What to stop crashing on HEAD requests. (Thanks Donald!)
Browse files Browse the repository at this point in the history
  • Loading branch information
entmike committed Feb 14, 2011
1 parent 84fb44a commit 11b6686
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
7 changes: 6 additions & 1 deletion libs/HttpServlet.js
Expand Up @@ -215,7 +215,12 @@ exports.create = function(meta) {
return this.doOptions(request, response); this.serviceComplete(request, response); break;
case "TRACE" :
return this.doTrace(request, response); this.serviceComplete(request, response); break;
default:
case "HEAD":
return this.doGet.call(this, request, response, callback);
break;
default: // Others
return this.doGet.call(this, request, response, callback);
break;
}
},
serviceComplete : function(request, response, callback) {
Expand Down
4 changes: 2 additions & 2 deletions libs/HttpServletResponse.js
Expand Up @@ -19,8 +19,8 @@ exports.create = function(options) {
// Public
return {
// Non-interface method. Ends Node.JS response
close : function() {
this.flushBuffer();
close : function(autoFlush) {
if(autoFlush) this.flushBuffer();
if(this.getStatus()==304) {
this.getWriter().close();
return;
Expand Down
6 changes: 3 additions & 3 deletions libs/ServletContext.js
Expand Up @@ -221,7 +221,7 @@ exports.create = function(options) {
handleComplete : function(request, response){
var acceptEncoding = request.getHeader("accept-encoding");
if(acceptEncoding && acceptEncoding.toLowerCase().indexOf("gzip") > -1) { // Accepts GZIP
if(!response.isCommited()) {
if(!response.isCommited() && !request.method=="HEAD") {
response.setHeader("Content-Encoding", "gzip");
// console.log(request.getPathInfo());
gzip({
Expand All @@ -234,10 +234,10 @@ exports.create = function(options) {
}
});
}else{ // Response is commited, cannot GZIP.
response.close();
response.close((request.getMethod()!="HEAD"));
}
}else{ // Browser does not accept GZIP.
response.close();
response.close((request.getMethod()!="HEAD"));
}
var rStatus = response.getStatus().toString();
switch (rStatus){
Expand Down

0 comments on commit 11b6686

Please sign in to comment.