Commit 3675015a authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

Merge r727452 from trunk: 

Output -M and -S dumps (modules and vhosts) to stdout instead of stderr.

Submitted by: Dan Poirier <poirier pobox.com>
Reviewed by: rederpj, covener, rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@727616 13f79535-47bb-0310-9956-ffa450edef68
parent 5a17ad91

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.12



  *) Output -M and -S dumps (modules and vhosts) to stdout instead of stderr.

     PR 42571 and PR 44266 (dup).  [Dan Poirier <poirier pobox.com>]



  *) mod_cache: When an explicit Expires or Cache-Control header is set, cache

     normally non-cacheable response statuses. PR 46346.

     [Alex Polvi <alex polvi.net>]

STATUS

+0 −8
Changes for STATUS: 0 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -86,14 +86,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



 * Output -M and -S dumps (modules and vhosts) to stdout instead of stderr.

   PR 42571 and PR 44266 (dup).  [Dan Poirier <poirier pobox.com>]

   Trunk version of patch:

      http://svn.apache.org/viewvc?view=rev&revision=727452

   Backport version for 2.2.x of patch (trunk patch applies with offsets):

      http://people.apache.org/~rederpj/backport_PR42571_moduleVhostToStdout.diff

   +1: rederpj, covener, rpluem



PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/mappers/mod_so.c

+1 −1
Changes for modules/mappers/mod_so.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static void dump_loaded_modules(apr_pool_t *p, server_rec *s) 
        return;

    }



    apr_file_open_stderr(&out, p);

    apr_file_open_stdout(&out, p);



    apr_file_printf(out, "Loaded Modules:\n");

server/vhost.c

+1 −1
Changes for server/vhost.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ AP_DECLARE(void) ap_fini_vhost_config(apr_pool_t *p, server_rec *main_s) 
#endif

    if (ap_exists_config_define("DUMP_VHOSTS")) {

        apr_file_t *thefile = NULL;

        apr_file_open_stderr(&thefile, p);

        apr_file_open_stdout(&thefile, p);

        dump_vhost_config(thefile);

    }

}