mirror of
https://github.com/apache/httpd.git
synced 2025-08-10 02:56:11 +00:00
NET_TIME, as a standalone feature, was a horrid idea.
The core filter will NOT operate correctly across platforms (even between Linux/Solaris) without setting up the conn->timeout, so always apply the timeout when establishing the core filter. The keep-alive-timeout is entirely an HTTP-ism, and needs to move to the http protocol handler. Note #1; this isn't triggered in the event mpm, but the event mpm introspects s->keep_alive_timeout directly adding it to the pollset, so this is a non-sequitor. Finally, once the headers are read, the named virtual host may have a different (more/less permissive) timeout for the remainder of the request body. This http-centric patch picks up that subtle detail and can switch to a named-vhost timeout. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@306495 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@ -600,9 +600,6 @@ AP_CORE_DECLARE(void) ap_add_file_conf(core_dir_config *conf, void *url_config);
|
||||
AP_CORE_DECLARE_NONSTD(const char *) ap_limit_section(cmd_parms *cmd, void *dummy, const char *arg);
|
||||
|
||||
/* Core filters; not exported. */
|
||||
int ap_net_time_filter(ap_filter_t *f, apr_bucket_brigade *b,
|
||||
ap_input_mode_t mode, apr_read_type_e block,
|
||||
apr_off_t readbytes);
|
||||
int ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b,
|
||||
ap_input_mode_t mode, apr_read_type_e block,
|
||||
apr_off_t readbytes);
|
||||
@ -641,7 +638,6 @@ typedef struct {
|
||||
extern AP_DECLARE_DATA ap_filter_rec_t *ap_subreq_core_filter_handle;
|
||||
extern AP_DECLARE_DATA ap_filter_rec_t *ap_core_output_filter_handle;
|
||||
extern AP_DECLARE_DATA ap_filter_rec_t *ap_content_length_filter_handle;
|
||||
extern AP_DECLARE_DATA ap_filter_rec_t *ap_net_time_filter_handle;
|
||||
extern AP_DECLARE_DATA ap_filter_rec_t *ap_core_input_filter_handle;
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user