BIND 10 master, updated. e909ff99007b9b9b26af58848d3fccdb25d4135d [trac678] fix the bug that alarm isn't cancelled which will blocking followed unit test

[BIND 10 source code commits]

The branch, master has been updated
       via  e909ff99007b9b9b26af58848d3fccdb25d4135d (commit)
      from  4dfa50d97a293f4ee50600805b903d8be761c9c3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e909ff99007b9b9b26af58848d3fccdb25d4135d
Author: hanfeng <ben.han.cn at gmail.com>
Date:   Wed Mar 16 20:25:37 2011 +0800

    [trac678] fix the bug that alarm isn't cancelled which will blocking followed unit test

-----------------------------------------------------------------------

Summary of changes:
 src/lib/asiolink/tests/dns_server_unittest.cc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/asiolink/tests/dns_server_unittest.cc b/src/lib/asiolink/tests/dns_server_unittest.cc
index 7b2662e..4f58652 100644
--- a/src/lib/asiolink/tests/dns_server_unittest.cc
+++ b/src/lib/asiolink/tests/dns_server_unittest.cc
@@ -354,6 +354,8 @@ class DNSServerTest : public::testing::Test {
             alarm(io_service_time_out);
             service.run();
             service.reset();
+            //cancel scheduled alarm
+            alarm(0);
             std::signal(SIGALRM, prev_handler);
         }