# HG changeset patch
# User Adam Chlipala <adam@chlipala.net>
# Date 1440097900 14400
# Node ID 3b4a5604ed971961ef20ac450d0ff228d8b57cdd
# Parent  7187068f56f55bd6e93509bf83c2d83266720cff
Beautify '-h' output for web servers

diff -r 7187068f56f5 -r 3b4a5604ed97 src/c/http.c
--- a/src/c/http.c	Wed Aug 19 10:53:18 2015 -0400
+++ b/src/c/http.c	Thu Aug 20 15:11:40 2015 -0400
@@ -314,7 +314,7 @@
 }
 
 static void help(char *cmd) {
-  printf("Usage: %s [-p <port>] [-a <IP address>] [-t <thread count>] [-k] [-q] [-T SEC]\nThe '-k' option turns on HTTP keepalive.\nThe '-q' option turns off some chatter on stdout.\nThe -T option sets socket recv timeout (0 disables timeout, default is 5 sec)", cmd);
+  printf("Usage: %s [-p <port>] [-a <IP address>] [-t <thread count>] [-k] [-q] [-T SEC]\nThe '-k' option turns on HTTP keepalive.\nThe '-q' option turns off some chatter on stdout.\nThe '-T' option sets socket recv timeout (0 disables timeout, default is 5 sec).\n", cmd);
 }
 
 static void sigint(int signum) {
diff -r 7187068f56f5 -r 3b4a5604ed97 src/settings.sml
--- a/src/settings.sml	Wed Aug 19 10:53:18 2015 -0400
+++ b/src/settings.sml	Thu Aug 20 15:11:40 2015 -0400
@@ -883,7 +883,7 @@
             if path' = path then
                 ()
             else
-                ErrorMsg.error ("Two different files requested for URI " ^ Uri)
+                ErrorMsg.error ("Two different files requested for URI " ^ Uri ^ " ( " ^ path' ^ " vs. " ^ path ^ ")")
           | NONE =>
             let
                 val inf = BinIO.openIn path