diff options
| author | Stefan Eissing <icing@apache.org> | 2022-02-04 12:22:26 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2022-02-04 12:22:26 +0000 |
| commit | b11e669f077f1546cdb34ab2c29a4f9289365024 (patch) | |
| tree | a3a3ab037036e5374be27aef99a6386341e51ab4 /include | |
| parent | 08cf9b83d6e1b874970dae2b02c6ff1ecb50823b (diff) | |
| download | httpd-b11e669f077f1546cdb34ab2c29a4f9289365024.tar.gz | |
*) core/mod_ssl/mpm_event: reverting changes to nonblocing SSL handshakes
to stabilize CI tests again. Previous revision of trunk has been copied
to branches/trunk-ssl-handshake-unblocking to make those into a PR where
changes can be discussed and tested separately.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897760 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 2 | ||||
| -rw-r--r-- | include/ap_mpm.h | 2 | ||||
| -rw-r--r-- | include/httpd.h | 3 | ||||
| -rw-r--r-- | include/scoreboard.h | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 6060c766d7..4fda68b1b3 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -698,8 +698,6 @@ * 20210926.2 (2.5.1-dev) Add ap_post_read_request() * 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. * 20211221.3 (2.5.1-dev) Add ap_thread_create(), ap_thread_main_create() * and ap_thread_current() * diff --git a/include/ap_mpm.h b/include/ap_mpm.h index 82075a4488..6698d0e7c6 100644 --- a/include/ap_mpm.h +++ b/include/ap_mpm.h @@ -182,8 +182,6 @@ 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 906bed6927..dfd0304093 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -465,9 +465,6 @@ 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(). */ diff --git a/include/scoreboard.h b/include/scoreboard.h index b0bdc6f13b..321b32778a 100644 --- a/include/scoreboard.h +++ b/include/scoreboard.h @@ -148,7 +148,6 @@ struct process_score { apr_uint32_t lingering_close; /* async connections in lingering close */ apr_uint32_t keep_alive; /* async connections in keep alive */ apr_uint32_t suspended; /* connections suspended by some module */ - apr_uint32_t read_line; /* async connections doing read line */ }; /* Scoreboard is now in 'local' memory, since it isn't updated once created, |