allow Server header customization (capflam)

Add the server_signature directive in the global part of configuration to allow users to customize the HTTP Server header.
GokulEvuri · May 24, 2011 · e014400 · e014400
1 parent c650d77
commit e014400
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/doc/yaws.tex b/doc/yaws.tex
@@ -2078,6 +2078,10 @@ \section{Global Part}
 
               The default value for logdir is "."
 
+\item        \verb+server_signature = String+ -
+              This directive set the "Server: " output header to the custom
+              value. The default value is "yaws/VSN, Yet Another Web Server".
+
 \item        \verb+ebin_dir = Directory+ -
               This  directive adds Directory to the \Erlang\  search
               path. It is possible to have several of these  command

diff --git a/man/yaws.conf.5 b/man/yaws.conf.5
@@ -65,6 +65,11 @@ identity of the server. Yaws also creates a file called
 ${VARDIR}/run/yaws/ctl-${ID} which contain the port number where the server is
 listening for control commands. The default id is "default".
 
+.TP
+\fBserver_signature = String\fR
+This directive set the "Server: " output header to the custom value. The default
+value is "yaws/%VSN%, Yet Another Web Server".
+
 .TP
 \fBinclude_dir = Directory\fR
 This directive adds Directory to the path of directories where the Erlang

diff --git a/src/yaws.erl b/src/yaws.erl
@@ -1331,7 +1331,7 @@ make_allow_header(Options) ->
     end.
 make_server_header() ->
     HasDav = ?sc_has_dav(get(sc)),
-    ["Server: Yaws/", yaws_generated:version(), " Yet Another Web Server\r\n" |
+    ["Server: ", (get(gc))#gconf.yaws, "\r\n" |
      if HasDav == true ->
              ["DAV: 1\r\n"];
         true ->

diff --git a/src/yaws_config.erl b/src/yaws_config.erl
@@ -885,6 +885,8 @@ fload(FD, globals, GC, C, Cs, Lno, Chars) ->
             Ysession_mod = list_to_atom(Mod_str),
             fload(FD, globals, GC#gconf{ysession_mod = Ysession_mod},
                   C, Cs, Lno+1, Next);
+        ["server_signature", '=', Signature] ->
+            fload(FD, globals, GC#gconf{yaws=Signature},C, Cs, Lno+1, Next);
         ['<', "server", Server, '>'] ->  %% first server
             PhpHandler = {cgi, GC#gconf.phpexe},
             fload(FD, server, GC,