aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-18 10:20:16 +0100
committerMicael Karlberg <[email protected]>2011-03-18 10:20:16 +0100
commitf10de199e5aad1aecbff03a5e7af9e1c5d017301 (patch)
tree6f86ef92bdea8a01310cb89703beb1e69c9280bd
parent5cba72579ad75f85797aae14fde94fca6acf6406 (diff)
downloadotp-f10de199e5aad1aecbff03a5e7af9e1c5d017301.tar.gz
otp-f10de199e5aad1aecbff03a5e7af9e1c5d017301.tar.bz2
otp-f10de199e5aad1aecbff03a5e7af9e1c5d017301.zip
Fixed debug macro.
Fixed appup file (not updated). Fixed application version.
-rw-r--r--lib/inets/src/http_client/httpc.erl4
-rw-r--r--lib/inets/src/inets_app/inets.appup.src28
-rw-r--r--lib/inets/vsn.mk2
3 files changed, 28 insertions, 6 deletions
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index c7f8a02a0b..b70b16f57f 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -494,10 +494,10 @@ handle_request(Method, Url,
end
catch
error:{noproc, _} ->
- ?hcrl("noproc", [{profile, Profile}]),
+ ?hcrv("noproc", [{profile, Profile}]),
{error, {not_started, Profile}};
throw:Error ->
- ?hcrl("throw", [{error, Error}]),
+ ?hcrv("throw", [{error, Error}]),
Error
end.
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 07da8ca961..65ce0cf0eb 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -18,9 +18,20 @@
{"%VSN%",
[
+ {"5.5.2",
+ [
+ {load_module, httpc, soft_purge, soft_purge, [httpc_handler]},
+ {load_module, httpc_request, soft_purge, soft_purge, []},
+ {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_request]}
+ ]
+ },
{"5.5.1",
[
- {load_module, http_chunk, soft_purge, soft_purge, []}
+ {load_module, http_chunk, soft_purge, soft_purge, []},
+ {load_module, httpc, soft_purge, soft_purge, [httpc_handler]},
+ {load_module, httpc_request, soft_purge, soft_purge, []},
+ {update, httpc_handler, soft, soft_purge, soft_purge,
+ [httpc_request,http_chunk]}
]
},
{"5.5",
@@ -34,10 +45,21 @@
]
}
],
- [
+ [
+ {"5.5.2",
+ [
+ {load_module, httpc, soft_purge, soft_purge, [httpc_handler]},
+ {load_module, httpc_request, soft_purge, soft_purge, []},
+ {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_request]}
+ ]
+ },
{"5.5.1",
[
- {load_module, http_chunk, soft_purge, soft_purge, []}
+ {load_module, http_chunk, soft_purge, soft_purge, []},
+ {load_module, httpc, soft_purge, soft_purge, [httpc_handler]},
+ {load_module, httpc_request, soft_purge, soft_purge, []},
+ {update, httpc_handler, soft, soft_purge, soft_purge,
+ [httpc_request,http_chunk]}
]
},
{"5.5",
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index b1de3fef43..c0e25a30e3 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 5.5.2
+INETS_VSN = 5.6
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"