diff --git a/include/ts_config.hrl b/include/ts_config.hrl index 8d83faedc..9177a1e69 100644 --- a/include/ts_config.hrl +++ b/include/ts_config.hrl @@ -58,7 +58,7 @@ cur_req_id = 0, % temporary var (current real request id) file_server= [], % filenames for file_server load_loop, % loop phases if > 0 - hibernate, %% hibernate timeout (milisec) + hibernate = infinity, %% hibernate timeout (millisec) proto_opts %% tcp/udp buffer sizes }). diff --git a/include/ts_profile.hrl b/include/ts_profile.hrl index da401ee30..47b8e52eb 100644 --- a/include/ts_profile.hrl +++ b/include/ts_profile.hrl @@ -32,7 +32,7 @@ -record(match, { regexp, 'when' = false, - do = continue, %(continue | loop | stop) + do = continue, %(continue | loop | abort | log ) sleep_loop, % in seconds max_loop, loop_back, diff --git a/src/tsung-plotter/index-http.html b/src/tsung-plotter/index-http.html index e4ab37018..332430633 100644 --- a/src/tsung-plotter/index-http.html +++ b/src/tsung-plotter/index-http.html @@ -58,7 +58,7 @@

- Graphs generated by tsung-plotter, © Dimitri Fontaine, Tsung

diff --git a/src/tsung/ts_http.erl b/src/tsung/ts_http.erl index 46ff77c4f..6bcddaa6b 100644 --- a/src/tsung/ts_http.erl +++ b/src/tsung/ts_http.erl @@ -143,11 +143,12 @@ init_dynparams() -> %%---------------------------------------------------------------------- -%% Function: subst/2 -%% Purpose: Replace on the fly dynamic element of the HTTP request For +%% @spec subst(Req::#http_request{}, DynData::#dyndata{} ) -> #http_request{} +%% @doc Replace on the fly dynamic element of the HTTP request For %% the moment, we only do dynamic substitution in URL, body, %% userid, passwd, because we see no need for the other HTTP %% request parameters. +%% @end %%---------------------------------------------------------------------- subst(Req=#http_request{url=URL, body=Body, headers = Headers, userid=UserId, passwd=Passwd}, DynData) -> Req#http_request{url = ts_search:subst(URL, DynData),