From: Jérôme <mojo@couak.net>
Date: Sun, 29 Mar 2015 20:55:18 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: 1.1~126
X-Git-Url: https://git.p6c8.net/jirafeau_mojo42.git/commitdiff_plain/1d3b28bffcd40c3bcee468b2b4cdf284dfe56a1a?ds=sidebyside;hp=--cc

Merge branch 'master' into 'master'

Add the test of HTTP_X_FORWARDED_PROTO in the is_ssl function

to test the case where Jirafeau is behind an apache reverse proxy

See merge request !2
---

1d3b28bffcd40c3bcee468b2b4cdf284dfe56a1a