From 64df27c91db991550bdd6c97862eb26c1c9e37bf Mon Sep 17 00:00:00 2001 From: Niclas Eklund Date: Tue, 19 Oct 2010 15:58:16 +0200 Subject: A corbaloc http string could return an EXIT message, instead of a system exception, if the HTTP server closed the socket without returning a complete message. I.e. header and a body containing a stringified IOR. --- lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl | 13 +++-- lib/orber/doc/src/notes.xml | 58 ++++++++++++++++++++++ lib/orber/vsn.mk | 13 ++++- 3 files changed, 79 insertions(+), 5 deletions(-) diff --git a/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl b/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl index 7792839e22..768653c898 100644 --- a/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl +++ b/lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl @@ -2,7 +2,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1999-2009. All Rights Reserved. +%% Copyright Ericsson AB 1999-2010. 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 @@ -536,8 +536,15 @@ lookup(_, _Ctx) -> receive_msg(Socket, Acc, Timeout) -> receive {tcp_closed, Socket} -> - [_Header, Body] = re:split(Acc,"\r\n\r\n",[{return,list}]), - Body; + case re:split(Acc,"\r\n\r\n",[{return,list}]) of + [_Header, Body] -> + Body; + What -> + orber:dbg("[~p] orber_cosnaming_utils:receive_msg();~n" + "HTTP server closed the connection before sending a complete reply: ~p.", + [?LINE, What], ?DEBUG_LEVEL), + corba:raise(#'COMM_FAILURE'{completion_status=?COMPLETED_NO}) + end; {tcp, Socket, Response} -> receive_msg(Socket, Acc ++ Response, Timeout); {tcp_error, Socket, Reason} -> diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml index d388cc42a8..96fcc45e26 100644 --- a/lib/orber/doc/src/notes.xml +++ b/lib/orber/doc/src/notes.xml @@ -32,6 +32,64 @@ notes.xml +
+ Orber 3.6.18 +
+ Fixed Bugs and Malfunctions + + +

A corbaloc http string could return an EXIT message, instead + of a system exception, if the HTTP server closed the socket + without returning a complete message. I.e. header and a body + containing a stringified IOR.

+

Own id: OTP-8900 Aux Id: seq11704

+ + +
+
+ +
+ Orber 3.6.17 + +
+ Improvements and New Features + + +

+ Eliminated warnings for auto-imported BIF clashes.

+

+ Own Id: OTP-8840

+ + +
+
+ +
+ Orber 3.6.16 + +
+ Improvements and New Features + + +

+ Test suites published.

+

+ Own Id: OTP-8543O Aux Id:

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

Added missing trailing bracket to define in hrl-file.

+

Own id: OTP-8489 Aux Id:

+ + +
+
+
Orber 3.6.15 diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk index d074bfb86c..c405326e9a 100644 --- a/lib/orber/vsn.mk +++ b/lib/orber/vsn.mk @@ -1,7 +1,14 @@ -ORBER_VSN = 3.6.15 +ORBER_VSN = 3.6.18 -TICKETS = OTP-8353 \ +TICKETS = OTP-8900 + +TICKETS_3.6.17 = OTP-8840 + +TICKETS_3.6.16 = OTP-8543 \ + OTP-8489 + +TICKETS_3.6.15 = OTP-8353 \ OTP-8354 \ OTP-8374 \ OTP-8409 \ @@ -9,6 +16,8 @@ TICKETS = OTP-8353 \ TICKETS_3.6.14 = OTP-8201 +TICKETS_3.6.14 = OTP-8201 + TICKETS_3.6.13 = OTP-7987 TICKETS_3.6.12 = OTP-7906 -- cgit v1.2.3 From 4a249009a3944383ff16a4610ee4aa5538c9b156 Mon Sep 17 00:00:00 2001 From: Niclas Eklund Date: Wed, 27 Oct 2010 13:30:31 +0200 Subject: Incorrect TR tag. --- lib/orber/doc/src/notes.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml index 96fcc45e26..6eda16a517 100644 --- a/lib/orber/doc/src/notes.xml +++ b/lib/orber/doc/src/notes.xml @@ -42,7 +42,7 @@ of a system exception, if the HTTP server closed the socket without returning a complete message. I.e. header and a body containing a stringified IOR.

-

Own id: OTP-8900 Aux Id: seq11704

+

Own Id: OTP-8900 Aux Id: seq11704

@@ -84,7 +84,7 @@

Added missing trailing bracket to define in hrl-file.

-

Own id: OTP-8489 Aux Id:

+

Own Id: OTP-8489 Aux Id:

 @@ -123,11 +123,11 @@

Removed superfluous VT in the documentation.

-

Own id: OTP-8353 Aux Id:

+

Own Id: OTP-8353 Aux Id:

Removed superfluous backslash in the documentation.

-

Own id: OTP-8354 Aux Id:

+

Own Id: OTP-8354 Aux Id:

 @@ -159,7 +159,7 @@

Obsolete guards, e.g. record vs is_record, has been changed to avoid compiler warnings.

-

Own id: OTP-7987

+

Own Id: OTP-7987

 @@ -177,7 +177,7 @@ Naming Service (INS) instead. INS is a part of the OMG standard specification.

*** POTENTIAL INCOMPATIBILITY ***

-

Own id: OTP-7906 Aux Id: seq11243

+

Own Id: OTP-7906 Aux Id: seq11243

@@ -191,7 +191,7 @@

Updated file headers.

-

Own id: OTP-7837

+

Own Id: OTP-7837

 @@ -205,7 +205,7 @@

Documentation source included in open source releases.

-

Own id: OTP-7595

+

Own Id: OTP-7595

 @@ -219,11 +219,11 @@

Updated file headers.

-

Own id: OTP-7011

+

Own Id: OTP-7011

Now compliant with the new behavior of stdlib.

-

Own id: OTP-7030 Aux Id: seq10827

+

Own Id: OTP-7030 Aux Id: seq10827

 -- cgit v1.2.3