httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r1200612 - in /httpd/httpd/branches/input-filter-dev: include/util_filter.h modules/debugging/mod_dumpio.c modules/filters/mod_reqtimeout.c modules/ssl/ssl_engine_io.c server/core_filters.c
Date Thu, 10 Nov 2011 22:55:06 GMT
Author: pquerna
Date: Thu Nov 10 22:55:06 2011
New Revision: 1200612

URL: http://svn.apache.org/viewvc?rev=1200612&view=rev
Log:
Remove AP_MODE_INIT, it is a no-op, everywhere

Modified:
    httpd/httpd/branches/input-filter-dev/include/util_filter.h
    httpd/httpd/branches/input-filter-dev/modules/debugging/mod_dumpio.c
    httpd/httpd/branches/input-filter-dev/modules/filters/mod_reqtimeout.c
    httpd/httpd/branches/input-filter-dev/modules/ssl/ssl_engine_io.c
    httpd/httpd/branches/input-filter-dev/server/core_filters.c

Modified: httpd/httpd/branches/input-filter-dev/include/util_filter.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/input-filter-dev/include/util_filter.h?rev=1200612&r1=1200611&r2=1200612&view=diff
==============================================================================
--- httpd/httpd/branches/input-filter-dev/include/util_filter.h (original)
+++ httpd/httpd/branches/input-filter-dev/include/util_filter.h Thu Nov 10 22:55:06 2011
@@ -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;
 
 /**

Modified: httpd/httpd/branches/input-filter-dev/modules/debugging/mod_dumpio.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/input-filter-dev/modules/debugging/mod_dumpio.c?rev=1200612&r1=1200611&r2=1200612&view=diff
==============================================================================
--- httpd/httpd/branches/input-filter-dev/modules/debugging/mod_dumpio.c (original)
+++ httpd/httpd/branches/input-filter-dev/modules/debugging/mod_dumpio.c Thu Nov 10 22:55:06
2011
@@ -117,8 +117,7 @@ static void dumpit(ap_filter_t *f, apr_b
    (( 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,

Modified: httpd/httpd/branches/input-filter-dev/modules/filters/mod_reqtimeout.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/input-filter-dev/modules/filters/mod_reqtimeout.c?rev=1200612&r1=1200611&r2=1200612&view=diff
==============================================================================
--- httpd/httpd/branches/input-filter-dev/modules/filters/mod_reqtimeout.c (original)
+++ httpd/httpd/branches/input-filter-dev/modules/filters/mod_reqtimeout.c Thu Nov 10 22:55:06
2011
@@ -203,7 +203,7 @@ static apr_status_t reqtimeout_filter(ap
     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) {

Modified: httpd/httpd/branches/input-filter-dev/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/input-filter-dev/modules/ssl/ssl_engine_io.c?rev=1200612&r1=1200611&r2=1200612&view=diff
==============================================================================
--- httpd/httpd/branches/input-filter-dev/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/branches/input-filter-dev/modules/ssl/ssl_engine_io.c Thu Nov 10 22:55:06
2011
@@ -1265,7 +1265,6 @@ static apr_status_t ssl_io_filter_input(
     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(
 
     /* 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(
         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

Modified: httpd/httpd/branches/input-filter-dev/server/core_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/input-filter-dev/server/core_filters.c?rev=1200612&r1=1200611&r2=1200612&view=diff
==============================================================================
--- httpd/httpd/branches/input-filter-dev/server/core_filters.c (original)
+++ httpd/httpd/branches/input-filter-dev/server/core_filters.c Thu Nov 10 22:55:06 2011
@@ -89,20 +89,6 @@ int ap_core_input_filter(ap_filter_t *f,
     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));



Mime
View raw message