From 99b9928ac68c448ec9d0556e816e808fea1aace5 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 7 Mar 2013 14:06:57 +0000 Subject: [PATCH] rename extension module... tunnel is more accurate git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453876 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/config.m4 | 6 +-- ...d_proxy_websocket.c => mod_proxy_tunnel.c} | 42 +++++++++---------- ...oxy_websocket.dsp => mod_proxy_tunnel.dsp} | 42 +++++++++---------- 3 files changed, 45 insertions(+), 45 deletions(-) rename modules/proxy/{mod_proxy_websocket.c => mod_proxy_tunnel.c} (91%) rename modules/proxy/{mod_proxy_websocket.dsp => mod_proxy_tunnel.dsp} (65%) diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4 index 0878363820..36f7bdc3bf 100644 --- a/modules/proxy/config.m4 +++ b/modules/proxy/config.m4 @@ -20,7 +20,7 @@ proxy_fcgi_objs="mod_proxy_fcgi.lo" proxy_scgi_objs="mod_proxy_scgi.lo" proxy_fdpass_objs="mod_proxy_fdpass.lo" proxy_ajp_objs="mod_proxy_ajp.lo ajp_header.lo ajp_link.lo ajp_msg.lo ajp_utils.lo" -proxy_websocket_objs="mod_proxy_websocket.lo" +proxy_tunnel_objs="mod_proxy_tunnel.lo" proxy_balancer_objs="mod_proxy_balancer.lo" case "$host" in @@ -34,7 +34,7 @@ case "$host" in proxy_scgi_objs="$proxy_scgi_objs mod_proxy.la" proxy_fdpass_objs="$proxy_fdpass_objs mod_proxy.la" proxy_ajp_objs="$proxy_ajp_objs mod_proxy.la" - proxy_websocket_objs="$proxy_websocket_objs mod_proxy.la" + proxy_tunnel_objs="$proxy_tunnel_objs mod_proxy.la" proxy_balancer_objs="$proxy_balancer_objs mod_proxy.la" ;; esac @@ -54,7 +54,7 @@ APACHE_MODULE(proxy_fdpass, Apache proxy to Unix Daemon Socket module. Requires enable_proxy_fdpass=no fi ],proxy) -APACHE_MODULE(proxy_websocket, Apache proxy websocket module. Requires and is enabled by --enable-proxy., $proxy_websocket_objs, , $proxy_mods_enable,, proxy) +APACHE_MODULE(proxy_tunnel, Apache proxy tunnel module. Requires and is enabled by --enable-proxy., $proxy_tunnel_objs, , $proxy_mods_enable,, proxy) APACHE_MODULE(proxy_ajp, Apache proxy AJP module. Requires and is enabled by --enable-proxy., $proxy_ajp_objs, , $proxy_mods_enable,, proxy) APACHE_MODULE(proxy_balancer, Apache proxy BALANCER module. Requires and is enabled by --enable-proxy., $proxy_balancer_objs, , $proxy_mods_enable,, proxy) diff --git a/modules/proxy/mod_proxy_websocket.c b/modules/proxy/mod_proxy_tunnel.c similarity index 91% rename from modules/proxy/mod_proxy_websocket.c rename to modules/proxy/mod_proxy_tunnel.c index e28699122e..5f90f3919e 100644 --- a/modules/proxy/mod_proxy_websocket.c +++ b/modules/proxy/mod_proxy_tunnel.c @@ -16,7 +16,7 @@ #include "mod_proxy.h" -module AP_MODULE_DECLARE_DATA proxy_websocket_module; +module AP_MODULE_DECLARE_DATA proxy_tunnel_module; /* * Canonicalise http-like URLs. @@ -24,7 +24,7 @@ module AP_MODULE_DECLARE_DATA proxy_websocket_module; * url is the URL starting with the first '/' * def_port is the default port for this scheme. */ -static int proxy_websocket_canon(request_rec *r, char *url) +static int proxy_tunnel_canon(request_rec *r, char *url) { char *host, *path, sport[7]; char *search = NULL; @@ -33,14 +33,14 @@ static int proxy_websocket_canon(request_rec *r, char *url) apr_port_t port, def_port; /* ap_port_of_scheme() */ - if (strncasecmp(url, "ws:", 3) == 0) { - url += 3; - scheme = "ws:"; + if (strncasecmp(url, "tun:", 4) == 0) { + url += 4; + scheme = "tun:"; def_port = apr_uri_port_of_scheme("http"); } - else if (strncasecmp(url, "wss:", 4) == 0) { - url += 4; - scheme = "wss:"; + else if (strncasecmp(url, "tuns:", 5) == 0) { + url += 5; + scheme = "tuns:"; def_port = apr_uri_port_of_scheme("https"); } else { @@ -90,7 +90,7 @@ static int proxy_websocket_canon(request_rec *r, char *url) } -static int proxy_websocket_transfer(request_rec *r, conn_rec *c_i, conn_rec *c_o, +static int proxy_tunnel_transfer(request_rec *r, conn_rec *c_i, conn_rec *c_o, apr_bucket_brigade *bb, char *name) { int rv; @@ -139,7 +139,7 @@ static int proxy_websocket_transfer(request_rec *r, conn_rec *c_i, conn_rec *c_o /* * process the request and write the response. */ -static int ap_proxy_websocket_request(apr_pool_t *p, request_rec *r, +static int ap_proxy_tunnel_request(apr_pool_t *p, request_rec *r, proxy_conn_rec *conn, proxy_worker *worker, proxy_server_conf *conf, @@ -236,7 +236,7 @@ static int ap_proxy_websocket_request(apr_pool_t *p, request_rec *r, if (pollevent & APR_POLLIN) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() "sock was readable"); - rv = proxy_websocket_transfer(r, backconn, c, bb, "sock"); + rv = proxy_tunnel_transfer(r, backconn, c, bb, "sock"); } else if ((pollevent & APR_POLLERR) || (pollevent & APR_POLLHUP)) { @@ -252,7 +252,7 @@ static int ap_proxy_websocket_request(apr_pool_t *p, request_rec *r, if (pollevent & APR_POLLIN) { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() "client was readable"); - rv = proxy_websocket_transfer(r, c, backconn, bb, "client"); + rv = proxy_tunnel_transfer(r, c, backconn, bb, "client"); } } else { @@ -278,7 +278,7 @@ static int ap_proxy_websocket_request(apr_pool_t *p, request_rec *r, /* */ -static int proxy_websocket_handler(request_rec *r, proxy_worker *worker, +static int proxy_tunnel_handler(request_rec *r, proxy_worker *worker, proxy_server_conf *conf, char *url, const char *proxyname, apr_port_t proxyport) @@ -292,11 +292,11 @@ static int proxy_websocket_handler(request_rec *r, proxy_worker *worker, apr_pool_t *p = r->pool; apr_uri_t *uri; - if (strncasecmp(url, "wss:", 4) == 0) { - scheme = "WSS"; + if (strncasecmp(url, "tuns:", 5) == 0) { + scheme = "TUNS"; } - else if (strncasecmp(url, "ws:", 3) == 0) { - scheme = "WS"; + else if (strncasecmp(url, "tun:", 4) == 0) { + scheme = "TUN"; } else { ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO() "declining URL %s", url); @@ -348,7 +348,7 @@ static int proxy_websocket_handler(request_rec *r, proxy_worker *worker, } /* Step Three: Process the Request */ - status = ap_proxy_websocket_request(p, r, backend, worker, conf, uri, locurl, + status = ap_proxy_tunnel_request(p, r, backend, worker, conf, uri, locurl, server_portstr); break; } @@ -360,11 +360,11 @@ static int proxy_websocket_handler(request_rec *r, proxy_worker *worker, static void ap_proxy_http_register_hook(apr_pool_t *p) { - proxy_hook_scheme_handler(proxy_websocket_handler, NULL, NULL, APR_HOOK_FIRST); - proxy_hook_canon_handler(proxy_websocket_canon, NULL, NULL, APR_HOOK_FIRST); + proxy_hook_scheme_handler(proxy_tunnel_handler, NULL, NULL, APR_HOOK_FIRST); + proxy_hook_canon_handler(proxy_tunnel_canon, NULL, NULL, APR_HOOK_FIRST); } -AP_DECLARE_MODULE(proxy_websocket) = { +AP_DECLARE_MODULE(proxy_tunnel) = { STANDARD20_MODULE_STUFF, NULL, /* create per-directory config structure */ NULL, /* merge per-directory config structures */ diff --git a/modules/proxy/mod_proxy_websocket.dsp b/modules/proxy/mod_proxy_tunnel.dsp similarity index 65% rename from modules/proxy/mod_proxy_websocket.dsp rename to modules/proxy/mod_proxy_tunnel.dsp index 4774cef0cc..b7c0b4453a 100644 --- a/modules/proxy/mod_proxy_websocket.dsp +++ b/modules/proxy/mod_proxy_tunnel.dsp @@ -1,24 +1,24 @@ -# Microsoft Developer Studio Project File - Name="mod_proxy_websocket" - Package Owner=<4> +# Microsoft Developer Studio Project File - Name="mod_proxy_tunnel" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -CFG=mod_proxy_websocket - Win32 Release +CFG=mod_proxy_tunnel - Win32 Release !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "mod_proxy_websocket.mak". +!MESSAGE NMAKE /f "mod_proxy_tunnel.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "mod_proxy_websocket.mak" CFG="mod_proxy_websocket - Win32 Release" +!MESSAGE NMAKE /f "mod_proxy_tunnel.mak" CFG="mod_proxy_tunnel - Win32 Release" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "mod_proxy_websocket - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE "mod_proxy_websocket - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_proxy_tunnel - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_proxy_tunnel - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -29,7 +29,7 @@ CPP=cl.exe MTL=midl.exe RSC=rc.exe -!IF "$(CFG)" == "mod_proxy_websocket - Win32 Release" +!IF "$(CFG)" == "mod_proxy_tunnel - Win32 Release" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 @@ -43,25 +43,25 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_proxy_websocket_src" /FD /c +# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_proxy_tunnel_src" /FD /c # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "NDEBUG" -# ADD RSC /l 0x409 /fo"Release/mod_proxy_websocket.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_proxy_websocket.so" /d LONG_NAME="proxy_websocket_module for Apache" +# ADD RSC /l 0x409 /fo"Release/mod_proxy_tunnel.res" /i "../../include" /i "../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_proxy_tunnel.so" /d LONG_NAME="proxy_tunnel_module for Apache" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /out:".\Release\mod_proxy_websocket.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_websocket.so -# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_proxy_websocket.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_websocket.so /opt:ref +# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /out:".\Release\mod_proxy_tunnel.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_tunnel.so +# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_proxy_tunnel.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_tunnel.so /opt:ref # Begin Special Build Tool -TargetPath=.\Release\mod_proxy_websocket.so +TargetPath=.\Release\mod_proxy_tunnel.so SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 # End Special Build Tool -!ELSEIF "$(CFG)" == "mod_proxy_websocket - Win32 Debug" +!ELSEIF "$(CFG)" == "mod_proxy_tunnel - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 @@ -75,19 +75,19 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c -# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_proxy_websocket_src" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_proxy_tunnel_src" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" -# ADD RSC /l 0x409 /fo"Debug/mod_proxy_websocket.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_proxy_websocket.so" /d LONG_NAME="proxy_websocket_module for Apache" +# ADD RSC /l 0x409 /fo"Debug/mod_proxy_tunnel.res" /i "../../include" /i "../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_proxy_tunnel.so" /d LONG_NAME="proxy_tunnel_module for Apache" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_proxy_websocket.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_websocket.so -# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_proxy_websocket.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_websocket.so +# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_proxy_tunnel.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_tunnel.so +# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_proxy_tunnel.so" /base:@..\..\os\win32\BaseAddr.ref,mod_proxy_tunnel.so # Begin Special Build Tool -TargetPath=.\Debug\mod_proxy_websocket.so +TargetPath=.\Debug\mod_proxy_tunnel.so SOURCE="$(InputPath)" PostBuild_Desc=Embed .manifest PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 @@ -97,14 +97,14 @@ PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).ma # Begin Target -# Name "mod_proxy_websocket - Win32 Release" -# Name "mod_proxy_websocket - Win32 Debug" +# Name "mod_proxy_tunnel - Win32 Release" +# Name "mod_proxy_tunnel - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" # Begin Source File -SOURCE=.\mod_proxy_websocket.c +SOURCE=.\mod_proxy_tunnel.c # End Source File # End Group # Begin Group "Header Files" -- 2.40.0