httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fua...@apache.org
Subject svn commit: r1002901 - in /httpd/httpd/branches/2.0.x: STATUS server/gen_test_char.c
Date Thu, 30 Sep 2010 00:05:50 GMT
Author: fuankg
Date: Thu Sep 30 00:05:50 2010
New Revision: 1002901

URL: http://svn.apache.org/viewvc?rev=1002901&view=rev
Log:
enabled building gen_test_char for running on build when cross-compiling;
this does not change code for any platform unless CROSS_COMPILE is defined.
Backport of r795971 - reviewed by trawick, rjung.

Modified:
    httpd/httpd/branches/2.0.x/STATUS
    httpd/httpd/branches/2.0.x/server/gen_test_char.c

Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/STATUS?rev=1002901&r1=1002900&r2=1002901&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Thu Sep 30 00:05:50 2010
@@ -122,14 +122,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://svn.apache.org/viewvc?view=rev&revision=795971
-    Backport: http://people.apache.org/~fuankg/diffs/gen_test_char.c_httpd_2_0_x-backport-r795971.diff
-    +1: fuankg, trawick, rjung
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new

Modified: httpd/httpd/branches/2.0.x/server/gen_test_char.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/server/gen_test_char.c?rev=1002901&r1=1002900&r2=1002901&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/server/gen_test_char.c (original)
+++ httpd/httpd/branches/2.0.x/server/gen_test_char.c Thu Sep 30 00:05:50 2010
@@ -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
@@ -66,7 +84,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



Mime
View raw message