Commit 5d0c8037 authored by Rainer Jung's avatar Rainer Jung
Browse files

mod_info: Fix output of server settings for 

PIPE_BUF in mod_info in the rare case that
PIPE_BUF is defined.

Backport of 1857515 from trunk.
Proposed by: rjung
Backported by: rjung
Reviewed by: rjung, jailletc36, jim


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

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.4.40



  *) mod_info: Fix output of server settings for PIPE_BUF in mod_info in

     the rare case that PIPE_BUF is defined. [Rainer Jung]



  *) mod_md: Store permissions are enforced on file creation, enforcing restrictions in

     spite of umask. Fixes <https://github.com/icing/mod_md/issues/117>. [Stefan Eissing]

STATUS

+0 −7
Original line number Diff line number Diff line
@@ -221,13 +221,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     2.4.x patch: svn merge -c 1857129,1857130 ^/httpd/httpd/trunk .

     +1: ylavic, rpluem, jim



  *) mod_info: Fix wrong use of ap_rputs with formats.

     Use ap_rprintf instead.

     It seems noone has PIPE_BUF defined.

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

     2.4.x patch: svn merge -c 1857515 ^/httpd/httpd/trunk .

     +1: rjung, jailletc36, jim



  *) mod_status: PR60647: ACC per connection not available w/ event MPM

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

     2.4.x patch: svn merge -c 1780280 ^/httpd/httpd/trunk .

modules/generators/mod_info.c

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static int show_server_settings(request_rec * r) 
#ifdef BUFFERED_LOGS

    ap_rputs(" -D BUFFERED_LOGS\n", r);

#ifdef PIPE_BUF

    ap_rputs(" -D PIPE_BUF=%ld\n", (long) PIPE_BUF, r);

    ap_rprintf(r, " -D PIPE_BUF=%ld\n", (long) PIPE_BUF);

#endif

#endif