Merge commit '8be698d02f663e3d88ef4c48adb00707d75eeaa4'

diff --combined cgilite/session.sh
index ca931fad9aa662ec338820bdc88be9f5018aba24,5b36ae032af4e818af91d4b73190a9f83614da15..5b36ae032af4e818af91d4b73190a9f83614da15
--- 1/cgilite/session.sh
--- 2/session.sh
+++ b/cgilite/session.sh
@@@ -114,6 -114,11 +114,11 @@@ SESSION_VAR() 
    fi
  }
  
+ SESSION_COOKIE() {
+   SET_COOKIE 0 session="$SESSION_KEY" Path=/ SameSite=Strict HttpOnly
+ }
+ 
  SESSION_KEY="$(update_session)"
- SET_COOKIE 0 session="$SESSION_KEY" Path=/ SameSite=Strict HttpOnly
  SESSION_ID="${SESSION_KEY%% *}"
+ 
+ [ "$1" = nocookie ] || SESSION_COOKIE

diff --combined cgilite/storage.sh
index 77ee29c06243eae9359c03125626a46f498cded4,22e6accbcba7cddd75bbaec0235a174b4aa53bd3..22e6accbcba7cddd75bbaec0235a174b4aa53bd3
--- 1/cgilite/storage.sh
--- 2/storage.sh
+++ b/cgilite/storage.sh
@@@ -66,11 -66,6 +66,6 @@@ RELEASE()
    fi
  }
  
- # STRING='
- #   s;\\;\\\\;g; s;\t;\\t;g;
- #   s;\n;\\n;g;  s;\r;\\r;g;
- #   s;\+;\\+;g;  s; ;+;g;
- # '
  STRING(){
    local in out=''
    [ $# -gt 0 ] && in="$*" || in="$(cat)"
@@@ -83,19 -78,9 +78,9 @@@
      " "*) out="${out}+"; in="${in# }" ;;
      *) out="${out}${in%%[\\${CR}${BR} + ]*}"; in="${in#"${in%%[\\${BR}${CR}   + ]*}"}" ;;
    esac; done
-   printf '%s' "$out"
+   printf '%s' "${out:-\\}"
  }
  
- UNSTRING='
-   :UNSTRING_X
-   s;((^|[^\\])(\\\\)*)\\n;\1\n;g;
-   s;((^|[^\\])(\\\\)*)\\t;\1\t;g;
-   s;((^|[^\\])(\\\\)*)\\r;\1\r;g;
-   s;((^|[^\\])(\\\\)*)\+;\1 ;g;
-   tUNSTRING_X;
-   s;((^|[^\\])(\\\\)*)\\\+;\1+;g;
-   s;\\\\;\\;g;
- '
  UNSTRING(){
    local in out=''
    [ $# -gt 0 ] && in="$*" || in="$(cat)"
@@@ -109,7 -94,7 +94,7 @@@
      \\*) in="${in#\\}" ;;
      *) out="${out}${in%%[\\+]*}"; in="${in#"${in%%[\\+]*}"}" ;;
    esac; done
-   printf '%s' "$out"
+   printf '%s\n' "$out"
  }
  
  DBM() {