]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #623 from ArthurHoaro/security/reverse-proxy-ban
authorArthur <arthur@hoa.ro>
Wed, 12 Oct 2016 12:48:57 +0000 (14:48 +0200)
committerGitHub <noreply@github.com>
Wed, 12 Oct 2016 12:48:57 +0000 (14:48 +0200)
Add trusted IPs in config and try to ban forwarded IP on failed login

1  2 
application/HttpUtils.php
index.php

Simple merge
diff --cc index.php
Simple merge