frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-12-27 15:34:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Nick O'Leary
2025-06-03 16:55:29 +01:00
parent bf1272e9ca 68d85bbaef
commit 30215b02ac
12 changed files with 151 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/nodes/core/network/21-httprequest.html vendored
View File

@@ -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">

11
packages/node_modules/@node-red/nodes/core/network/21-httprequest.js vendored
View File

@@ -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 };

4
packages/node_modules/@node-red/nodes/core/sequence/17-split.html vendored
View File

@@ -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">