# HG changeset patch # User Olaf Wintermann # Date 1477213932 -7200 # Node ID a94cf2e944926d6a150c11c3bafea06f61bdb921 # Parent d7a186cf87f6a276ba9347ccb798c97f0be4736f fixes nametrans diff -r d7a186cf87f6 -r a94cf2e94492 src/server/daemon/httprequest.c --- a/src/server/daemon/httprequest.c Sun Oct 23 10:52:54 2016 +0200 +++ b/src/server/daemon/httprequest.c Sun Oct 23 11:12:12 2016 +0200 @@ -578,6 +578,9 @@ // save nsapi context // add +1 to start next round with next function rq->context.dtable_index = i + 1; + } else if(ret == REQ_PROCEED) { + char *pp = pblock_findkeyval(pb_key_ppath, rq->rq.vars); + pblock_kvinsert(pb_key_path, pp, strlen(pp), rq->rq.vars); } return ret; diff -r d7a186cf87f6 -r a94cf2e94492 src/server/safs/nametrans.c --- a/src/server/safs/nametrans.c Sun Oct 23 10:52:54 2016 +0200 +++ b/src/server/safs/nametrans.c Sun Oct 23 11:12:12 2016 +0200 @@ -147,15 +147,6 @@ uri++; } - - sstr_t ppath = util_path_append(sn->pool, dir, uri); - - pblock_kvinsert( - pb_key_ppath, - ppath.ptr, - ppath.length, - rq->vars); - request_set_path(sstr(dir), sstr(uri), rq->vars); if(name) {