Permalink
Browse files

solaris make trouble reported by Petter Larsson

git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@822 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information...
1 parent 6842464 commit 2cdabbe08095fef3f6a8906d84c5cb38a40ae913 @klacke committed Dec 29, 2004
Showing with 4 additions and 5 deletions.
  1. +1 −1 src/Makefile
  2. +2 −1 src/mime_type_c.erl
  3. +1 −3 src/yaws_server.erl
View
@@ -52,7 +52,7 @@ yaws_vsn.erl: yaws_vsn.template ../vsn.mk
charset.def:
- echo -n $(DEFAULT_CHARSET) > charset.def
+ echo $(DEFAULT_CHARSET) > charset.def
mime_types.erl: mime.types mime_type_c.erl charset.def
$(ERL) -noshell -pa ../ebin -s mime_type_c compile
View
@@ -27,7 +27,8 @@ c() ->
case string:strip(binary_to_list(B)) of
[] ->
put(charset, []);
- CharSet ->
+ CharSet0 ->
+ CharSet = string:strip(CharSet0, both, 10),
put(charset, ";charset=" ++ CharSet)
end,
T = ets:new(aa, [set, public]),
View
@@ -1535,7 +1535,7 @@ get_client_data_len(_CliSock, 0, Bs, _SSlBool) ->
get_client_data_len(CliSock, Len, Bs, SSlBool) ->
case yaws:cli_recv(CliSock, Len, SSlBool) of
{ok, B} ->
- get_client_data_len(CliSock, Len-size(B), [Bs|B], SSlBool);
+ get_client_data_len(CliSock, Len-size(B), [Bs,B], SSlBool);
_Other ->
?Debug("get_client_data_len: ~p~n", [_Other]),
exit(normal)
@@ -2922,8 +2922,6 @@ path_info_split([H|T], Ack) ->
case Type of
regular ->
path_info_split(T, [H|Ack]);
- forbidden ->
- {false, forbidden};
X ->
{ok, lists:reverse(Ack), yaws:delall($/, H), T, X, Mime}
end

0 comments on commit 2cdabbe

Please sign in to comment.