svn commit: r291431 - in /httpd/apreq/trunk: include/apreq_version.h library/util.c

[jo...@apache.org]

Author: joes
Date: Sun Sep 25 08:45:12 2005
New Revision: 291431

URL: http://svn.apache.org/viewcvs?rev=291431&view=rev
Log:
Windows has a strange notion of "alphanumeric" for characters > 0x7f.

Reported by: Nikolay Ananiev

Modified:
    httpd/apreq/trunk/include/apreq_version.h
    httpd/apreq/trunk/library/util.c

Modified: httpd/apreq/trunk/include/apreq_version.h
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/include/apreq_version.h?rev=291431&r1=291430&r2=291431&view=diff
==============================================================================
--- httpd/apreq/trunk/include/apreq_version.h (original)
+++ httpd/apreq/trunk/include/apreq_version.h Sun Sep 25 08:45:12 2005
@@ -61,7 +61,7 @@
 #define APREQ_MINOR_VERSION       5
 
 /** patch level */
-#define APREQ_PATCH_VERSION       0
+#define APREQ_PATCH_VERSION       1
 
 /**
  *  This symbol is defined for internal, "development" copies of libapreq.

Modified: httpd/apreq/trunk/library/util.c
URL: http://svn.apache.org/viewcvs/httpd/apreq/trunk/library/util.c?rev=291431&r1=291430&r2=291431&view=diff
==============================================================================
--- httpd/apreq/trunk/library/util.c (original)
+++ httpd/apreq/trunk/library/util.c Sun Sep 25 08:45:12 2005
@@ -497,11 +497,13 @@
 {
     char *d = dest;
     const unsigned char *s = (const unsigned char *)src;
-    unsigned c;
+    unsigned char c;
 
     for ( ; s < (const unsigned char *)src + slen; ++s) {
         c = *s;
-        if ( apr_isalnum(c) || c == '-' || c == '.' || c == '_' || c == '~' )
+        if ( c < 0x80 && (apr_isalnum(c)
+                          || c == '-' || c == '.'
+                          || c == '_' || c == '~') )
             *d++ = c;
 
         else if ( c == ' ' )