You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2021/11/26 09:29:07 UTC
svn commit: r1895349 - in /httpd/httpd/trunk: changes-entries/h2_apr16_pollset.txt modules/http2/h2.h
Author: icing
Date: Fri Nov 26 09:29:07 2021
New Revision: 1895349
URL: http://svn.apache.org/viewvc?rev=1895349&view=rev
Log:
* mod_http2: the new pollset implementation is disabled when
compiling with an APR version less than 1.6.
Added:
httpd/httpd/trunk/changes-entries/h2_apr16_pollset.txt
Modified:
httpd/httpd/trunk/modules/http2/h2.h
Added: httpd/httpd/trunk/changes-entries/h2_apr16_pollset.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/changes-entries/h2_apr16_pollset.txt?rev=1895349&view=auto
==============================================================================
--- httpd/httpd/trunk/changes-entries/h2_apr16_pollset.txt (added)
+++ httpd/httpd/trunk/changes-entries/h2_apr16_pollset.txt Fri Nov 26 09:29:07 2021
@@ -0,0 +1,2 @@
+ * mod_http2: the new pollset implementation is disabled when
+ compiling with an APR version less than 1.6.
Modified: httpd/httpd/trunk/modules/http2/h2.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2.h?rev=1895349&r1=1895348&r2=1895349&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2.h (original)
+++ httpd/httpd/trunk/modules/http2/h2.h Fri Nov 26 09:29:07 2021
@@ -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
/**