From: Jim Jagielski <jim@apache.org>
Date: Mon, 20 Jul 2009 19:32:59 +0000 (+0000)
Subject: Update
X-Git-Tag: 2.2.12~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3588178ba8426466cd313e8e34cd0ece41431162;p=thirdparty%2Fapache%2Fhttpd.git

Update


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

diff --git a/STATUS b/STATUS
index 881048fa189..27d9c095222 100644
--- a/STATUS
+++ b/STATUS
@@ -85,13 +85,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * gen_test_char.c: enable building gen_test_char for running on build machine
-   when cross-compiling. The patch doesnt introduce code changes for any
-   platform unless CROSS_COMPILE is defined. 
-   Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=795438
-   2.2.x patch: http://people.apache.org/~fuankg/diffs/gen_test_char.c.diff
-   +1: fuankg, niq, jim
-
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/server/gen_test_char.c b/server/gen_test_char.c
index 59947d5888c..3835102d82d 100644
--- a/server/gen_test_char.c
+++ b/server/gen_test_char.c
@@ -14,9 +14,27 @@
  * limitations under the License.
  */
 
+#ifdef CROSS_COMPILE
+
+#define apr_isalnum(c) (isalnum(((unsigned char)(c))))
+#define apr_isalpha(c) (isalpha(((unsigned char)(c))))
+#define apr_iscntrl(c) (iscntrl(((unsigned char)(c))))
+#define apr_isprint(c) (isprint(((unsigned char)(c))))
+#include <ctype.h>
+#define APR_HAVE_STDIO_H 1
+#define APR_HAVE_STRING_H 1
+
+#else
+
 #include "apr.h"
 #include "apr_lib.h"
 
+#if defined(WIN32) || defined(OS2)
+#define WANT_WIN32_OS2
+#endif
+
+#endif
+
 #if APR_HAVE_STDIO_H
 #include <stdio.h>
 #endif
@@ -62,7 +80,7 @@ int main(int argc, char *argv[])
             printf("\n    ");
 
         /* escape_shell_cmd */
-#if defined(WIN32) || defined(OS2)
+#if defined(WANT_WIN32_OS2)
         /* 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