diff options
| -rw-r--r-- | lib/orber/COSS/CosNaming/orber_cosnaming_utils.erl | 13 | ||||
| -rw-r--r-- | lib/orber/doc/src/notes.xml | 58 | ||||
| -rw-r--r-- | 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 @@ -33,6 +33,64 @@ </header> <section> + <title>Orber 3.6.18</title> + <section> + <title>Fixed Bugs and Malfunctions</title> + <list type="bulleted"> + <item> + <p>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.</p> + <p>Own id: OTP-8900 Aux Id: seq11704</p> + </item> + </list> + </section> + </section> + + <section> + <title>Orber 3.6.17</title> + + <section> + <title>Improvements and New Features</title> + <list type="bulleted"> + <item> + <p> + Eliminated warnings for auto-imported BIF clashes.</p> + <p> + Own Id: OTP-8840</p> + </item> + </list> + </section> + </section> + + <section> + <title>Orber 3.6.16</title> + + <section> + <title>Improvements and New Features</title> + <list type="bulleted"> + <item> + <p> + Test suites published.</p> + <p> + Own Id: OTP-8543O Aux Id:</p> + </item> + </list> + </section> + + <section> + <title>Fixed Bugs and Malfunctions</title> + <list type="bulleted"> + <item> + <p>Added missing trailing bracket to define in hrl-file.</p> + <p>Own id: OTP-8489 Aux Id:</p> + </item> + </list> + </section> + </section> + + <section> <title>Orber 3.6.15</title> <section> 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 |