+ allow spaces in backreferences to be encoded as %20 instead of '+'.
+ [Eric Covener]
+
*) mod_ssl: bring SNI behavior into better conformance with RFC 6066:
no longer send warning-level unrecognized_name(112) alerts,
and limit startup warnings to cases where an OpenSSL version
Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml
URL:
http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml?rev=1585157&r1=1585156&r2=1585157&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml Sat Apr 5 18:40:36 2014
@@ -1189,6 +1189,14 @@ cannot use <code>$N</code> in the substi
href="../rewrite/flags.html#flag_b">details ...</a></em></td>
</tr>
<tr>
+ <td>backrefnoplus|BNP</td>
+ <td>If backreferences are being escaped, spaces should be escaped to
+ %20 instead of +. Useful when the backreference will be used in the
+ path component rather than the query string.<em><a
+ href="../rewrite/flags.html#flag_bnp">details ...</a></em></td>
+ </tr>
+
+ <tr>
<td>chain|C</td>
<td>Rule is chained to the following rule. If the rule fails,
the rule(s) chained to it will be skipped. <em><a
Modified: httpd/httpd/trunk/docs/manual/rewrite/flags.xml
URL:
http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/rewrite/flags.xml?rev=1585157&r1=1585156&r2=1585157&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/rewrite/flags.xml (original)
+++ httpd/httpd/trunk/docs/manual/rewrite/flags.xml Sat Apr 5 18:40:36 2014
@@ -71,6 +71,12 @@ characters before applying the transform
<p>In 2.4.10 and later, you can limit the escaping to specific characters
in backreferences by listing them: <code>[B=#?;]</code> </p>
+<section id="flag_bnp"><title>BNP|backrefnoplus (don't escape space to +)</title>
+<p>The [BNP] flag instructs <directive
+module="mod_rewrite">RewriteRule</directive> to escape the space character
+in a backreference to %20 rather than '+'. Useful when the backreference
+will be used in the path component rather than the query string.
+
<p><code>mod_rewrite</code> has to unescape URLs before mapping them,
so backreferences are unescaped at the time they are applied.
Using the B flag, non-alphanumeric characters in backreferences
Modified: httpd/httpd/trunk/modules/mappers/mod_rewrite.c
URL:
http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?rev=1585157&r1=1585156&r2=1585157&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_rewrite.c Sat Apr 5 18:40:36 2014
@@ -170,6 +170,7 @@ static const char* really_last_key = "re
#define RULEFLAG_DISCARDPATHINFO 1<<15
#define RULEFLAG_QSDISCARD 1<<16
#define RULEFLAG_END 1<<17
+#define RULEFLAG_ESCAPENOPLUS 1<<18
/* return code of the rewrite rule
* the result may be escaped - or not
@@ -420,7 +421,7 @@ static const char *rewritemap_mutex_type
/* Optional functions imported from mod_ssl when loaded: */
static APR_OPTIONAL_FN_TYPE(ssl_var_lookup) *rewrite_ssl_lookup = NULL;
static APR_OPTIONAL_FN_TYPE(ssl_is_https) *rewrite_is_https = NULL;
-static char *escape_uri(apr_pool_t *p, const char *path, const char *escapeme);
+static char *escape_backref(apr_pool_t *p, const char *path, const char
*escapeme, int noplus);
/*
* +-------------------------------------------------------+
@@ -629,10 +630,10 @@ static APR_INLINE unsigned char *c2x(uns
}
/*
- * Escapes a uri in a similar way as php's urlencode does.
+ * Escapes a backreference in a similar way as php's urlencode does.
* Based on ap_os_escape_path in server/util.c
*/
-static char *escape_uri(apr_pool_t *p, const char *path, const char *escapeme)
{
+static char *escape_backref(apr_pool_t *p, const char *path, const char
*escapeme, int noplus) {
char *copy = apr_palloc(p, 3 * strlen(path) + 3);
const unsigned char *s = (const unsigned char *)path;
unsigned char *d = (unsigned char *)copy;
@@ -643,7 +644,7 @@ static char *escape_uri(apr_pool_t *p, c
if (apr_isalnum(c) || c == '_') {
*d++ = c;
}
- else if (c == ' ') {
+ else if (c == ' ' && !noplus) {
*d++ = '+';
}
else {
@@ -654,7 +655,12 @@ static char *escape_uri(apr_pool_t *p, c
const char *esc = escapeme;
while (*esc) {
if (c == *esc) {
- d = c2x(c, '%', d);
+ if (c == ' ' && !noplus) {
+ *d++ = '+';
+ }
+ else {
+ d = c2x(c, '%', d);
+ }
break;
}
++esc;
@@ -2384,7 +2390,7 @@ static char *do_expand(char *input, rewr
/* escape the backreference */
char *tmp2, *tmp;
tmp = apr_pstrmemdup(pool, bri->source +
bri->regmatch[n].rm_so, span);
- tmp2 = escape_uri(pool, tmp, entry->escapes);
+ tmp2 = escape_backref(pool, tmp, entry->escapes, entry->flags
& RULEFLAG_ESCAPENOPLUS);
rewritelog((ctx->r, 5, ctx->perdir, "escaping backreference
'%s' to '%s'",
tmp, tmp2));
@@ -3435,6 +3441,9 @@ static const char *cmd_rewriterule_setfl
cfg->escapes = val;
}
}
+ else if (!strcasecmp(key, "NP") || !strcasecmp(key, "ackrefernoplus"))
{
+ cfg->flags |= RULEFLAG_ESCAPENOPLUS;
+ }
else {
++error;
}
