From 88bcccd4a9919b613c1cb04f0b0ccdae982268d6 Mon Sep 17 00:00:00 2001
From: Eric Covener <covener@apache.org>
Date: Mon, 14 Apr 2014 00:13:43 +0000
Subject: [PATCH] s/asynch/async
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1587126 13f79535-47bb-0310-9956-ffa450edef68
---
docs/manual/mod/mod_proxy_wstunnel.xml | 14 +++++++-------
modules/proxy/mod_proxy_wstunnel.c | 16 ++++++++--------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/docs/manual/mod/mod_proxy_wstunnel.xml b/docs/manual/mod/mod_proxy_wstunnel.xml
index fcc7c00e26..f0200852f7 100644
--- a/docs/manual/mod/mod_proxy_wstunnel.xml
+++ b/docs/manual/mod/mod_proxy_wstunnel.xml
@@ -54,9 +54,9 @@ ProxyPass /wss2/ wss://echo.websocket.org/
<seealso><module>mod_proxy</module></seealso>
<directivesynopsis>
-<name>ProxyWebsocketAsynch</name>
+<name>ProxyWebsocketAsync</name>
<description>Instructs this module to try to create an asynchronous tunnel</description>
-<syntax>ProxyWebsocketAsynch ON|OFF</syntax>
+<syntax>ProxyWebsocketAsync ON|OFF</syntax>
<contextlist><context>server config</context>
<context>virtual host</context>
</contextlist>
@@ -79,22 +79,22 @@ ProxyPass /wss2/ wss://echo.websocket.org/
<usage>
<p>This directive imposes a maximum amount of time for the tunnel to be
- left open while idle. This directive is ignored if <directive>ProxyWebsocketAsynch</directive>
+ left open while idle. This directive is ignored if <directive>ProxyWebsocketAsync</directive>
is enabled and the running MPM supports the necessary features</p>
</usage>
</directivesynopsis>
<directivesynopsis>
-<name>ProxyWebsocketAsynchDelay</name>
+<name>ProxyWebsocketAsyncDelay</name>
<description>Sets the amount of time the tunnel waits synchronously for data</description>
-<syntax>ProxyWebsocketAsynchDelay <var>num</var>[ms]</syntax>
-<default>ProxyWebsocketAsynchDelay 0</default>
+<syntax>ProxyWebsocketAsyncDelay <var>num</var>[ms]</syntax>
+<default>ProxyWebsocketAsyncDelay 0</default>
<contextlist><context>server config</context>
<context>virtual host</context>
</contextlist>
<usage>
- <p>If <directive>ProxyWebsocketAsynch</directive> is enabled, this directive
+ <p>If <directive>ProxyWebsocketAsync</directive> is enabled, this directive
controls how long the server synchronously waits for more data.</p>
</usage>
</directivesynopsis>
diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
index 984e9dc0df..7fbafb2007 100644
--- a/modules/proxy/mod_proxy_wstunnel.c
+++ b/modules/proxy/mod_proxy_wstunnel.c
@@ -63,7 +63,7 @@ static int proxy_wstunnel_pump(ws_baton_t *baton, apr_time_t timeout, int try_as
}
else if (APR_STATUS_IS_TIMEUP(rv)) {
if (try_async) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02542) "Attempting to go asynch");
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02542) "Attempting to go async");
return SUSPENDED;
}
else {
@@ -411,7 +411,7 @@ static int ap_proxy_wstunnel_request(apr_pool_t *p, request_rec *r,
return SUSPENDED;
}
else if (status == APR_ENOTIMPL) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02544) "No asynch support");
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02544) "No async support");
status = proxy_wstunnel_pump(baton, dconf->idle_timeout, 0); /* force no async */
}
else {
@@ -537,21 +537,21 @@ static const char * proxyws_set_aysnch_delay(cmd_parms *cmd, void *conf, const c
{
proxyws_dir_conf *dconf = conf;
if (ap_timeout_parameter_parse(val, &(dconf->async_delay), "s") != APR_SUCCESS)
- return "ProxyWebsocketAsynchDelay timeout has wrong format";
+ return "ProxyWebsocketAsyncDelay timeout has wrong format";
return NULL;
}
static const command_rec ws_proxy_cmds[] =
{
- AP_INIT_FLAG("ProxyWebsocketAsynch", ap_set_flag_slot_char, (void*)APR_OFFSETOF(proxyws_dir_conf, is_async),
+ AP_INIT_FLAG("ProxyWebsocketAsync", ap_set_flag_slot_char, (void*)APR_OFFSETOF(proxyws_dir_conf, is_async),
RSRC_CONF|ACCESS_CONF,
- "on if idle websockets connections should be monitored asynchronously"),
+ "on if idle websockets connections should be monitored asyncronously"),
AP_INIT_TAKE1("ProxyWebsocketIdleTimeout", proxyws_set_idle, NULL, RSRC_CONF|ACCESS_CONF,
- "timeout for activity in either direction, unlimited by default. Not currently supported with ProxyWebsocketAsynch"),
+ "timeout for activity in either direction, unlimited by default. Not currently supported with ProxyWebsocketAsync"),
- AP_INIT_TAKE1("ProxyWebsocketAsynchDelay", proxyws_set_aysnch_delay, NULL, RSRC_CONF|ACCESS_CONF,
- "amount of time to poll before going asynchronous"),
+ AP_INIT_TAKE1("ProxyWebsocketAsyncDelay", proxyws_set_aysnch_delay, NULL, RSRC_CONF|ACCESS_CONF,
+ "amount of time to poll before going asyncronous"),
{NULL}
};
--
2.40.0