mirror of
https://github.com/node-red/node-red.git
synced 2025-12-27 15:34:26 +01:00
Merge branch 'dev' into feature/export-module-info-2
This commit is contained in:
@@ -29,7 +29,7 @@
|
||||
|
||||
<div class="form-row">
|
||||
<label for="node-input-url"><i class="fa fa-globe"></i> <span data-i18n="httpin.label.url"></span></label>
|
||||
<input id="node-input-url" type="text" placeholder="http://">
|
||||
<input id="node-input-url" type="text" placeholder="https://">
|
||||
</div>
|
||||
|
||||
<div class="form-row node-input-paytoqs-row">
|
||||
|
||||
@@ -586,6 +586,17 @@ in your Node-RED user directory (${RED.settings.userDir}).
|
||||
opts.https.certificate = opts.https.cert;
|
||||
delete opts.https.cert;
|
||||
}
|
||||
// The got library uses a different case for some https properties compared to the
|
||||
// standard node tls options object.
|
||||
if (opts.https.ALPNProtocols) {
|
||||
opts.https.alpnProtocols = opts.https.ALPNProtocols
|
||||
delete opts.https.ALPNProtocols
|
||||
}
|
||||
// The got library doesn't support servername at this time
|
||||
// https://github.com/sindresorhus/got/issues/2320
|
||||
if (opts.https.servername) {
|
||||
delete opts.https.servername
|
||||
}
|
||||
} else {
|
||||
if (msg.hasOwnProperty('rejectUnauthorized')) {
|
||||
opts.https = { rejectUnauthorized: msg.rejectUnauthorized };
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
<input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<label for="node-input-property"><i class="fa fa-forward"></i> <span data-i18n="split.splitThe"></span></label>
|
||||
<input type="text" id="node-input-property" style="width:70%;">
|
||||
<label for="node-input-property" style="padding-left:10px; margin-right:-10px;" data-i18n="split.splitThe"></label>
|
||||
<input type="text" id="node-input-property" style="width:70%;"/>
|
||||
</div>
|
||||
<div class="form-row"><span data-i18n="[html]split.strBuff"></span></div>
|
||||
<div class="form-row">
|
||||
|
||||
Reference in New Issue
Block a user