summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2022-01-24 17:14:42 +0100
committerGraham Leggett <minfrin@apache.org>2022-01-24 17:14:42 +0100
commit3c6a7074916ea1b6b448e2c2c196de65f878efea (patch)
treec4e72644badeda65792dc46a02b7480aa6aa18d8 /include
parentmod_reqtimeout: Set socket timeout for AP_MODE_INIT. (diff)
downloadapache2-3c6a7074916ea1b6b448e2c2c196de65f878efea.tar.xz
apache2-3c6a7074916ea1b6b448e2c2c196de65f878efea.zip
event: Add AP_MPM_CAN_AGAIN and AGAIN to signal to the MPM that
non blocking behaviour is requested. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897423 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
-rw-r--r--include/ap_mmn.h3
-rw-r--r--include/ap_mpm.h2
-rw-r--r--include/httpd.h3
3 files changed, 7 insertions, 1 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index 6dbbe5e27c..25709472db 100644
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -699,6 +699,7 @@
* 20211221.0 (2.5.1-dev) Bump PROXY_WORKER_MAX_NAME_SIZE from 256 to 384,
* add PROXY_WORKER_UDS_PATH_SIZE.
* 20211221.1 (2.5.1-dev) Add read_line to scoreboard.
+ * 20211221.2 (2.5.1-dev) Add AGAIN, AP_MPMQ_CAN_AGAIN.
*
*/
@@ -707,7 +708,7 @@
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20211221
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 1 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 2 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
diff --git a/include/ap_mpm.h b/include/ap_mpm.h
index 6698d0e7c6..82075a4488 100644
--- a/include/ap_mpm.h
+++ b/include/ap_mpm.h
@@ -182,6 +182,8 @@ AP_DECLARE(apr_status_t) ap_os_create_privileged_process(
#define AP_MPMQ_CAN_SUSPEND 17
/** MPM supports additional pollfds */
#define AP_MPMQ_CAN_POLL 18
+/** MPM reacts to AGAIN response */
+#define AP_MPMQ_CAN_AGAIN 19
/** @} */
/**
diff --git a/include/httpd.h b/include/httpd.h
index e5375d77c2..f9f36fee5b 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -464,6 +464,9 @@ AP_DECLARE(const char *) ap_get_server_built(void);
*/
#define SUSPENDED -3 /**< Module will handle the remainder of the request.
* The core will never invoke the request again, */
+#define AGAIN -4 /**< Module wants to be called again when
+ * more data is availble.
+ */
/** Returned by the bottom-most filter if no data was written.
* @see ap_pass_brigade(). */