Fixed #29186 -- Fixed pickling HttpRequest and subclasses.

2 files changed, 17 insertions, 2 deletions

diff --git a/django/http/request.py b/django/http/request.py
index d65adce756..815544368b 100644
--- a/django/http/request.py
+++ b/django/http/request.py
@@ -51,6 +51,8 @@ class HttpRequest:
     _encoding = None
     _upload_handlers = []
 
+    non_picklable_attrs = frozenset(["resolver_match", "_stream"])
+
     def __init__(self):
         # WARNING: The `WSGIRequest` subclass doesn't call `super`.
         # Any variable assignment made here should also happen in
@@ -78,6 +80,21 @@ class HttpRequest:
             self.get_full_path(),
         )
 
+    def __getstate__(self):
+        obj_dict = self.__dict__.copy()
+        for attr in self.non_picklable_attrs:
+            if attr in obj_dict:
+                del obj_dict[attr]
+        return obj_dict
+
+    def __deepcopy__(self, memo):
+        obj = copy.copy(self)
+        for attr in self.non_picklable_attrs:
+            if hasattr(self, attr):
+                setattr(obj, attr, copy.deepcopy(getattr(self, attr), memo))
+        memo[id(self)] = obj
+        return obj
+
     @cached_property
     def headers(self):
         return HttpHeaders(self.META)
diff --git a/django/http/response.py b/django/http/response.py
index 7a0dd688f7..7c0db55a5d 100644
--- a/django/http/response.py
+++ b/django/http/response.py
@@ -370,12 +370,10 @@ class HttpResponse(HttpResponseBase):
         [
             "resolver_match",
             # Non-picklable attributes added by test clients.
-            "asgi_request",
             "client",
             "context",
             "json",
             "templates",
-            "wsgi_request",
         ]
     )