From 4c5c287cfe234b8daaf8ead712edc43aa419949b Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Wed, 23 May 2012 14:54:56 +0200 Subject: [inets] Removed R14B compatible version of behaviour definition Removed R14B compatible version of (inets-service and tftp) behaviour definition. OTP-10095 --- lib/inets/doc/src/notes.xml | 10 ++++++++-- lib/inets/src/inets_app/inets.appup.src | 10 ++++++++++ lib/inets/src/inets_app/inets.mk | 6 +----- lib/inets/src/inets_app/inets_service.erl | 17 +---------------- lib/inets/src/tftp/tftp.erl | 18 +----------------- 5 files changed, 21 insertions(+), 40 deletions(-) (limited to 'lib') diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 8ed07f5c94..9a2fced12e 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -42,16 +42,22 @@ -

Better handling of errorI(s) during update of the session +

Better handling of error(s) during update of the session database.

Also added and updated some debugging functions - which_sessions/10,1 + which_sessions/0,1 and info/0.

Own Id: OTP-10093

Aux Id: Seq 12062

 + +

Removed R14B compatible version of (inets-service and + tftp) behaviour definition.

+

Own Id: OTP-10095

+ + diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index a3a3205f65..2adb2a0fc8 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -20,6 +20,8 @@ [ {"5.9", [ + {load_module, tftp, soft_purge, soft_purge, [inets_service]}, + {load_module, inets_service, soft_purge, soft_purge, []}, {load_module, httpc, soft_purge, soft_purge, [httpc_manager]}, {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]}, {update, httpc_manager, soft, soft_purge, soft_purge, []} @@ -27,6 +29,9 @@ }, {"5.8.1", [ + {load_module, tftp, soft_purge, soft_purge, [inets_service]}, + {load_module, inets_service, soft_purge, soft_purge, []}, + {load_module, http_uri, soft_purge, soft_purge, []}, {load_module, httpc_response, soft_purge, soft_purge, [http_uri]}, @@ -61,6 +66,8 @@ [ {"5.9", [ + {load_module, tftp, soft_purge, soft_purge, [inets_service]}, + {load_module, inets_service, soft_purge, soft_purge, []}, {load_module, httpc, soft_purge, soft_purge, [httpc_manager]}, {update, httpc_handler, soft, soft_purge, soft_purge, [httpc_manager]}, {update, httpc_manager, soft, soft_purge, soft_purge, []} @@ -68,6 +75,9 @@ }, {"5.8.1", [ + {load_module, tftp, soft_purge, soft_purge, [inets_service]}, + {load_module, inets_service, soft_purge, soft_purge, []}, + {load_module, http_uri, soft_purge, soft_purge, []}, {load_module, httpc_response, soft_purge, soft_purge, [http_uri]}, diff --git a/lib/inets/src/inets_app/inets.mk b/lib/inets/src/inets_app/inets.mk index d24cc0aea3..adef32dc19 100644 --- a/lib/inets/src/inets_app/inets.mk +++ b/lib/inets/src/inets_app/inets.mk @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2010-2011. All Rights Reserved. +# Copyright Ericsson AB 2010-2012. 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 @@ -33,10 +33,6 @@ ifeq ($(WARN_UNUSED_WARS), true) ERL_COMPILE_FLAGS += +warn_unused_vars endif -ifeq ($(shell erl -noshell -eval 'io:format("~4s", [erlang:system_info(otp_release)])' -s init stop), R14B) -INETS_ERL_COMPILE_FLAGS += -D'OTP-R14B-COMPILER' -endif - INETS_APP_VSN_COMPILE_FLAGS = \ +'{parse_transform,sys_pre_attributes}' \ +'{attribute,insert,app_vsn,$(APP_VSN)}' diff --git a/lib/inets/src/inets_app/inets_service.erl b/lib/inets/src/inets_app/inets_service.erl index a057a51e2c..d17fdfe13e 100644 --- a/lib/inets/src/inets_app/inets_service.erl +++ b/lib/inets/src/inets_app/inets_service.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2007-2011. All Rights Reserved. +%% Copyright Ericsson AB 2007-2012. 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 @@ -20,20 +20,6 @@ -module(inets_service). --ifdef('OTP-R14B-COMPILER'). - --export([behaviour_info/1]). - -behaviour_info(callbacks) -> - [{start_standalone, 1}, - {start_service, 1}, - {stop_service, 1}, - {services, 0}, - {service_info, 1}]; -behaviour_info(_) -> - undefined. - --else. %% Starts service stand-alone %% start_standalone(Config) -> % {ok, Pid} | {error, Reason} @@ -83,4 +69,3 @@ behaviour_info(_) -> -callback service_info(Service :: term()) -> {ok, [{Property :: term(), Value :: term()}]} | {error, Reason :: term()}. --endif. diff --git a/lib/inets/src/tftp/tftp.erl b/lib/inets/src/tftp/tftp.erl index 0d7ae1a89e..1621add246 100644 --- a/lib/inets/src/tftp/tftp.erl +++ b/lib/inets/src/tftp/tftp.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2011. All Rights Reserved. +%% Copyright Ericsson AB 2005-2012. 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 @@ -224,20 +224,6 @@ service_info/1 ]). --ifdef('OTP-R14B-COMPILER'). - --export([behaviour_info/1]). - -behaviour_info(callbacks) -> - [{prepare, 6}, - {open, 6}, - {read, 1}, - {write, 2}, - {abort, 3}]; -behaviour_info(_) -> - undefined. - --else. -type peer() :: {PeerType :: inet | inet6, PeerHost :: inet:ip_address(), @@ -280,8 +266,6 @@ behaviour_info(_) -> -callback abort(Code :: error_code(), string(), State :: term()) -> 'ok'. --endif. - -include("tftp.hrl"). -- cgit v1.2.3 From 517315f2a0f5f9f51ba6b58959f93a38ad24047c Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Wed, 23 May 2012 18:46:56 +0200 Subject: [inets] Fixed release notes OTP-10095 --- lib/inets/doc/src/notes.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 9a2fced12e..b6e8be467f 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -44,10 +44,11 @@

Better handling of error(s) during update of the session database.

-

Also added and updated some debugging functions - which_sessions/0,1 - and - info/0.

+

Also added + (which_sessions/0,1) + and updated and documented + (info/0) + some debugging functions.

Own Id: OTP-10093

Aux Id: Seq 12062

 -- cgit v1.2.3 From 6549340d9920df8f8c29223fe1853a37e30f0a41 Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Wed, 11 Jul 2012 11:07:30 +0200 Subject: [inets] Updated release notes and improved parts of the doc Updated release and improved (httpc-) documentation for KeepAlive and Pipeline timeout options. OTP-10095, OTP-10114 --- lib/inets/doc/src/notes.xml | 110 ++++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 56 deletions(-) (limited to 'lib') diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index b6e8be467f..437fa7b9d4 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -13,12 +13,12 @@ compliance with the License. You should have received a copy of the Erlang Public License along with this software. If not, it can be retrieved online at http://www.erlang.org/. - + Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License. - + Inets Release Notes @@ -32,42 +32,37 @@ notes.xml - -
Inets 5.9.1 - -
Improvements and New Features - - + +
+ Inets 5.9.1 + +
+ Improvements and New Features + + - -

Better handling of error(s) during update of the session - database.

-

Also added - (which_sessions/0,1) - and updated and documented - (info/0) - some debugging functions.

-

Own Id: OTP-10093

-

Aux Id: Seq 12062

- - - -

Removed R14B compatible version of (inets-service and + +

Removed R14B compatible version of (inets-service and tftp) behaviour definition.

Own Id: OTP-10095

- - + + + +

[httpc] Documentation of KeepAlive and Pipeline timeout + options have been improved.

+

Own Id: OTP-10114

+ - +
-
Fixed Bugs and Malfunctions - - +
+ Fixed Bugs and Malfunctions +

-

+ +
- - +
---> - +
- -
Inets 5.9 - -
Improvements and New Features - - + +
+ Inets 5.9 + +
+ Improvements and New Features + + - +

[httpd] Make the server header configurable with new config option server_tokens. -- cgit v1.2.3