* mod_http2: the new pollset implementation is disabled when

    compiling with an APR version less than 1.6.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1895349 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/changes-entries/h2_apr16_pollset.txt b/changes-entries/h2_apr16_pollset.txt
new file mode 100644 (file)
index 0000000..bf7dd88
--- /dev/null
+++ b/changes-entries/h2_apr16_pollset.txt
@@ -0,0 +1,2 @@
+  * mod_http2: the new pollset implementation is disabled when
+    compiling with an APR version less than 1.6.

diff --git a/modules/http2/h2.h b/modules/http2/h2.h
index 860487d7b5e637faff3a691a5b0d9b0444dc5742..e5a837c728150ba4e26bcfc97c0e096397e45cb4 100644 (file)
--- a/modules/http2/h2.h
+++ b/modules/http2/h2.h
@@ -17,6 +17,8 @@
 #ifndef __mod_h2__h2__
 #define __mod_h2__h2__
 
+#include <apr_version.h>
+
 struct h2_session;
 struct h2_stream;
 
@@ -27,7 +29,7 @@ struct h2_stream;
 #ifdef H2_NO_POLL_STREAMS
 #define H2_POLL_STREAMS           0
 #else
-#define H2_POLL_STREAMS           APR_FILES_AS_SOCKETS
+#define H2_POLL_STREAMS           (APR_FILES_AS_SOCKETS && APR_VERSION_AT_LEAST(1,6,0))
 #endif
 
 /**