Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Remove AP_MODE_INIT, it is a no-op, everywhere

  • Loading branch information...
commit 180125728959cf8412df0b603e08da770c7bb336 1 parent 7e5428e
@pquerna pquerna authored
View
4 include/util_filter.h
@@ -56,10 +56,6 @@ typedef enum {
* Use this mode with extreme caution.
*/
AP_MODE_EXHAUSTIVE,
- /** The filter should initialize the connection if needed,
- * NNTP or FTP over SSL for example.
- */
- AP_MODE_INIT
} ap_input_mode_t;
/**
View
3  modules/debugging/mod_dumpio.c
@@ -117,8 +117,7 @@ static void dumpit(ap_filter_t *f, apr_bucket *b, dumpio_conf_t *ptr)
(( mode ) == AP_MODE_GETLINE) ? "getline" : \
(( mode ) == AP_MODE_EATCRLF) ? "eatcrlf" : \
(( mode ) == AP_MODE_SPECULATIVE) ? "speculative" : \
- (( mode ) == AP_MODE_EXHAUSTIVE) ? "exhaustive" : \
- (( mode ) == AP_MODE_INIT) ? "init" : "unknown" \
+ (( mode ) == AP_MODE_EXHAUSTIVE) ? "exhaustive" : "unknown" \
)
static int dumpio_input_filter (ap_filter_t *f, apr_bucket_brigade *bb,
View
2  modules/filters/mod_reqtimeout.c
@@ -203,7 +203,7 @@ static apr_status_t reqtimeout_filter(ap_filter_t *f,
if (rv != APR_SUCCESS)
goto out;
- if (block == APR_NONBLOCK_READ || mode == AP_MODE_INIT
+ if (block == APR_NONBLOCK_READ
|| mode == AP_MODE_EATCRLF) {
rv = ap_get_brigade(f->next, bb, mode, block, readbytes);
if (ccfg->min_rate > 0 && rv == APR_SUCCESS) {
View
10 modules/ssl/ssl_engine_io.c
@@ -1265,7 +1265,6 @@ static apr_status_t ssl_io_filter_input(ap_filter_t *f,
bio_filter_in_ctx_t *inctx = f->ctx;
const char *start = inctx->buffer; /* start of block to return */
apr_size_t len = sizeof(inctx->buffer); /* length of block to return */
- int is_init = (mode == AP_MODE_INIT);
if (f->c->aborted) {
/* XXX: Ok, if we aborted, we ARE at the EOS. We also have
@@ -1283,7 +1282,7 @@ static apr_status_t ssl_io_filter_input(ap_filter_t *f,
/* XXX: we don't currently support anything other than these modes. */
if (mode != AP_MODE_READBYTES && mode != AP_MODE_GETLINE &&
- mode != AP_MODE_SPECULATIVE && mode != AP_MODE_INIT) {
+ mode != AP_MODE_SPECULATIVE) {
return APR_ENOTIMPL;
}
@@ -1299,13 +1298,6 @@ static apr_status_t ssl_io_filter_input(ap_filter_t *f,
return ssl_io_filter_error(f, bb, status);
}
- if (is_init) {
- /* protocol module needs to handshake before sending
- * data to client (e.g. NNTP or FTP)
- */
- return APR_SUCCESS;
- }
-
if (inctx->mode == AP_MODE_READBYTES ||
inctx->mode == AP_MODE_SPECULATIVE) {
/* Protected from truncation, readbytes < MAX_SIZE_T
View
14 server/core_filters.c
@@ -89,20 +89,6 @@ int ap_core_input_filter(ap_filter_t *f, apr_bucket_brigade *b,
const char *str;
apr_size_t len;
- if (mode == AP_MODE_INIT) {
- /*
- * this mode is for filters that might need to 'initialize'
- * a connection before reading request data from a client.
- * NNTP over SSL for example needs to handshake before the
- * server sends the welcome message.
- * such filters would have changed the mode before this point
- * is reached. however, protocol modules such as NNTP should
- * not need to know anything about SSL. given the example, if
- * SSL is not in the filter chain, AP_MODE_INIT is a noop.
- */
- return APR_SUCCESS;
- }
-
if (!ctx)
{
ctx = apr_pcalloc(f->c->pool, sizeof(*ctx));

0 comments on commit 1801257

Please sign in to comment.
Something went wrong with that request. Please try again.