xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

webfs: fix url fragment bug, preserve fragment on redirect

Browse source
This commit is contained in:
cinap_lenrek 2011-10-13 18:12:55 +02:00
parent 46ecc9eff6
commit e02b84087e
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sys/src/cmd/webfs/client.c
View file

@ -73,7 +73,7 @@ clonectl(Ctl *c)
void void
clientbodyopen(Client *c, Req *r) clientbodyopen(Client *c, Req *r)
{ {
char e[ERRMAX], *next; char e[ERRMAX], *next, *frag;
int i, nauth; int i, nauth;
Url *u; Url *u;
@ -116,6 +116,11 @@ clientbodyopen(Client *c, Req *r)
} }
if((u = parseurl(next, c->url)) == nil) if((u = parseurl(next, c->url)) == nil)
goto Error; goto Error;
/* if there was a redirect, carry over the fragment */
if((frag = c->url->fragment) && u->fragment == nil){
u->fragment = estrdup(frag);
rewriteurl(u);
}
if(urldebug) if(urldebug)
fprint(2, "parseurl %s got scheme %d\n", next, u->ischeme); fprint(2, "parseurl %s got scheme %d\n", next, u->ischeme);
if(u->ischeme == USunknown){ if(u->ischeme == USunknown){

2
sys/src/cmd/webfs/url.c
View file

@ -434,7 +434,7 @@ resolve_relative(SplitUrl *su, Url *base, Url *u)
if(su->fragment.s){ if(su->fragment.s){
*purl++ = '#'; *purl++ = '#';
memmove(purl, su->query.s, su->query.e - su->query.s); memmove(purl, su->fragment.s, su->fragment.e - su->fragment.s);
purl += su->fragment.e - su->fragment.s; purl += su->fragment.e - su->fragment.s;
}else if(currentdoc && base->fragment){ }else if(currentdoc && base->fragment){
*purl++ = '#'; *purl++ = '#';