X-Git-Url: http://git.plutz.net/?p=cgilite;a=blobdiff_plain;f=static.sh;h=ae8de6c3ed1dd1dad3b34f5af1dfd8c268feaec0;hp=c86ed9f971b334a5f374f5feb9857d38765a0ab9;hb=3cb6ff3e7cd50f6a6e22a9a43d5a75fc8aea1c3c;hpb=456423f02f12ac71d2d14e1abf959dafdc5eb041

diff --git a/static.sh b/static.sh
index c86ed9f..ae8de6c 100755
--- a/static.sh
+++ b/static.sh
@@ -18,19 +18,28 @@
 # along with shcgi.  If not, see <http://www.gnu.org/licenses/>. 
 
 
-unset length date file
-file="$_EXEC/static/$STATIC"
+unset length date file suffix
+file="$1"
 date="$(stat -c %Y "$file")"
 
+# allow overriding magic file recognition
+# don't use this if `file` returns type correctly
+declare -A suffix
+suffix[css]="text/css"
+
+[ -n "$HTTP_IF_MODIFIED_SINCE" ] && cachedate="$(date -d "$HTTP_IF_MODIFIED_SINCE" +%s)"
+
 if [ -x "$file" -o \! -r "$file" -o \! -f "$file" ]; then
-  printf 'HTTP/1.1 403 Forbidden\n\n'
-elif [ "$date" = "$HTTP_IF_NONE_MATCH" ]; then
-  printf 'HTTP/1.1 304 Not Modified\n\n'
+  printf 'Status:403 Forbidden\r\n\r\n'
+elif [ "$date" = "$cachedate" ]; then
+  debug "Delegating to client cache"
+  printf 'Status:304 Not Modified\r\n'
+  printf 'Last-Modified: %s\r\n\r\n' "$(date -Rd "@$date")"
 else
   length="$(stat -c %s "$file")"
-  magic="$(file -bi "$file")"
+  magic="${suffix[${file##*.}]:-$(file -bi "$file")}"
 
-  printf 'Etag: %s\r\n' "$date"
+  printf 'Last-Modified: %s\r\n' "$(date -Rd "@$date")"
   printf 'Content-Type: %s\r\n' "${magic:-all/all}"
   printf 'Content-Length: %s\r\n' "$length"
   printf '\r\n'