Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/changes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ NGINX Unit updated to 1.32.0.
</para>
</change>

<change type="bugfix">
<para>
http.createServer() now accepts "options" argument introduced in Node.js v9.6.0, v8.12.0.
</para>
</change>

<change type="feature">
<para>
conditional access logging.
Expand Down
4 changes: 2 additions & 2 deletions src/nodejs/unit-http/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ const {
ServerResponse,
} = require('./http_server');

function createServer (requestHandler) {
return new Server(requestHandler);
function createServer (options, requestHandler) {
return new Server(options, requestHandler);
}

const http = require("http")
Expand Down
10 changes: 9 additions & 1 deletion src/nodejs/unit-http/http_server.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

'use strict';

const { stderr } = require('process');
const EventEmitter = require('events');
const http = require('http');
const util = require('util');
Expand Down Expand Up @@ -413,7 +414,14 @@ ServerRequest.prototype._read = function _read(n) {
};


function Server(requestListener) {
function Server(options, requestListener) {
if (typeof options === 'function') {
requestListener = options;
options = {};
} else {
stderr.write("http.Server constructor was called with unsupported options, using default settings\n");
}

EventEmitter.call(this);

this.unit = new unit_lib.Unit();
Expand Down
4 changes: 4 additions & 0 deletions test/node/options/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
require('http').createServer({}, function (req, res) {
res.writeHead(200, {'Content-Length': 12, 'Content-Type': 'text/plain'})
.end('Hello World\n');
}).listen(8080);
6 changes: 6 additions & 0 deletions test/test_node_application.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ def test_node_application_basic():

assert_basic_application()

def test_node_application_options(wait_for_record):
client.load('options')

assert_basic_application()
assert wait_for_record(r'constructor was called with unsupported') is not None


def test_node_application_loader_unit_http():
client.load('loader/unit_http')
Expand Down