PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * ap_expr: Expression parser: Add the ability to base64 encode and base64
- decode strings within the parser.
- trunk patch: http://svn.apache.org/r1457437
- http://svn.apache.org/r1457520
- 2.4.x patch: trunk patch applies.
- +1: minfrin, druggeri, rjung
-
* util_filter: Add in ap_remove_input|output_filter_byhandle()
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1458456
2.4.x patch: trunk patch works modulo ap_mmn.h
<tr><td><code>unescape</code></td>
<td>Unescape %hex encoded string, leaving encoded slashes alone;
return empty string if %00 is found</td><td></td></tr>
+ <tr><td><code>base64</code></td>
+ <td>Encode the string using base64 encoding</td><td></td></tr>
+ <tr><td><code>unbase64</code></td>
+ <td>Decode base64 encoded string, return truncated string if 0x00 is
+ found</td><td></td></tr>
<tr><td><code>file</code></td>
<td>Read contents from a file</td><td>yes</td></tr>
<tr><td><code>filesize</code></td>
return ap_escape_uri(ctx->p, arg);
}
+static const char *base64_func(ap_expr_eval_ctx_t *ctx, const void *data,
+ const char *arg)
+{
+ return ap_pbase64encode(ctx->p, (char *)arg);
+}
+
+static const char *unbase64_func(ap_expr_eval_ctx_t *ctx, const void *data,
+ const char *arg)
+{
+ return ap_pbase64decode(ctx->p, arg);
+}
+
#define MAX_FILE_SIZE 10*1024*1024
static const char *file_func(ap_expr_eval_ctx_t *ctx, const void *data,
char *arg)
{ unescape_func, "unescape", NULL, 0 },
{ file_func, "file", NULL, 1 },
{ filesize_func, "filesize", NULL, 1 },
+ { base64_func, "base64", NULL, 0 },
+ { unbase64_func, "unbase64", NULL, 0 },
{ NULL, NULL, NULL}
};
-/* XXX: base64 encode/decode ? */
static const struct expr_provider_single unary_op_providers[] = {
{ op_nz, "n", NULL, 0 },