We already have ap_str_tolower(), so also add ap_str_toupper() function and use

it where possible.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1138617 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/ap_mmn.h b/include/ap_mmn.h
index f5c934645924a9b5e0e3e1fdc4800c1dcb302ebd..8e7865a785ea252b4b9f40407a5107b021f8b23e 100644 (file)
--- a/include/ap_mmn.h
+++ b/include/ap_mmn.h
@@ -336,6 +336,7 @@
  * 20110619.0 (2.3.13-dev) add async connection infos to process_score in scoreboard,
  *                         add ap_start_lingering_close(),
  *                         add conn_state_e:CONN_STATE_LINGER_NORMAL and CONN_STATE_LINGER_SHORT
+ * 20110619.1 (2.3.13-dev) add ap_str_toupper()
  */
 
 #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */
@@ -343,7 +344,7 @@
 #ifndef MODULE_MAGIC_NUMBER_MAJOR
 #define MODULE_MAGIC_NUMBER_MAJOR 20110619
 #endif
-#define MODULE_MAGIC_NUMBER_MINOR 0                    /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 1                    /* 0...n */
 
 /**
  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a

diff --git a/include/httpd.h b/include/httpd.h
index b09a9d040ff3e6cef46842c74e3266e72f0aa867..38a469bb531ad664ce137690d07ded7647de9968 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1798,6 +1798,12 @@ AP_DECLARE(void) ap_content_type_tolower(char *s);
  */
 AP_DECLARE(void) ap_str_tolower(char *s);
 
+/**
+ * convert a string to all uppercase
+ * @param s The string to convert to uppercase 
+ */
+AP_DECLARE(void) ap_str_toupper(char *s);
+
 /**
  * Search a string from left to right for the first occurrence of a 
  * specific character

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 08bd02e5311636a037982d38df02e589a101b460..f7f02b582da58056f03cf975a2921979efcae938 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -1051,11 +1051,7 @@ static int init_cache(apr_pool_t *p)
 
 static char *rewrite_mapfunc_toupper(request_rec *r, char *key)
 {
-    char *p;
-
-    for (p = key; *p; ++p) {
-        *p = apr_toupper(*p);
-    }
+    ap_str_toupper(key);
 
     return key;
 }
@@ -1849,13 +1845,10 @@ static char *lookup_variable(char *var, rewrite_ctx *ctx)
 
     /* well, do it the hard way */
     else {
-        char *p;
         apr_time_exp_t tm;
 
         /* can't do this above, because of the getenv call */
-        for (p = var; *p; ++p) {
-            *p = apr_toupper(*p);
-        }
+        ap_str_toupper(var);
 
         switch (varlen) {
         case  4:

diff --git a/os/bs2000/os.c b/os/bs2000/os.c
index d0f216459473e80a7b4356accb6704d18868cd5d..0869ff4cbf97fe8fff2273466bceca5815094c42 100644 (file)
--- a/os/bs2000/os.c
+++ b/os/bs2000/os.c
@@ -42,15 +42,6 @@ typedef enum
 
 static bs2_ForkType forktype = bs2_unknown;
 
-
-static void ap_str_toupper(char *str)
-{
-    while (*str) {
-        *str = apr_toupper(*str);
-        ++str;
-    }
-}
-
 /* Determine the method for forking off a child in such a way as to
  * set both the POSIX and BS2000 user id's to the unprivileged user.
  */

diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index db5d328e4775816a68b58a6c42cd037725511253..e29fb16d1da9cab53bdf5b7ca1321955d77382ae 100644 (file)
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -453,15 +453,6 @@ typedef enum
 
 static bs2_ForkType forktype = bs2_unknown;
 
-
-static void ap_str_toupper(char *str)
-{
-    while (*str) {
-        *str = apr_toupper(*str);
-        ++str;
-    }
-}
-
 /* Determine the method for forking off a child in such a way as to
  * set both the POSIX and BS2000 user id's to the unprivileged user.
  */

diff --git a/server/util.c b/server/util.c
index 86b7843c45faa1fc78b498ba78297791dab782c0..51e8becb93b17b6684f513a4c2747be152e26012 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -1889,6 +1889,14 @@ AP_DECLARE(void) ap_str_tolower(char *str)
     }
 }
 
+AP_DECLARE(void) ap_str_toupper(char *str)
+{
+    while (*str) {
+        *str = apr_toupper(*str);
+        ++str;
+    }
+}
+
 /*
  * We must return a FQDN
  */

diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c
index 99fb21dac0adf577f1c130496a5a70e5e1b4e707..3771caeb5e549eb91c4940713cc776ceb2f733b6 100644 (file)
--- a/server/util_expr_eval.c
+++ b/server/util_expr_eval.c
@@ -831,13 +831,8 @@ static const char *tolower_func(ap_expr_eval_ctx_t *ctx, const void *data,
 static const char *toupper_func(ap_expr_eval_ctx_t *ctx, const void *data,
                                 const char *arg)
 {
-    char *p;
     char *result = apr_pstrdup(ctx->p, arg);
-
-    for (p = result; *p; ++p) {
-         *p = apr_toupper(*p);
-    }
-
+    ap_str_toupper(result);
     return result;
 }