Skip to content

TS-3922: Websocket Timeouts, transaction overrideable #596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bgaff merged 1 commit into from
Apr 22, 2016
Merged

TS-3922: Websocket Timeouts, transaction overrideable #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions doc/developer-guide/api/functions/TSHttpOverridableConfig.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ The following configurations (from ``records.config``) are overridable.
| :ts:cv:`proxy.config.http.transaction_no_activity_timeout_in`
| :ts:cv:`proxy.config.http.transaction_no_activity_timeout_out`
| :ts:cv:`proxy.config.http.transaction_active_timeout_out`
| :ts:cv:`proxy.config.websocket.no_activity_timeout`
| :ts:cv:`proxy.config.websocket.active_timeout`
| :ts:cv:`proxy.config.http.origin_max_connections`
| :ts:cv:`proxy.config.http.connect_attempts_max_retries`
| :ts:cv:`proxy.config.http.connect_attempts_max_retries_dead_server`
Expand Down
2 changes: 2 additions & 0 deletions lib/ts/apidefs.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,8 @@ typedef enum {
TS_CONFIG_HTTP_REDIRECT_USE_ORIG_CACHE_KEY,
TS_CONFIG_HTTP_ATTACH_SERVER_SESSION_TO_CLIENT,
TS_CONFIG_HTTP_ORIGIN_MAX_CONNECTIONS_QUEUE,
TS_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT,
TS_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT,
TS_CONFIG_LAST_ENTRY
} TSOverridableConfigKey;

Expand Down
10 changes: 10 additions & 0 deletions proxy/InkAPI.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7880,6 +7880,12 @@ _conf_to_memberp(TSOverridableConfigKey conf, OverridableHttpConfigParams *overr
case TS_CONFIG_SSL_HSTS_INCLUDE_SUBDOMAINS:
ret = &overridableHttpConfig->proxy_response_hsts_include_subdomains;
break;
case TS_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT:
ret = &overridableHttpConfig->websocket_active_timeout;
break;
case TS_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT:
ret = &overridableHttpConfig->websocket_inactive_timeout;
break;
case TS_CONFIG_HTTP_CACHE_OPEN_READ_RETRY_TIME:
typ = OVERRIDABLE_TYPE_INT;
ret = &overridableHttpConfig->cache_open_read_retry_time;
Expand Down Expand Up @@ -8230,6 +8236,8 @@ TSHttpTxnConfigFind(const char *name, int length, TSOverridableConfigKey *conf,
cnf = TS_CONFIG_NET_SOCK_OPTION_FLAG_OUT;
else if (!strncmp(name, "proxy.config.net.sock_packet_mark_out", length))
cnf = TS_CONFIG_NET_SOCK_PACKET_MARK_OUT;
else if (!strncmp(name, "proxy.config.websocket.active_timeout", length))
cnf = TS_CONFIG_WEBSOCKET_ACTIVE_TIMEOUT;
break;
}
break;
Expand Down Expand Up @@ -8360,6 +8368,8 @@ TSHttpTxnConfigFind(const char *name, int length, TSOverridableConfigKey *conf,
cnf = TS_CONFIG_NET_SOCK_SEND_BUFFER_SIZE_OUT;
else if (!strncmp(name, "proxy.config.http.connect_attempts_timeout", length))
cnf = TS_CONFIG_HTTP_CONNECT_ATTEMPTS_TIMEOUT;
else if (!strncmp(name, "proxy.config.websocket.no_activity_timeout", length))
cnf = TS_CONFIG_WEBSOCKET_NO_ACTIVITY_TIMEOUT;
break;
}
break;
Expand Down