svn commit: r1587126 - in /httpd/httpd/trunk: docs/manual/mod/mod_proxy_wstunnel.xml modules/proxy/mod_proxy_wstunnel.c

[co...@apache.org]

Author: covener
Date: Mon Apr 14 00:13:43 2014
New Revision: 1587126

URL: http://svn.apache.org/r1587126
Log:
s/asynch/async


Modified:
    httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.xml
    httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.xml?rev=1587126&r1=1587125&r2=1587126&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.xml Mon Apr 14 00:13:43 2014
@@ -54,9 +54,9 @@ ProxyPass /wss2/ wss://echo.websocket.or
 <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.or
 
 <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>

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c?rev=1587126&r1=1587125&r2=1587126&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Mon Apr 14 00:13:43 2014
@@ -63,7 +63,7 @@ static int proxy_wstunnel_pump(ws_baton_
             }
             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
                 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_d
 {
     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}
 };