Skip to content

Commit

Permalink
Merge pull request #3214 from laboro/fix/FG-78_1.4
Browse files Browse the repository at this point in the history
FG-78: Run insecure content from websockets when HTTPS used
  • Loading branch information
ishakuta committed Nov 27, 2014
2 parents 5f77913 + d7e121d commit 31e1911
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
});
sync(new Wamp({
secure: {{ app.request.headers.get('X-Forwarded-Proto') == 'https' ? 'true' : 'false' }},
secure: {{ app.request.headers.get('X-Forwarded-Proto') == 'https' or app.request.isSecure() ? 'true' : 'false' }},
host: '{{ ws.host == '*' ? app.request.headers.get('host') : ws.host }}',
port: {{ ws.port|json_encode|raw }},
maxRetries: 3,
Expand Down

0 comments on commit 31e1911

Please sign in to comment.