Skip to content

Commit

Permalink
core: make sendfile behaviour switchable. Defaults to using the sendf…
Browse files Browse the repository at this point in the history
  • Loading branch information
mworrell committed Jan 16, 2014
1 parent 984c7bd commit 1fb267d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
5 changes: 4 additions & 1 deletion priv/erlang.config.in
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@
%% {perf_log_dir, "priv/log/perf/"},

%%% Location of wmtrace logs (defaults to "priv/wmtrace" if not specified).
{wmtrace_dir, "priv/log/wmtrace/"}
{wmtrace_dir, "priv/log/wmtrace/"},

%%% Which sendfile command to use: disable, yaws, erlang
{use_sendfile, yaws}

]}
].
6 changes: 5 additions & 1 deletion rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
{webzmachine, ".*", {git, "git://github.com/zotonic/webzmachine.git", {branch, "master"}}},
{z_stdlib, ".*", {git, "git://github.com/zotonic/z_stdlib.git", {branch, "master"}}},
{folsom, ".*", {git, "git://github.com/boundary/folsom.git", {branch, "master"}}},

{parse_trans, ".*", {git, "git://github.com/uwiger/parse_trans.git", {branch, "master"}}},
% {jobs, ".*", {git, "git://github.com/esl/jobs.git", {branch, "master"}}},
% {gproc, ".*", {git, "git://github.com/uwiger/gproc.git", {branch, "master"}}},
{sendfile, ".*", {git, "git://github.com/tuncer/sendfile.git", {branch, "master"}}},

% emqtt and its dependency
{elog, ".*", {git, "git://github.com/zotonic/elog.git", {branch, "master"}}},
{emqtt, ".*", {git, "git://github.com/zotonic/emqtt.git", {branch, "zotonic"}}}
Expand Down
3 changes: 2 additions & 1 deletion src/zotonic.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@
{env, []},
{applications, [kernel, stdlib, crypto, mnesia,
bert, dh_date, eiconv, lager, folsom,
mimetypes, webzmachine, z_stdlib]}
mimetypes, webzmachine, z_stdlib,
sendfile]}
]}.

0 comments on commit 1fb267d

Please sign in to comment.