You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2016/12/28 14:40:55 UTC

svn commit: r1776285 - /httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

Author: covener
Date: Wed Dec 28 14:40:54 2016
New Revision: 1776285

URL: http://svn.apache.org/viewvc?rev=1776285&view=rev
Log:
improve a debug message


Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

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=1776285&r1=1776284&r2=1776285&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Wed Dec 28 14:40:54 2016
@@ -467,7 +467,8 @@ static int proxy_wstunnel_handler(reques
     upgrade = apr_table_get(r->headers_in, "Upgrade");
     if (!upgrade || ap_cstr_casecmp(upgrade, "WebSocket") != 0) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02900)
-                      "declining URL %s  (not WebSocket)", url);
+                      "declining URL %s  (not WebSocket, Upgrade: header is %s)", 
+                      url, upgrade ? "missing" : upgrade);
         return DECLINED;
     }
 



Re: svn commit: r1776285 - /httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

Posted by Eric Covener <co...@gmail.com>.
On Tue, Jan 10, 2017 at 4:59 AM, Ruediger Pluem <rp...@apache.org> wrote:
>
>
> On 12/28/2016 03:40 PM, covener@apache.org wrote:
>> Author: covener
>> Date: Wed Dec 28 14:40:54 2016
>> New Revision: 1776285
>>
>> URL: http://svn.apache.org/viewvc?rev=1776285&view=rev
>> Log:
>> improve a debug message
>>
>>
>> Modified:
>>     httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
>>
>> 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=1776285&r1=1776284&r2=1776285&view=diff
>> ==============================================================================
>> --- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
>> +++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Wed Dec 28 14:40:54 2016
>> @@ -467,7 +467,8 @@ static int proxy_wstunnel_handler(reques
>>      upgrade = apr_table_get(r->headers_in, "Upgrade");
>>      if (!upgrade || ap_cstr_casecmp(upgrade, "WebSocket") != 0) {
>>          ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02900)
>> -                      "declining URL %s  (not WebSocket)", url);
>> +                      "declining URL %s  (not WebSocket, Upgrade: header is %s)",
>> +                      url, upgrade ? "missing" : upgrade);
>
> Shouldn't it be
>
> upgrade ? upgrade : "missing"

yes thanks as always!  flipped in 1778117

Re: svn commit: r1776285 - /httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

Posted by Ruediger Pluem <rp...@apache.org>.

On 12/28/2016 03:40 PM, covener@apache.org wrote:
> Author: covener
> Date: Wed Dec 28 14:40:54 2016
> New Revision: 1776285
> 
> URL: http://svn.apache.org/viewvc?rev=1776285&view=rev
> Log:
> improve a debug message
> 
> 
> Modified:
>     httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
> 
> 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=1776285&r1=1776284&r2=1776285&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
> +++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Wed Dec 28 14:40:54 2016
> @@ -467,7 +467,8 @@ static int proxy_wstunnel_handler(reques
>      upgrade = apr_table_get(r->headers_in, "Upgrade");
>      if (!upgrade || ap_cstr_casecmp(upgrade, "WebSocket") != 0) {
>          ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(02900)
> -                      "declining URL %s  (not WebSocket)", url);
> +                      "declining URL %s  (not WebSocket, Upgrade: header is %s)", 
> +                      url, upgrade ? "missing" : upgrade);

Shouldn't it be

upgrade ? upgrade : "missing"

Regards

R�diger