Skip to content

Commit

Permalink
""
Browse files Browse the repository at this point in the history
git-svn-id: https://erlyaws.svn.sourceforge.net/svnroot/erlyaws/trunk/yaws@14 9fbdc01b-0d2c-0410-bfb7-fb27d70d8b52
  • Loading branch information
Claes Wikstrom committed Feb 13, 2002
1 parent d8756fe commit 85b1da8
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 14 deletions.
9 changes: 3 additions & 6 deletions bin/yaws
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh


yawsdir=/home/share/klacke/yaws/yaws/scripts/..
yawsdir=/home/klacke/yaws/yaws/scripts/..
erl=erl


Expand All @@ -25,13 +25,10 @@ do
-i)
daemon="";;
-d)
set -x
debug=" -boot start_sasl -yaws debug "
break;;
debug=" -boot start_sasl -yaws debug ";;
-c)
conf=$1
shift
break;;
shift;;
*)
help
esac
Expand Down
10 changes: 6 additions & 4 deletions src/yaws_server.erl
Original file line number Diff line number Diff line change
Expand Up @@ -732,8 +732,8 @@ ut_open(UT) ->
ut_read(Bin = {bin, B}) ->
Bin;
ut_read(Fd) ->
{ok, B} = file:read(Fd, 4000),
B.
file:read(Fd, 4000).


ut_close({bin, _}) ->
ok;
Expand All @@ -752,7 +752,7 @@ deliver_file(CliSock, GC, SC, Req, InH, UT) ->
case Bin of
{bin, Binary} ->
tcp_send(CliSock, [make_200(), OutH, crnl(), Binary]);
Binary ->
{ok, Binary} ->
send_loop(CliSock, [make_200(), OutH, crnl(), Binary], Fd)
end,
ut_close(Fd),
Expand Down Expand Up @@ -1059,8 +1059,10 @@ suffix_type("gpj." ++ _) ->
{regular, "image/jpeg"};
suffix_type("fig." ++ _) ->
{regular, "image/gif"};
suffix_type("zg.rat" ++ _) ->
{regular, "application/x-gzip"};
suffix_type(_) ->
{regular, "*/*"}.
{regular, "application/octet-stream"}.


flush(Sock, undefined) ->
Expand Down
2 changes: 1 addition & 1 deletion www/TOPTAB
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<table border="0" cellpadding="5" cellspacing="0" height="100%">
<tr>
<td valign=top width=15% BGCOLOR="#B6B6A5">
<td valign=top width=25% BGCOLOR="#B6B6A5">
<IMG SRC="spacer.gif" width=1 height=74 ALT=""><p></p>
<A HREF="index.yaws">- Top Page</a><br><hr>
<A HREF="configuration.yaws">-Configuring and Building Yaws</a><br><hr>
Expand Down
5 changes: 2 additions & 3 deletions www/index.yaws
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,13 @@ Two separate modes of operations are supported.
<ul>
<li> Standalone mode where yaws runs as a regular webserver daemon. This is the default mode.
<li> Embedded mode wher Yaws runs as an embedded webserver in an
another erlang application. This mode is ideal when we want to build a web UI
to control an erlang application
another erlang application.
</ul>

<br>
Yaws is entirely written in <a href="http:www.erlang.org">Erlang</a>,
futhermore it is a multithreaded webserver where one Erlang light weight
processis used to handle each client.
process is used to handle each client.
<br>

Yaws has excellent capabilies to generate dynamic content. Erlang code
Expand Down

0 comments on commit 85b1da8

Please sign in to comment.