Skip to content

Commit 2b760f6

Browse files
committed
Merge branch 'dbk91-request_cert_support'
2 parents 0fa8fea + 11a3e63 commit 2b760f6

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

lib/Server.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,8 @@ function Server(compiler, options) {
355355
cert: options.cert,
356356
ca: options.ca,
357357
pfx: options.pfx,
358-
passphrase: options.pfxPassphrase
358+
passphrase: options.pfxPassphrase,
359+
requestCert: options.requestCert || false
359360
};
360361
}
361362

lib/optionsSchema.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@
145145
"description": "The passphrase to a (SSL) PFX file.",
146146
"type": "string"
147147
},
148+
"requestCert": {
149+
"description": "Enables request for client certificate.",
150+
"type": "boolean"
151+
},
148152
"inline": {
149153
"description": "Enable inline mode to include client scripts in bundle (CLI-only).",
150154
"type": "boolean"

test/Validation.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ describe('Validation', () => {
4949
message: [
5050
" - configuration has an unknown property 'asdf'. These properties are valid:",
5151
' object { hot?, hotOnly?, lazy?, bonjour?, host?, allowedHosts?, filename?, publicPath?, port?, socket?, ' +
52-
'watchOptions?, headers?, clientLogLevel?, overlay?, key?, cert?, ca?, pfx?, pfxPassphrase?, ' +
53-
'inline?, disableHostCheck?, public?, https?, contentBase?, watchContentBase?, open?, useLocalIp?, openPage?, features?, ' +
54-
'compress?, proxy?, historyApiFallback?, staticOptions?, setup?, stats?, reporter?, ' +
55-
'noInfo?, quiet?, serverSideRender?, index?, log?, warn? }'
52+
'watchOptions?, headers?, clientLogLevel?, overlay?, key?, cert?, ca?, pfx?, pfxPassphrase?, requestCert?, ' +
53+
'inline?, disableHostCheck?, public?, https?, contentBase?, watchContentBase?, open?, useLocalIp?, openPage?, features?, ' +
54+
'compress?, proxy?, historyApiFallback?, staticOptions?, setup?, stats?, reporter?, ' +
55+
'noInfo?, quiet?, serverSideRender?, index?, log?, warn? }'
5656
]
5757
}];
5858
testCases.forEach((testCase) => {

0 commit comments

Comments
 (0)