Revert passing request_data as argument to events.

docs/release-notes/version-4.6.0.rst

@@ -196,11 +196,6 @@ New Features
   restart or shutdown. The ``--service-script`` option of ``mod_wsgi-express``
   has been updated to set the number of threads to zero.
 
-* The globally accessible per request data object accessible by calling
-  ``mod_wsgi.request_data()``, useful for tracking request metrics etc,
-  is also now explicitly passed as a keyword argument to subscribed event
-  handlers for requests.
-
 * Added ``mod_wsgi.active_requests`` dictionary. This is populated with the
   per request data object for active requests, keyed by the Apache request ID.
 

src/server/mod_wsgi.c

@@ -2118,7 +2118,9 @@ static PyObject *Adapter_start_response(AdapterObject *self, PyObject *args)
         PyDict_SetItemString(event, "response_headers", headers);
         PyDict_SetItemString(event, "exception_info", exc_info);
 
+#if 0
         PyDict_SetItemString(event, "request_data", thread_info->request_data);
+#endif
 
         wsgi_publish_event("response_started", event);
 
@@ -3126,7 +3128,9 @@ static int Adapter_run(AdapterObject *self, PyObject *object)
         PyDict_SetItemString(event, "application_start", value);
         Py_DECREF(value);
 
+#if 0
         PyDict_SetItemString(event, "request_data", thread_handle->request_data);
+#endif
 
         wsgi_publish_event("request_started", event);
 
@@ -3374,7 +3378,9 @@ static int Adapter_run(AdapterObject *self, PyObject *object)
         PyDict_SetItemString(event, "application_time", value);
         Py_DECREF(value);
 
+#if 0
         PyDict_SetItemString(event, "request_data", thread_handle->request_data);
+#endif
 
         wsgi_publish_event("request_finished", event);
 

src/server/wsgi_logger.c

@@ -704,8 +704,10 @@ void wsgi_log_python_error(request_rec *r, PyObject *log,
                 PyDict_SetItemString(event, "exception_info", object);
                 Py_DECREF(object);
 
+#if 0
                 PyDict_SetItemString(event, "request_data",
                                      thread_info->request_data);
+#endif
 
                 wsgi_publish_event("request_exception", event);