total5 0.0.15-2 → 0.0.15-3

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/changelog.txt CHANGED
@@ -6,6 +6,7 @@
6
6
  - improved `keepalive` option in the `REQUEST()` method (it can contain HttpAgent or options for it)
7
7
  - updated `RESTBuilder.keepalive()` method by adding `val` argument
8
8
  - fixed column indexer in the CSV parser
9
+ - fixed proxy timeout
9
10
 
10
11
  ========================
11
12
  0.0.14
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "total5",
3
- "version": "0.0.15-2",
3
+ "version": "0.0.15-3",
4
4
  "description": "Total.js framework v5",
5
5
  "main": "index.js",
6
6
  "directories": {
package/routing.js CHANGED
@@ -1000,11 +1000,11 @@ function proxycreate(proxy, ctrl) {
1000
1000
 
1001
1001
  request.$controller = ctrl;
1002
1002
  request.$proxy = proxy;
1003
- request.$timeout = proxy.timeout || F.config.$proxytimeout;
1003
+ request.$timeout = ctrl.timeout = proxy.$timeout || F.config.$proxytimeout;
1004
1004
  request.iswebsocket = !!ctrl.iswebsocket;
1005
1005
  request.$destroy = proxyerror;
1006
1006
 
1007
- if (!ctrl.iswebsocket && proxy.timeout) {
1007
+ if (!ctrl.iswebsocket && request.$timeout) {
1008
1008
  F.temporary.pending.push(ctrl);
1009
1009
  F.TUtils.onfinished(ctrl.res, function() {
1010
1010
  request.$destroyed = true;