From a210e73257df9097457a339f00928e773fd9b6c4 Mon Sep 17 00:00:00 2001
From: brectanus <brectanus@9017d574-64ec-4062-9424-5e00b32a252b>
Date: Thu, 20 Dec 2007 22:59:26 +0000
Subject: [PATCH] Fixed return codes for base64Decode, base64Encode,
 compressWhitespace as well as replaceComments not adding the space for a
 comment w/o ending.  See #439.

---
 apache2/re_tfns.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/apache2/re_tfns.c b/apache2/re_tfns.c
index 1c8a0cf1..03a66664 100644
--- a/apache2/re_tfns.c
+++ b/apache2/re_tfns.c
@@ -158,13 +158,16 @@ static int msre_fn_compressWhitespace_execute(apr_pool_t *mptmp, unsigned char *
 {
     long int i, j, count;
     int changed = 0;
+    int inwhitespace = 0;
 
     i = j = count = 0;
     while(i < input_len) {
         if (isspace(input[i])||(input[i] == NBSP)) {
-            changed = 1;
+            if (inwhitespace) changed = 1;
+            inwhitespace = 1;
             count++;
         } else {
+            inwhitespace = 0;
             if (count) {
                 input[j] = ' ';
                 count = 0;
@@ -245,6 +248,10 @@ static int msre_fn_replaceComments_execute(apr_pool_t *mptmp, unsigned char *inp
         }
     }
 
+    if (incomment) {
+        input[j++] = ' ';
+    }
+
     *rval = (char *)input;
     *rval_len = j;
 
@@ -315,7 +322,7 @@ static int msre_fn_base64Encode_execute(apr_pool_t *mptmp, unsigned char *input,
     apr_base64_encode(*rval, (const char *)input, input_len);
     (*rval_len)--;
 
-    return 1;
+    return *rval_len ? 1 : 0;
 }
 
 /* base64Decode */
@@ -327,7 +334,7 @@ static int msre_fn_base64Decode_execute(apr_pool_t *mptmp, unsigned char *input,
     *rval = apr_palloc(mptmp, *rval_len);
     *rval_len = apr_base64_decode(*rval, (const char *)input);
 
-    return 1;
+    return *rval_len ? 1 : 0;
 }
 
 /* length */