From 8ec686f4e2840692391ce21c6f7a7d86f180327e Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro.celaya@adidas.com>
Date: Fri, 24 Jan 2020 21:19:40 +0100
Subject: [PATCH 1/2] Updated order in which headers for remote IP detection
 are inspected

---
 config/autoload/client-detection.global.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/autoload/client-detection.global.php b/config/autoload/client-detection.global.php
index 3c6fb8b2..a49b3d93 100644
--- a/config/autoload/client-detection.global.php
+++ b/config/autoload/client-detection.global.php
@@ -7,11 +7,11 @@ return [
     'ip_address_resolution' => [
         'headers_to_inspect' => [
             'CF-Connecting-IP',
-            'True-Client-IP',
-            'X-Real-IP',
-            'Forwarded',
             'X-Forwarded-For',
             'X-Forwarded',
+            'Forwarded',
+            'True-Client-IP',
+            'X-Real-IP',
             'X-Cluster-Client-Ip',
             'Client-Ip',
         ],

From b7a34a6640365dc1c1c418de4684ebaaa5597001 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro.celaya@adidas.com>
Date: Fri, 24 Jan 2020 21:21:13 +0100
Subject: [PATCH 2/2] Updated changelog

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9a1c86a..d18995b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,29 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com), and this project adheres to [Semantic Versioning](https://semver.org).
 
+## [Unreleased]
+
+#### Added
+
+* *Nothing*
+
+#### Changed
+
+* *Nothing*
+
+#### Deprecated
+
+* *Nothing*
+
+#### Removed
+
+* *Nothing*
+
+#### Fixed
+
+* [#624](https://github.com/shlinkio/shlink/issues/624) Fixed order in which headers for remote IP detection are inspected.
+
+
 ## 2.0.2 - 2020-01-12
 
 #### Added