diff options
author | Ryan <ry@tinyclouds.org> | 2009-06-12 19:37:43 +0400 |
---|---|---|
committer | Ryan <ry@tinyclouds.org> | 2009-06-12 19:37:43 +0400 |
commit | 916b9ca715b229b0703f0ed6c2fc065410fb189c (patch) | |
tree | 71d2f1cd177b49bc87d79be7c9b3307cc1b2db05 /src | |
parent | 825d7a8be83f2ef8956becad4cd42abb8c2a159b (diff) |
Add Request objects on the HTTP server can be interrupted.v0.0.4
Diffstat (limited to 'src')
-rw-r--r-- | src/http.cc | 17 | ||||
-rw-r--r-- | src/http.js | 34 |
2 files changed, 24 insertions, 27 deletions
diff --git a/src/http.cc b/src/http.cc index b77a5dd15cd..5e0deff2fc5 100644 --- a/src/http.cc +++ b/src/http.cc @@ -80,9 +80,7 @@ void HTTPConnection::OnReceive (const void *buf, size_t len) { http_parser_execute(&parser_, static_cast<const char*>(buf), len); - - if (http_parser_has_error(&parser_)) - ForceClose(); + if (http_parser_has_error(&parser_)) ForceClose(); } int @@ -187,16 +185,15 @@ HTTPConnection::on_headers_complete (http_parser *parser) ); message_handler->Set(HTTP_VERSION_SYMBOL, String::New(version)); - // SHOULD KEEP ALIVE - message_handler->Set( SHOULD_KEEP_ALIVE_SYMBOL - , http_parser_should_keep_alive(&connection->parser_) ? True() : False() - ); - + message_handler->Set(SHOULD_KEEP_ALIVE_SYMBOL, + http_parser_should_keep_alive(&connection->parser_) ? True() : False()); - Local<Value> on_headers_complete_v = message_handler->Get(ON_HEADERS_COMPLETE_SYMBOL); + Local<Value> on_headers_complete_v = + message_handler->Get(ON_HEADERS_COMPLETE_SYMBOL); if (on_headers_complete_v->IsFunction() == false) return 0; - Handle<Function> on_headers_complete = Handle<Function>::Cast(on_headers_complete_v); + Handle<Function> on_headers_complete = + Handle<Function>::Cast(on_headers_complete_v); TryCatch try_catch; Local<Value> ret = on_headers_complete->Call(message_handler, 0, NULL); diff --git a/src/http.js b/src/http.js index d099c480e77..6d5b2eda2f6 100644 --- a/src/http.js +++ b/src/http.js @@ -239,22 +239,24 @@ node.http.Server = function (RequestHandler, options) { var responses = []; connection.onMessage = function ( ) { + var interrupted = false; // filled in ... var req = { method : null // at onHeadersComplete , uri : "" // at onURI - , httpVersion : null // at onHeadersComplete + , httpVersion : null // at onHeadersComplete , headers : [] // at onHeaderField, onHeaderValue , onBody : null // by user , onBodyComplete : null // by user + , interrupt : function ( ) { interrupted = true; } , setBodyEncoding : function (enc) { connection.setEncoding(enc); } - } + }; var res = new node.http.ServerResponse(connection, responses); this.onURI = function (data) { req.uri += data; - return true + return !interrupted; }; var last_was_value = false; @@ -266,7 +268,7 @@ node.http.Server = function (RequestHandler, options) { else headers.push([data]); last_was_value = false; - return true; + return !interrupted; }; this.onHeaderValue = function (data) { @@ -276,31 +278,29 @@ node.http.Server = function (RequestHandler, options) { else last_pair[1] += data; last_was_value = true; - return true; + return !interrupted; }; this.onHeadersComplete = function () { req.httpVersion = this.httpVersion; - req.method = this.method; - req.uri = node.http.parseUri(req.uri); // TODO parse the URI lazily - + req.method = this.method; + // TODO parse the URI lazily? + req.uri = node.http.parseUri(req.uri); res.should_keep_alive = this.should_keep_alive; - return RequestHandler.apply(server, [req, res]); + RequestHandler.apply(server, [req, res]); + + return !interrupted; }; this.onBody = function (chunk) { - if (req.onBody) - return req.onBody(chunk); - else - return true; + if (req.onBody) req.onBody(chunk); + return !interrupted; }; this.onMessageComplete = function () { - if (req.onBodyComplete) - return req.onBodyComplete(); - else - return true; + if (req.onBodyComplete) req.onBodyComplete(); + return !interrupted; }; }; |