Merge branch 'bmk/inets/otp_version_dependent_behaviour_def/OTP-10095' into bmk/inets/inets591_integration

5 files changed, 69 insertions, 78 deletions

diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 8ed07f5c94..3aae1ff70a 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.
-
+      
     </legalnotice>
     
     <title>Inets Release Notes</title>
@@ -32,14 +32,16 @@
     <file>notes.xml</file>
   </header>
   
-
-  <section><title>Inets 5.9.1</title>
-
-    <section><title>Improvements and New Features</title>
-<!--
-    <p>-</p>
--->
-
+  
+  <section>
+    <title>Inets 5.9.1</title>
+  
+    <section>
+      <title>Improvements and New Features</title>
+      <!--
+	  <p>-</p>
+      -->
+      
       <list>
         <item>
           <p>Better handling of errorI(s) during update of the session 
@@ -52,15 +54,27 @@
           <p>Aux Id: Seq 12062</p>
         </item>
 
+	<item>
+	  <p>Removed R14B compatible version of (inets-service and
+	  tftp) behaviour definition. </p>
+	  <p>Own Id: OTP-10095</p>
+	</item>
+	
+	<item>
+	  <p>[httpc] Documentation of KeepAlive and Pipeline timeout 
+	  options have been improved. </p>
+	  <p>Own Id: OTP-10114</p>
+	</item>
       </list>
-
+      
     </section>
 
-    <section><title>Fixed Bugs and Malfunctions</title>
-<!--
-    <p>-</p>
--->
-
+    <section>
+      <title>Fixed Bugs and Malfunctions</title>
+      <!--
+      <p>-</p>
+      -->
+	  
       <list>
         <item>
           <p>[httpc] Cancel request does not work due to incorrect 
@@ -72,37 +86,39 @@
       </list>
 
     </section>
-
-<!--
+    
     <section>
       <title>Incompatibilities</title>
       <p>-</p>
-
-      <list>
-        <item>
-          <p>[httpc|httpd] The old ssl implementation (based on OpenSSL), 
-	  has been deprecated. The config option that specified usage of 
-	  this version of the ssl app, <c>ossl</c>, has been removed. </p>
-	  <p>Own Id: OTP-9522</p>
-        </item>
-
-      </list>
-
+	
+    <!--
+	<list>
+	<item>
+	<p>[httpc|httpd] The old ssl implementation (based on OpenSSL), 
+	has been deprecated. The config option that specified usage of 
+	this version of the ssl app, <c>ossl</c>, has been removed. </p>
+	<p>Own Id: OTP-9522</p>
+	</item>
+	
+	</list>
+    -->
+	
     </section>
--->
-
+    
   </section> <!-- 5.9.1 -->
-
   
-  <section><title>Inets 5.9</title>
-
-    <section><title>Improvements and New Features</title>
-<!--
-    <p>-</p>
--->
-
+  
+  <section>
+    <title>Inets 5.9</title>
+    
+    <section>
+      <title>Improvements and New Features</title>
+      <!--
+	  <p>-</p>
+      -->
+      
       <list>
-        <item>
+	<item>
           <p>[httpd] Make the server header configurable with new config
 	  option 
 	  <seealso marker="httpd#prop_server_tokens">server_tokens</seealso>.
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").