diff -u -r packaging/source-trees/gt2-cvs/gridftp/client/source/globus_ftp_client_handle.c advisories/globus_ftp_client-2.9/globus_ftp_client_handle.c
--- packaging/source-trees/gt2-cvs/gridftp/client/source/globus_ftp_client_handle.c Sun Feb 15 01:37:28 2004
+++ advisories/globus_ftp_client-2.9/globus_ftp_client_handle.c Fri Jul 23 14:48:20 2004
@@ -1081,12 +1081,12 @@
if(cache_entry->target == GLOBUS_NULL)
{
cache_entry->target = target;
- }
globus_i_ftp_client_debug_printf(1,
(stderr, "globus_i_ftp_client_target_release() exiting\n"));
-
- return;
+
+ return;
+ }
}
}
@@ -1707,7 +1707,7 @@
node =
globus_list_search_pred(*cache,
globus_l_ftp_client_compare_canonically,
- &parsed_url);
+ &searcher);
if(node)
{
cache_entry = (globus_i_ftp_client_cache_entry_t *) node->datum;
@@ -1724,7 +1724,9 @@
searcher.want_empty = !searcher.want_empty;
}
} while(node || searcher.want_empty);
-
+
+ globus_url_destroy(&parsed_url);
+
return GLOBUS_SUCCESS;
error:
diff -u -r packaging/source-trees/gt2-cvs/gridftp/client/source/globus_ftp_client_state.c advisories/globus_ftp_client-2.9/globus_ftp_client_state.c
--- packaging/source-trees/gt2-cvs/gridftp/client/source/globus_ftp_client_state.c Mon Mar 15 19:27:41 2004
+++ advisories/globus_ftp_client-2.9/globus_ftp_client_state.c Tue Aug 10 01:12:17 2004
@@ -4,8 +4,8 @@
* Globus FTP Client Library State Machine
*
* $RCSfile: globus_ftp_client_state.c,v $
- * $Revision: 1.29.4.3 $
- * $Date: 2004/03/16 01:27:41 $
+ * $Revision: 1.29.4.4 $
+ * $Date: 2004/08/10 06:12:17 $
*/
#endif
@@ -1852,6 +1852,12 @@
{
target->state = GLOBUS_FTP_CLIENT_TARGET_SETUP_PORT;
goto redo;
+ }
+ else
+ {
+ target->state = GLOBUS_FTP_CLIENT_TARGET_SETUP_CONNECTION;
+ error = GLOBUS_I_FTP_CLIENT_ERROR_RESPONSE(response);
+ goto notify_fault;
}
}
else
diff -u -r packaging/source-trees/gt2-cvs/gridftp/client/source/pkgdata/pkg_data_src.gpt.in advisories/globus_ftp_client-2.9/pkgdata/pkg_data_src.gpt.in
--- packaging/source-trees/gt2-cvs/gridftp/client/source/pkgdata/pkg_data_src.gpt.in Mon Mar 15 19:27:43 2004
+++ advisories/globus_ftp_client-2.9/pkgdata/pkg_data_src.gpt.in Tue Aug 10 01:10:43 2004
@@ -2,7 +2,7 @@
<!DOCTYPE gpt_package_metadata SYSTEM "package.dtd">
<gpt_package_metadata Format_Version="0.02" Name="globus_ftp_client" >
- <Aging_Version Age="1" Major="2" Minor="6" />
+ <Aging_Version Age="1" Major="2" Minor="9" />
<Description >GridFTP Client Library</Description>
<Functional_Group >FileAccess</Functional_Group>
<Version_Stability Release="Experimental" Dirt="@DIRT_TIMESTAMP@-@DIRT_BRANCH_ID@" />