- fix for ap_requires removed from apache 2.4 API

[packages/apache-mod_python.git] / apache-mod_python-apache24.patch

diff --git a/apache-mod_python-apache24.patch b/apache-mod_python-apache24.patch
index 565f9e30321734fb4f968ac86a80a1178854c890..3c3967855f7aa62485aaabda17c0e938f67bdf53 100644 (file)
--- a/apache-mod_python-apache24.patch
+++ b/apache-mod_python-apache24.patch
@@ -60,3 +60,19 @@
      }
      else if (strcmp(name, "notes") == 0) {
          Py_INCREF(self->notes);
+--- mod_python-3.3.1/src/requestobject.c~      2006-12-03 05:36:37.000000000 +0100
++++ mod_python-3.3.1/src/requestobject.c       2013-06-21 00:41:47.635302626 +0200
+@@ -1230,7 +1230,12 @@
+        follow requires, e.g. "requires role terminator".
+     */
+ 
+-    const apr_array_header_t *reqs_arr = ap_requires(self->request_rec);
++    const apr_array_header_t *reqs_arr =
++#if AP_SERVER_MAJORVERSION_NUMBER > 2 || AP_SERVER_MINORVERSION_NUMBER >= 3
++    NULL;
++#else
++    ap_requires(self->request_rec);
++#endif
+     require_line *reqs;
+     int i, ti = 0;
+