Mercurial > urweb

changeset 2172:3b4a5604ed97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Beautify '-h' output for web servers
author Adam Chlipala <adam@chlipala.net>
date Thu, 20 Aug 2015 15:11:40 -0400
parents 7187068f56f5
children 010ce27228f1
files src/c/http.c src/settings.sml
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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) {
--- 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