From 83da4949c099fcf7e7636c98b9052b502e1bf74b Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Fri, 13 Dec 2013 00:02:18 +0000
Subject: Allow NUM_PROXIES=0 and include more docs

---
 rest_framework/throttling.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'rest_framework/throttling.py')

diff --git a/rest_framework/throttling.py b/rest_framework/throttling.py
index 60e46d47..c40f3065 100644
--- a/rest_framework/throttling.py
+++ b/rest_framework/throttling.py
@@ -28,8 +28,12 @@ class BaseThrottle(object):
         remote_addr = request.META.get('REMOTE_ADDR')
         num_proxies = api_settings.NUM_PROXIES
 
-        if xff and num_proxies:
-            return xff.split(',')[-min(num_proxies, len(xff))].strip()
+        if num_proxies is not None:
+            if num_proxies == 0 or xff is None:
+                return remote_addr
+            addrs = xff.split(',')
+            client_addr = addrs[-min(num_proxies, len(xff))]
+            return client_addr.strip()
 
         return xff if xff else remote_addr
 
-- 
cgit v1.2.3