Commit 5bd21f71 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1818802, r1818825 from trunk: 

mod_dumpio: do nothing below log level TRACE7.

For instance, depending on EnableMMAP/Sendfile configuration, don't split
file brigades to 8K heap buckets upon reading.



mod_dumpio: follow up to r1818802.

Negate APLOGctrace7(c) test!

Also, return DECLINED when nothing is to be done, same result as OK but
possibly more semantically correct.


Submitted by: ylavic
Reviewed by: jailletc36, jorton, ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828743 13f79535-47bb-0310-9956-ffa450edef68
parent a986919e

CHANGES

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ Changes with Apache 2.4.34 


  *) mod_md: Fix compilation with OpenSSL before version 1.0.2.  [Rainer Jung]



  *) mod_dumpio: do nothing below log level TRACE7.  [Yann Ylavic]



  *) mod_remoteip: Restore compatibility with APR 1.4 (apr_sockaddr_is_wildcard).

     [Eric Covener]

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -132,12 +132,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.4.x patch: svn merge -c 1822931,1827783 ^/httpd/httpd/trunk .

     +1: jailletc36, jorton, ylavic



  *) mod_dumpio: do nothing below log level TRACE7

     trunk patch: http://svn.apache.org/r1818802

                  http://svn.apache.org/r1818825

     2.4.x patch: svn merge -c 1818802,1818825 ^/httpd/httpd/trunk .

     +1: jailletc36, jorton, ylavic



  *) mod_ssl: Use 'ap_log_rerror()' instead of 'ap_log_error()' consistently

     PR 62003

     trunk patch: http://svn.apache.org/r1827865

modules/debugging/mod_dumpio.c

+5 −0
Original line number Diff line number Diff line
@@ -181,6 +181,11 @@ static int dumpio_pre_conn(conn_rec *c, void *csd) 
{

    dumpio_conf_t *ptr;



    if (!APLOGctrace7(c)) {

        /* Nothing to do below TRACE7 */

        return DECLINED;

    }



    ptr = (dumpio_conf_t *) ap_get_module_config(c->base_server->module_config,

                                                 &dumpio_module);