diff options
| author | Micael Karlberg <[email protected]> | 2011-03-18 14:47:29 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-18 14:47:29 +0100 |
| commit | f4b5ea566829cad609e14c2264158665b84800c1 (patch) | |
| tree | 55fe591e7fc447e2bd8d5c636a7c431ee05dd15c /lib/inets/test | |
| parent | e343c5b24ca4d642f327e6ec57d63094b28b2838 (diff) | |
| parent | b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c (diff) | |
| download | otp-f4b5ea566829cad609e14c2264158665b84800c1.tar.gz otp-f4b5ea566829cad609e14c2264158665b84800c1.tar.bz2 otp-f4b5ea566829cad609e14c2264158665b84800c1.zip | |
Merge branch 'bmk/inets/httpd/make_mod_esi_deliver_accept_binary_data/OTP-9123' into bmk/inets/inet56_integration
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'lib/inets/test')
| -rw-r--r-- | lib/inets/test/httpd_mod.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/inets/test/httpd_mod.erl b/lib/inets/test/httpd_mod.erl index f2c1fd6a65..1754cec7bc 100644 --- a/lib/inets/test/httpd_mod.erl +++ b/lib/inets/test/httpd_mod.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2010. All Rights Reserved. +%% Copyright Ericsson AB 2005-2011. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -19,7 +19,6 @@ %% -module(httpd_mod). --author('[email protected]'). -include("test_server.hrl"). -include("test_server_line.hrl"). @@ -815,6 +814,8 @@ esi(Type, Port, Host, Node) -> [{statuscode, 302}, {version, "HTTP/1.0"}]), ok. + + %%-------------------------------------------------------------------- get(Type, Port, Host, Node) -> ok = httpd_test_lib:verify_request(Type, Host, Port, Node, |