From 9dccbcbb3800f83149edf08330f6926659bc5d73 Mon Sep 17 00:00:00 2001
From: Dave Kuhn
Date: Sun, 3 Mar 2013 00:00:58 +1100
Subject: Support for X-HTTP-Method-Override header

---
 rest_framework/request.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'rest_framework/request.py')

diff --git a/rest_framework/request.py b/rest_framework/request.py
index 3e2fbd88..4cdc8b73 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -231,9 +231,15 @@ class Request(object):
         """
         self._content_type = self.META.get('HTTP_CONTENT_TYPE',
                                            self.META.get('CONTENT_TYPE', ''))
+
+        # Look for method override in header
+        self._method = self.META.get('HTTP_X_HTTP_METHOD_OVERRIDE', None)
+        if self._method:
+            return
+
         self._perform_form_overloading()
         # if the HTTP method was not overloaded, we take the raw HTTP method
-        if not _hasattr(self, '_method'):
+        if self._method:
             self._method = self._request.method
 
     def _load_stream(self):
-- 
cgit v1.2.3


From 104614c600a391b2d416074f3929e543b86a8492 Mon Sep 17 00:00:00 2001
From: Dave Kuhn
Date: Mon, 4 Mar 2013 07:14:38 +1100
Subject: Modified to allow form overloading to take precedence over header.

---
 rest_framework/request.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'rest_framework/request.py')

diff --git a/rest_framework/request.py b/rest_framework/request.py
index 4cdc8b73..f26d934d 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -232,15 +232,12 @@ class Request(object):
         self._content_type = self.META.get('HTTP_CONTENT_TYPE',
                                            self.META.get('CONTENT_TYPE', ''))
 
-        # Look for method override in header
-        self._method = self.META.get('HTTP_X_HTTP_METHOD_OVERRIDE', None)
-        if self._method:
-            return
-
         self._perform_form_overloading()
-        # if the HTTP method was not overloaded, we take the raw HTTP method
-        if self._method:
-            self._method = self._request.method
+        if not _hasattr(self, '_method'):
+            # Method wasn't overloaded by hidden form element, so look for 
+            # method override in header. If not present default to raw HTTP method
+            self._method = self.META.get('HTTP_X_HTTP_METHOD_OVERRIDE', 
+                                         self._request.method)
 
     def _load_stream(self):
         """
-- 
cgit v1.2.3


From 377dc2cda2c3a7aa02f5d761631f73c58745ed9d Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 12 Mar 2013 20:49:20 +0000
Subject: Only honor X-HTTP-Method-Override for POST requests.

---
 rest_framework/request.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'rest_framework/request.py')

diff --git a/rest_framework/request.py b/rest_framework/request.py
index f26d934d..ffbbab33 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -233,11 +233,14 @@ class Request(object):
                                            self.META.get('CONTENT_TYPE', ''))
 
         self._perform_form_overloading()
+
         if not _hasattr(self, '_method'):
-            # Method wasn't overloaded by hidden form element, so look for 
-            # method override in header. If not present default to raw HTTP method
-            self._method = self.META.get('HTTP_X_HTTP_METHOD_OVERRIDE', 
-                                         self._request.method)
+            self._method = self._request.method
+
+            if self._method == 'POST':
+                # Allow X-HTTP-METHOD-OVERRIDE header
+                self._method = self.META.get('HTTP_X_HTTP_METHOD_OVERRIDE',
+                                             self._method)
 
     def _load_stream(self):
         """
-- 
cgit v1.2.3