From a20ad8e054e10a8b63900e65257f0196fc488e61 Mon Sep 17 00:00:00 2001
From: John Wineman <jwineman@cloudflare.com>
Date: Thu, 30 Jun 2016 17:14:07 -0700
Subject: [PATCH] Magento will now use CF-CONNECTING-IP header as the
 REMOTE_ADDR if it exists.

---
 etc/di.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 etc/di.xml

diff --git a/etc/di.xml b/etc/di.xml
new file mode 100644
index 0000000..8c52905
--- /dev/null
+++ b/etc/di.xml
@@ -0,0 +1,10 @@
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
+    <!-- Restore original visitor IP from CloudFlare header -->
+    <type name="Magento\Framework\HTTP\PhpEnvironment\RemoteAddress">
+        <arguments>
+            <argument name="alternativeHeaders" xsi:type="array">
+                <item name="http_cf_connecting_ip" xsi:type="string">HTTP_CF_CONNECTING_IP</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
\ No newline at end of file