EliasFleckenstein03
/
plan9front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

webfs: leave ; and / in url-query alone, add space + subsitution

front
cinap_lenrek 2011-11-19 04:31:24 +01:00
parent 79172e71e6
commit 1538024413
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/src/cmd/webfs/url.c
View File

@ -671,7 +671,7 @@ parse_query(SplitUrl *su, Url *u)
if(su->query.s == nil) if(su->query.s == nil)
return 0; return 0;
s = estredup(su->query.s, su->query.e); s = estredup(su->query.s, su->query.e);
u->query = unescapeurl(s, "&="); u->query = unescapeurl(s, "&;=/");
free(s); free(s);
return 0; return 0;
} }
@ -713,7 +713,7 @@ postparse_http(Url *u)
} }
p = escapeurl(u->path, "/"); p = escapeurl(u->path, "/");
if(u->query){ if(u->query){
q = escapeurl(u->query, "&="); q = escapeurl(u->query, "&;=/");
u->http.page_spec = emalloc(strlen(p)+1+strlen(q)+1); u->http.page_spec = emalloc(strlen(p)+1+strlen(q)+1);
strcpy(u->http.page_spec, p); strcpy(u->http.page_spec, p);
strcat(u->http.page_spec, "?"); strcat(u->http.page_spec, "?");
@ -929,7 +929,7 @@ seturlquery(Url *u, char *query)
return 0; return 0;
} }
free(u->query); free(u->query);
u->query = unescapeurl(query, "&="); u->query = unescapeurl(query, "&;=/");
return 0; return 0;
} }
@ -998,6 +998,8 @@ escapeurl(char *s, char *special)
(*s >= 'A' && *s <= 'Z') || (*s >= 'A' && *s <= 'Z') ||
strchr(".-_~", *s) || strchr(special, *s)) strchr(".-_~", *s) || strchr(special, *s))
*u++ = *s; *u++ = *s;
else if(s[0] == ' ')
*u++ = '+';
else { else {
*u++ = '%'; *u++ = '%';
*u++ = hex[(*s>>4)&0xF]; *u++ = hex[(*s>>4)&0xF];
@ -1022,7 +1024,8 @@ unescapeurl(char *s, char *special)
x = *r; x = *r;
else else
r += 2; r += 2;
} } else if(x=='+')
x = ' ';
*w++ = x; *w++ = x;
} }
*w = '\0'; *w = '\0';