whistle 2.10.0 → 2.10.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/js/log.js +8 -4
- package/biz/webui/htdocs/index.html +1 -1
- package/biz/webui/htdocs/js/index.js +32 -32
- package/lib/rules/rules.js +1 -1
- package/lib/upgrade.js +1 -1
- package/package.json +1 -1
package/lib/rules/rules.js
CHANGED
|
@@ -790,7 +790,7 @@ function getValueFor(key, vals, file) {
|
|
|
790
790
|
return;
|
|
791
791
|
}
|
|
792
792
|
var key1 = util.getInlineKey(key, file);
|
|
793
|
-
var val = vals
|
|
793
|
+
var val = vals ? vals[key1] : undefined;
|
|
794
794
|
if (val !== undefined) {
|
|
795
795
|
val = vals[key1] = val && typeof val == 'object' ? JSON.stringify(val) : val;
|
|
796
796
|
} else {
|
package/lib/upgrade.js
CHANGED
|
@@ -125,6 +125,7 @@ function upgradeHandler(req, socket) {
|
|
|
125
125
|
req.isWs = true;
|
|
126
126
|
socket.fullUrl = util.getFullUrl(req);
|
|
127
127
|
socket._fwdHost = req._fwdHost;
|
|
128
|
+
socket.headers = headers;
|
|
128
129
|
getPluginNameByReq(req, socket, function (err, uiPort) {
|
|
129
130
|
if (err) {
|
|
130
131
|
return socket.write(err);
|
|
@@ -163,7 +164,6 @@ function upgradeHandler(req, socket) {
|
|
|
163
164
|
// 不能放到上面，否则转发后的协议将丢失
|
|
164
165
|
delete headers[config.HTTPS_FIELD];
|
|
165
166
|
socket.rawHeaderNames = getRawHeaderNames(req.rawHeaders);
|
|
166
|
-
socket.headers = headers;
|
|
167
167
|
socket.url = req.url;
|
|
168
168
|
socket.fromTunnel = req.fromTunnel;
|
|
169
169
|
socket.fromComposer = req.fromComposer;
|