diff -u -r packaging/source-trees/gt2-cvs/nexus/source/nexus/pr_tcp.c advisories/globus_nexus-6.5/nexus/pr_tcp.c
--- packaging/source-trees/gt2-cvs/nexus/source/nexus/pr_tcp.c Sat Nov 8 05:09:16 2003
+++ advisories/globus_nexus-6.5/nexus/pr_tcp.c Thu Aug 12 17:19:12 2004
@@ -4,7 +4,7 @@
* pr_tcp.c - TCP/IP protocol module
*/
-static char *rcsid = "$Header: /home/globdev/CVS/globus-packages/nexus/source/nexus/pr_tcp.c,v 1.193 2003/11/08 11:09:16 link Exp $";
+static char *rcsid = "$Header: /home/globdev/CVS/globus-packages/nexus/source/nexus/pr_tcp.c,v 1.193.12.2 2004/08/12 22:19:12 link Exp $";
#include "internal.h"
@@ -2151,21 +2151,25 @@
tcp_enter();
- if(tcp_done || incoming->state == INCOMING_STATE_CLOSING)
+ if(tcp_done)
{
- /* Flush incoming data */
- res = globus_io_register_read(
- incoming->handle,
- (globus_byte_t *) incoming->storage,
- incoming->storage_size,
- 0,
- incoming_read_callback,
- (void *) incoming);
-
- assert(res == GLOBUS_SUCCESS);
-
- tcp_exit();
- return;
+ if(incoming->state != INCOMING_STATE_CLOSING &&
+ incoming->state != INCOMING_STATE_CLOSED)
+ {
+ /* Flush incoming data */
+ res = globus_io_register_read(
+ incoming->handle,
+ (globus_byte_t *) incoming->storage,
+ incoming->storage_size,
+ 0,
+ incoming_read_callback,
+ (void *) incoming);
+
+ assert(res == GLOBUS_SUCCESS);
+ }
+
+ tcp_exit();
+ return;
}
NexusAssert2(((incoming->state == INCOMING_STATE_VERSION)
@@ -2409,7 +2413,8 @@
incoming_read_callback,
(void *) incoming);
nbytes = 0;
- assert(res == GLOBUS_SUCCESS);
+ assert(res == GLOBUS_SUCCESS);
+ done = GLOBUS_TRUE;
}
/* Reset the state to get the body */
diff -u -r packaging/source-trees/gt2-cvs/nexus/source/pkgdata/pkg_data_src.gpt.in advisories/globus_nexus-6.5/pkgdata/pkg_data_src.gpt.in
--- packaging/source-trees/gt2-cvs/nexus/source/pkgdata/pkg_data_src.gpt.in Sat Nov 8 05:09:18 2003
+++ advisories/globus_nexus-6.5/pkgdata/pkg_data_src.gpt.in Tue Aug 10 23:19:48 2004
@@ -3,7 +3,7 @@
<gpt_package_metadata Name="globus_nexus" Format_Version="0.02">
- <Aging_Version Major="6" Minor="4" Age="0"/>
+ <Aging_Version Major="6" Minor="5" Age="0"/>
<Description >Nexus Library</Description>
<Functional_Group >Communication</Functional_Group>
<Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP@-@DIRT_BRANCH_ID@" />