| commit | e594dccc85740ecc1d61f236e9135c5b90301d31 | [log] [tgz] |
|---|---|---|
| author | Henrique Mendonça <henrique@apache.org> | Fri Sep 20 17:15:55 2013 +0200 |
| committer | Henrique Mendonça <henrique@apache.org> | Fri Sep 20 17:15:55 2013 +0200 |
| tree | 52920b76644b4a548108e0afcb6f9a8158c661c2 | |
| parent | a9e624811f07e23fc280932e6b05587ce69c1644 [diff] | |
| parent | 7cf085e6c5bd1ca574cff0a1d209b13395d0d449 [diff] |
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/thrift Conflicts: lib/nodejs/lib/thrift/static_server.js
diff --git a/lib/nodejs/lib/thrift/static_server.js b/lib/nodejs/lib/thrift/static_server.js index 0895c60..a1d2eaa 100644 --- a/lib/nodejs/lib/thrift/static_server.js +++ b/lib/nodejs/lib/thrift/static_server.js
@@ -125,7 +125,7 @@ } fs.readFile(filename, "binary", function(err, file) { - if (err) { + if (err) { response.writeHead(500); response.end(err + "\n"); return;