diff options
| author | Micael Karlberg <[email protected]> | 2012-01-13 13:52:03 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-01-13 13:52:03 +0100 |
| commit | 4f9b2b2b2917ffca17be3a897674ffe76011237f (patch) | |
| tree | a483aa129cea271102bc80b1ce58a943260a0d74 /lib/inets/src/inets_app | |
| parent | b1d6a39529229a98ce57f2121cbe080702e82adc (diff) | |
| parent | aaf8fc6097d612f688ca6bc2374669e4f4a08a4d (diff) | |
| download | otp-4f9b2b2b2917ffca17be3a897674ffe76011237f.tar.gz otp-4f9b2b2b2917ffca17be3a897674ffe76011237f.tar.bz2 otp-4f9b2b2b2917ffca17be3a897674ffe76011237f.zip | |
Merge branch 'bmk/inets/httpc/streaming_404/r14/OTP-9860' into bmk/inets/inets573_integration
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'lib/inets/src/inets_app')
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index f3228b9e82..84217eac78 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -21,9 +21,9 @@ {"5.7.2", [ {load_module, ftp, soft_purge, soft_purge, []}, - {update, httpc_handler, {advanced, upgrade_from_pre_4_7_3}, + {update, httpc_handler, {advanced, upgrade_from_pre_5_7_3}, soft_purge, soft_purge, []}, - {update, httpc_manager, {advanced, upgrade_from_pre_4_7_3}, + {update, httpc_manager, {advanced, upgrade_from_pre_5_7_3}, soft_purge, soft_purge, [httpc_handler]} ] }, @@ -37,9 +37,9 @@ {load_module, httpd_request, soft_purge, soft_purge, []}, {load_module, mod_responsecontrol, soft_purge, soft_purge, []}, {load_module, httpd_response, soft_purge, soft_purge, [mod_responsecontrol]}, - {update, httpc_handler, {advanced, upgrade_from_pre_4_7_3}, + {update, httpc_handler, {advanced, upgrade_from_pre_5_7_3}, soft_purge, soft_purge, []}, - {update, httpc_manager, {advanced, upgrade_from_pre_4_7_3}, + {update, httpc_manager, {advanced, upgrade_from_pre_5_7_3}, soft_purge, soft_purge, [httpc_handler]} ] }, @@ -54,19 +54,20 @@ {load_module, http_util, soft_purge, soft_purge, []}, {load_module, mod_responsecontrol, soft_purge, soft_purge, []}, {load_module, httpd_response, soft_purge, soft_purge, [mod_responsecontrol]}, - {update, httpc_handler, {advanced, upgrade_from_pre_4_7_3}, + {update, httpc_handler, {advanced, upgrade_from_pre_5_7_3}, soft_purge, soft_purge, []}, - {update, httpc_manager, {advanced, upgrade_from_pre_4_7_3}, + {update, httpc_manager, {advanced, upgrade_from_pre_5_7_3}, soft_purge, soft_purge, [httpc_handler]} ] + } ], [ {"5.7.2", [ {load_module, ftp, soft_purge, soft_purge, []}, - {update, httpc_handler, {advanced, downgrade_to_pre_4_7_3}, + {update, httpc_handler, {advanced, downgrade_to_pre_5_7_3}, soft_purge, soft_purge, []}, - {update, httpc_manager, {advanced, downgrade_to_pre_4_7_3}, + {update, httpc_manager, {advanced, downgrade_to_pre_5_7_3}, soft_purge, soft_purge, [httpc_handler]} ] }, @@ -80,9 +81,9 @@ {load_module, httpd_request, soft_purge, soft_purge, []}, {load_module, mod_responsecontrol, soft_purge, soft_purge, []}, {load_module, httpd_response, soft_purge, soft_purge, [mod_responsecontrol]}, - {update, httpc_handler, {advanced, downgrade_to_pre_4_7_3}, + {update, httpc_handler, {advanced, downgrade_to_pre_5_7_3}, soft_purge, soft_purge, []}, - {update, httpc_manager, {advanced, downgrade_to_pre_4_7_3}, + {update, httpc_manager, {advanced, downgrade_to_pre_5_7_3}, soft_purge, soft_purge, [httpc_handler]} ] }, @@ -97,9 +98,9 @@ {load_module, http_util, soft_purge, soft_purge, []}, {load_module, mod_responsecontrol, soft_purge, soft_purge, []}, {load_module, httpd_response, soft_purge, soft_purge, [mod_responsecontrol]}, - {update, httpc_handler, {advanced, downgrade_to_pre_4_7_3}, + {update, httpc_handler, {advanced, downgrade_to_pre_5_7_3}, soft_purge, soft_purge, []}, - {update, httpc_manager, {advanced, downgrade_to_pre_4_7_3}, + {update, httpc_manager, {advanced, downgrade_to_pre_5_7_3}, soft_purge, soft_purge, [httpc_handler]} ] } |