svn commit: r1853908 - /httpd/httpd/trunk/modules/filters/mod_reqtimeout.c

[yl...@apache.org]

Author: ylavic
Date: Tue Feb 19 18:22:11 2019
New Revision: 1853908

URL: http://svn.apache.org/viewvc?rev=1853908&view=rev
Log:
mod_reqtimeout: follow up to r1853906: adjust hooks priorities comments.

Modified:
    httpd/httpd/trunk/modules/filters/mod_reqtimeout.c

Modified: httpd/httpd/trunk/modules/filters/mod_reqtimeout.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_reqtimeout.c?rev=1853908&r1=1853907&r2=1853908&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_reqtimeout.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_reqtimeout.c Tue Feb 19 18:22:11 2019
@@ -607,8 +607,7 @@ static void reqtimeout_hooks(apr_pool_t
 {
     /*
      * mod_ssl is AP_FTYPE_CONNECTION + 5 and mod_reqtimeout needs to
-     * be called before mod_ssl. Otherwise repeated reads during the ssl
-     * handshake can prevent the timeout from triggering.
+     * be called before mod_ssl for the handshake stage to catch SSL traffic.
      */
     ap_register_input_filter(reqtimeout_filter_name, reqtimeout_filter, NULL,
                              AP_FTYPE_CONNECTION + 8);
@@ -625,8 +624,11 @@ static void reqtimeout_hooks(apr_pool_t
      * mod_reqtimeout needs to be called before ap_process_http_request (which
      * is run at APR_HOOK_REALLY_LAST) but after all other protocol modules.
      * This ensures that it only influences normal http connections and not
-     * e.g. mod_ftp. Also, if mod_reqtimeout used the pre_connection hook, it
-     * would be inserted on mod_proxy's backend connections.
+     * e.g. mod_ftp. We still process it first though, for the handshake stage
+     * to work with/before mod_ssl, but since it's disabled by default it won't
+     * influence non-HTTP modules unless configured explicitely. Also, if
+     * mod_reqtimeout used the pre_connection hook, it would be inserted on
+     * mod_proxy's backend connections, and we don't want this.
      */
     ap_hook_process_connection(reqtimeout_init, NULL, NULL, APR_HOOK_FIRST);