summaryrefslogtreecommitdiff
path: root/src/c
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-09-12 09:31:50 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-09-12 09:31:50 -0400
commit4d9fd106dfcd09caedacfbd14f4c76597cc4c5a4 (patch)
tree3bd9d7c2e18155700eee1879cdc36505ce3431d1 /src/c
parent079c22be1c6667afb0ee661bd3e0db16bc83e25a (diff)
Change string URLification to avoid using the empty string, which confuses Apache no2slash()
Diffstat (limited to 'src/c')
-rw-r--r--src/c/urweb.c27
1 files changed, 24 insertions, 3 deletions
diff --git a/src/c/urweb.c b/src/c/urweb.c
index 774c5797..d5005af2 100644
--- a/src/c/urweb.c
+++ b/src/c/urweb.c
@@ -1479,9 +1479,16 @@ char *uw_Basis_urlifyFloat(uw_context ctx, uw_Basis_float n) {
char *uw_Basis_urlifyString(uw_context ctx, uw_Basis_string s) {
char *r, *p;
- uw_check_heap(ctx, strlen(s) * 3 + 1);
+ if (s[0] == '\0')
+ return "_";
- for (r = p = ctx->heap.front; *s; s++) {
+ uw_check_heap(ctx, strlen(s) * 3 + 1 + !!(s[0] == '_'));
+
+ r = p = ctx->heap.front;
+ if (s[0] == '_')
+ *p++ = '_';
+
+ for (; *s; s++) {
char c = *s;
if (c == ' ')
@@ -1547,7 +1554,16 @@ uw_Basis_string uw_Basis_urlifyTime(uw_context ctx, uw_Basis_time t) {
}
uw_unit uw_Basis_urlifyString_w(uw_context ctx, uw_Basis_string s) {
- uw_check(ctx, strlen(s) * 3);
+ if (s[0] == '\0') {
+ uw_check(ctx, 1);
+ uw_writec_unsafe(ctx, '_');
+ return uw_unit_v;
+ }
+
+ uw_check(ctx, strlen(s) * 3 + !!(s[0] == '_'));
+
+ if (s[0] == '_')
+ uw_writec_unsafe(ctx, '_');
for (; *s; s++) {
char c = *s;
@@ -1612,6 +1628,11 @@ static uw_Basis_string uw_unurlifyString_to(uw_context ctx, char *r, char *s) {
char *s1, *s2;
int n;
+ if (*s2 == '_')
+ ++s2;
+ else if (s2[0] == '%' && s2[1] == '5' && (s2[2] == 'f' || s2[2] == 'F'))
+ s2 += 3;
+
for (s1 = r, s2 = s; *s2; ++s1, ++s2) {
char c = *s2;