X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=server.sh;h=c49c0d8e7f1fd1039eb147a283499c6e6aa037d3;hp=fe28169936e12dcf7ae4e052d4bb6401a2d35b90;hb=1a1d111199b770c092e1b16a7e03568d3d911b79;hpb=a6dcd4285f52bba4fd579e991393b94067aff443 diff --git a/server.sh b/server.sh index fe28169..c49c0d8 100755 --- a/server.sh +++ b/server.sh @@ -70,7 +70,7 @@ sed -unr ' ) HTTP_format(){ - LC_ALL=C sed -rn ' + LC_ALL=C sed -urn ' :A /^\r?$/!{H;n;bA} @@ -94,6 +94,6 @@ HTTP_format(){ if [ -z "$QUERY_STRING" ]; then PATH_INFO="$(printf "$(printf %s "$PATH_INFO" |sed 's:+: :g;s:\\:\\\\:g;s:%:\\x:g')")" PATH_INFO="$(invalidate "${PATH_INFO}" '(^|.*/)\.\./.*' '')" - [ -f "$_DATA/$PATH_INFO" ] && . "$_EXEC/shcgi/static.sh" "$_DATA/$PATH_INFO" + [ -f "${treeroot:-${_DATA}}/$PATH_INFO" ] && . "$_EXEC/shcgi/static.sh" "${treeroot:-${_DATA}}/$PATH_INFO" exit 0 fi |HTTP_format