Commit f9cc038c 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.2.x@1004980 13f79535-47bb-0310-9956-ffa450edef68
parent 864e5fb6

STATUS

+0 −5
Changes for STATUS: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -135,11 +135,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 
     2.2.x patch: trunk patch works

     +1: trawick, sf, wrowe



  * 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

    +1: fuankg, wrowe, rjung





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

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

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
@@ -80,7 +80,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