v1.02-prebeta-261220: Minor fixes

Dockerfile

@@ -19,5 +19,5 @@ COPY www /var/www
 
 # Tell docker how to run app
 EXPOSE 80
-ENTRYPOINT boot.sh
+ENTRYPOINT ["boot.sh"] 
 

boot.sh

@@ -2,5 +2,6 @@
 
 # Boot script for docker
 
+echo "=> DEBUG: $0 $1"
 echo "=> Booting MeowMeow webserver"
-/MeowMeow/bin/MeowMeow foreground
+/MeowMeow/bin/MeowMeow foreground

config/meow.conf

@@ -1,2 +1,3 @@
+DocDir /var/www/
 ListenPort 80
 LogLevel 3

src/config.hrl

@@ -14,8 +14,8 @@
 -define(accessfile, "/etc/MeowMeow/routes.conf").
 -define(max_request_length, 10000).
 -define(mime_types_file, "mime.types").
--define(docdir, "/var/www/").
+-define(docdir, configuration:get("DocDir",string)).
 -define(chunk_size, 1400).
 -define(timeout, 10000).
 -define(configfile, "/etc/MeowMeow/meow.conf").
--define(defconf, #{"LogLevel" => "0", "KeepAlive"=> "10000", "ListenPort"=>"80"}). %% Default configuration
+-define(defconf, #{"DocDir"=>"/var/www/","LogLevel" => "0", "KeepAlive"=> "10000", "ListenPort"=>"80"}). %% Default configuration

src/parse_http.erl

@@ -1,6 +1,6 @@
 -module(parse_http).
 -export([http2map/1, mime_by_ext/1, mime_by_fname/1, update_lines/2, is_request_finished/1, make_request/1, parse_request/2, is_close/1]).
--import(util,[sget/2]).
+-import(util,[sget2/2]).
 -include("config.hrl").
 -include("request.hrl").
 
@@ -117,8 +117,9 @@ parse_request(SrcAddr, Lines) ->
 
 is_close(Request) ->
   logging:debug("Header=~p",[Request#request.header]),
-  case string:trim(sget("Connection", Request#request.header)) of
+  case string:trim(sget2("Connection", Request#request.header)) of
     {badkey, "Connection"} -> true;
+    "" -> true;
     "close" -> true;
     "keep-alive" -> false;
     Any -> logging:err("Unrecognized connection type: ~p. Either a bug or protocol violation",[Any]),