From 75c683b8b4e1e5aa4b7e4eb7a6942457fbf4b831 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Tue, 17 Jun 2014 12:32:35 +0200 Subject: [PATCH] Enclose wss proxy directives in IfModule So it should work even if mod_proxy_wstunnel isn't available (socket.io should fallback to another method like xhr-polling) --- conf/httpd_alias.conf | 6 ++++-- conf/httpd_vhost.conf | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/conf/httpd_alias.conf b/conf/httpd_alias.conf index 0673379..bde5b05 100644 --- a/conf/httpd_alias.conf +++ b/conf/httpd_alias.conf @@ -1,5 +1,7 @@ -ProxyPass /socket.io/1/websocket ws://localhost:8888/socket.io/1/websocket -ProxyPassReverse /socket.io/1/websocket ws://localhost:8888/socket.io/1/websocket + + ProxyPass /socket.io/1/websocket ws://localhost:8888/socket.io/1/websocket + ProxyPassReverse /socket.io/1/websocket ws://localhost:8888/socket.io/1/websocket + ProxyPass /socket.io/ http://localhost:8888/socket.io/ ProxyPassReverse /socket.io/ http://localhost:8888/socket.io/ AliasMatch ^/vroom/([a-z]{2}/)?(\d{10}/)?((js|css|img|fonts|snd)/.*) /opt/vroom/public/$3 diff --git a/conf/httpd_vhost.conf b/conf/httpd_vhost.conf index 0bb0d59..0acb317 100644 --- a/conf/httpd_vhost.conf +++ b/conf/httpd_vhost.conf @@ -8,8 +8,10 @@ ServerName vroom.example.com SSLEngine on DocumentRoot /opt/vroom/public - ProxyPass /socket.io/1/websocket ws://localhost:8889/socket.io/1/websocket - ProxyPassReverse /socket.io/1/websocket ws://localhost:8888/socket.io/1/websocket + + ProxyPass /socket.io/1/websocket ws://localhost:8889/socket.io/1/websocket + ProxyPassReverse /socket.io/1/websocket ws://localhost:8888/socket.io/1/websocket + ProxyPass /socket.io/ http://localhost:8888/socket.io/ ProxyPassReverse /socket.io/ http://localhost:8888/socket.io/ AliasMatch ^/([a-z]{2}/)?(\d{10}/)?((js|css|img|fonts|snd)/.*) /opt/vroom/public/$3