summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-05-26 03:26:58 +0000
committerbrunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-05-26 03:26:58 +0000
commit8dea9e7da405b99d33557ea6302da325a5340bb0 (patch)
tree2d319e33b6d36eed53fd0aab8aae4a29a7d8acda
parent6f8e715b730847bb3b0f572d6da205fcca6417ed (diff)
downloadATCD-8dea9e7da405b99d33557ea6302da325a5340bb0.tar.gz
ChangeLogTag:Thu May 25 20:23:45 2000 Darrell Brunsch <brunsch@uci.edu>
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLogs/ChangeLog-02a7
-rw-r--r--ChangeLogs/ChangeLog-03a7
-rw-r--r--bin/Process_Win32.pm4
4 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5f265261c29..c4ba3bec835 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu May 25 20:23:45 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * bin/Process_Win32.pm:
+
+ The timed_wait wasn't returning the correct value if the
+ server actually timed out.
+
Thu May 25 18:21:41 2000 Steve Huston <shuston@riverace.com>
* ace/ACE.cpp (max_handles): If an ACE_LACKS_RLIMIT platform, let
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 5f265261c29..c4ba3bec835 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Thu May 25 20:23:45 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * bin/Process_Win32.pm:
+
+ The timed_wait wasn't returning the correct value if the
+ server actually timed out.
+
Thu May 25 18:21:41 2000 Steve Huston <shuston@riverace.com>
* ace/ACE.cpp (max_handles): If an ACE_LACKS_RLIMIT platform, let
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 5f265261c29..c4ba3bec835 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Thu May 25 20:23:45 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * bin/Process_Win32.pm:
+
+ The timed_wait wasn't returning the correct value if the
+ server actually timed out.
+
Thu May 25 18:21:41 2000 Steve Huston <shuston@riverace.com>
* ace/ACE.cpp (max_handles): If an ACE_LACKS_RLIMIT platform, let
diff --git a/bin/Process_Win32.pm b/bin/Process_Win32.pm
index 7caca7c494b..b7b1171228d 100644
--- a/bin/Process_Win32.pm
+++ b/bin/Process_Win32.pm
@@ -47,7 +47,9 @@ sub TimedWait
{
my $self = shift;
my $maxtime = shift;
- Win32::Process::Wait ($self->[0], $maxtime * 1000);
+ if (Win32::Process::Wait ($self->[0], $maxtime * 1000) == 0) {
+ return -1;
+ }
$status = 0;
Win32::Process::GetExitCode ($self->[0], $status);
return $status;