Merge branch 'master' into basic-nested-serialization

1 files changed, 7 insertions, 1 deletions

diff --git a/rest_framework/request.py b/rest_framework/request.py
index 3e2fbd88..ffbbab33 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -231,11 +231,17 @@ class Request(object):
         """
         self._content_type = self.META.get('HTTP_CONTENT_TYPE',
                                            self.META.get('CONTENT_TYPE', ''))
+
         self._perform_form_overloading()
-        # if the HTTP method was not overloaded, we take the raw HTTP method
+
         if not _hasattr(self, '_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):
         """
         Return the content body of the request, as a stream.