Yaws patch

Hi!

Here is the patch, as promised. Not sure this solution is optimal but it
should work.

To be honest I've only done basic testing (bit tired by now..) so would
be good if you could give it a run before you put it out. I checked out
the 1.82 tag from github so that's the version you should apply the
patch to.

// Fabian

From 4636b0d096a061a0af6c2034446926bdba4259ed Mon Sep 17 00:00:00 2001
From: Fabian Alenius <faal@faal.(none)>
Date: Fri, 19 Jun 2009 01:17:44 +0200
Subject: [PATCH] Fixed backwards compatibility

Author: faal

src/authmod_gssapi.erl

@@ -80,7 +80,8 @@
          start/1,
          stop/0,
          auth/2,
-	 get_header/0
+	 get_header/0,
+	 out/1
         ]).
 
 -include("yaws.hrl").
@@ -124,6 +125,8 @@ stop() ->
     supervisor:terminate_child(?SUPERVISOR, ?SERVER),
     supervisor:delete_child(?SUPERVISOR, ?SERVER).
 
+out(Arg) ->
+    yaws_outmod:out(Arg).
 
 auth(Arg, Auth) when is_record(Arg, arg),
                       is_record(Auth, auth) ->

src/yaws_outmod.erl

@@ -14,7 +14,7 @@
 
 -export([out404/3,
          out404/1,
-	 out401/1,
+	 out/1,
          crashmsg/3]).
 
 
@@ -43,7 +43,7 @@ out404(Arg, GC, SC) ->
 %% a special page on 401's (it doesn't even have to be a 401)
 
 
-out401(_Arg) ->
+out(_Arg) ->
      {ehtml,
       [{html,[], 
         [

src/yaws_server.erl

@@ -1656,6 +1656,33 @@ is_redirect_map(Path, [E={Prefix, _URL, _AppendMode}|Tail]) ->
             is_redirect_map(Path, Tail)
     end.
 
+%% Find out what which module to call when urltype is unauthorized
+%% Precedence is: 
+%% 1. SC#errormod401 if it's not default
+%% 2. First authdir which prefix the requested dir and has an authmod set
+%% 3. yaws_outmod
+
+get_unauthorized_outmod(_Req_dir, _Auth_dirs, Errormod401) 
+  when Errormod401 /= yaws_outmod ->
+    Errormod401;
+
+get_unauthorized_outmod(_Req_dir, [], Errormod401) ->
+    Errormod401;
+ 
+get_unauthorized_outmod(Req_dir, [{Auth_dir, Auth}|T], Errormod401) ->
+    case lists:prefix(Auth_dir, Req_dir) of
+	true ->
+	    case Auth#auth.mod /= [] of 
+		true ->
+		    Auth#auth.mod;
+		false ->
+		    get_unauthorized_outmod(Req_dir, T, Errormod401)
+	    end;
+	false ->
+	    get_unauthorized_outmod(Req_dir, T, Errormod401)
+    end.
+    
+
 
 %% Return values:
 %% continue, done, {page, Page}
@@ -1668,13 +1695,15 @@ handle_ut(CliSock, ARG, UT = #urltype{type = unauthorized}, N) ->
     %% outh_set_dyn headers sets status to 200 by default
     %% so we need to set it 401
     yaws:outh_set_status_code(401),
+    Outmod = get_unauthorized_outmod(UT#urltype.path, SC#sconf.authdirs, SC#sconf.errormod_401),
+
     deliver_dyn_part(CliSock,
 		     0,
 		     "appmod",
 		     N,
 		     ARG,
 		     UT,
-		     fun(A)->(SC#sconf.errormod_401):out401(A)
+		     fun(A)->Outmod:out(A)
 		     end,
 		     fun(A)->finish_up_dyn_file(A, CliSock)
 		     end);