You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2010/10/06 12:40:53 UTC
svn commit: r1004980 - in /httpd/httpd/branches/2.2.x: STATUS
server/gen_test_char.c
Author: fuankg
Date: Wed Oct 6 10:40:52 2010
New Revision: 1004980
URL: http://svn.apache.org/viewvc?rev=1004980&view=rev
Log:
Rename macro to a better name and sync with trunk.
REviewed by: wrowe, rjung.
Modified:
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/server/gen_test_char.c
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1004980&r1=1004979&r2=1004980&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Oct 6 10:40:52 2010
@@ -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 ]
Modified: httpd/httpd/branches/2.2.x/server/gen_test_char.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/gen_test_char.c?rev=1004980&r1=1004979&r2=1004980&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/gen_test_char.c (original)
+++ httpd/httpd/branches/2.2.x/server/gen_test_char.c Wed Oct 6 10:40:52 2010
@@ -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