Commit bfe71bff authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Rename macro to a better name and sync with trunk. 

Reviewed by wrowe, rjung.


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

STATUS

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

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



  * gen_test_char.c: rename macro to a better name and sync with trunk.

    Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1001398

    2.2.x patch: http://people.apache.org/~fuankg/diffs/gen_test_char.c.diff

    2.0.x patch: 2.2.x patch applies with offset.

    +1: fuankg, wrowe, rjung



  * Stupid-simple patch specific to give rotatelogs the same behavior

    as the core log writer;

    +1: wrowe, rjung, sf

server/gen_test_char.c

+2 −2
Changes for server/gen_test_char.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "apr_lib.h"



#if defined(WIN32) || defined(OS2)

#define WANT_WIN32_OS2

#define NEED_ENHANCED_ESCAPES

#endif



#endif
@@ -84,7 +84,7 @@ int main(int argc, char *argv[]) 
            printf("\n    ");



        /* escape_shell_cmd */

#if defined(WANT_WIN32_OS2)

#ifdef NEED_ENHANCED_ESCAPES

        /* Win32/OS2 have many of the same vulnerable characters

         * as Unix sh, plus the carriage return and percent char.

         * The proper escaping of these characters varies from unix