3 files changed, 5 insertions, 19 deletions
diff --git a/test/soap/header/server.cgi b/test/soap/header/server.cgi
index a4326828cc..2a188538d9 100644
--- a/test/soap/header/server.cgi
+++ b/test/soap/header/server.cgi
@@ -85,18 +85,18 @@ class AuthHeaderPortServer < SOAP::RPC::CGIStub
     end
 
     def on_simple_inbound(my_header, mu)
-      auth_p = false
+      succeeded = false
       userid = my_header["userid"]
       passwd = my_header["passwd"]
       if login(userid, passwd)
-	auth_p = true
+	succeeded = true
       elsif sessionid = my_header["sessionid"]
 	if userid = auth(sessionid)
 	  destroy_session(sessionid)
-	  auth_p = true
+	  succeeded = true
 	end
       end
-      raise RuntimeError.new("authentication failed") unless auth_p
+      raise RuntimeError.new("authentication failed") unless succeeded
       @userid = userid
       @sessionid = create_session(userid)
     end
diff --git a/test/soap/header/test_authheader.rb b/test/soap/header/test_authheader.rb
index 2c04769dd6..47e1e76b82 100644
--- a/test/soap/header/test_authheader.rb
+++ b/test/soap/header/test_authheader.rb
@@ -33,7 +33,7 @@ class TestAuthHeader < Test::Unit::TestCase
       super
       add_rpc_servant(AuthHeaderService.new, PortName)
       ServerAuthHeaderHandler.init
-      add_rpc_request_headerhandler(ServerAuthHeaderHandler)
+      add_request_headerhandler(ServerAuthHeaderHandler)
     end
 
     class ServerAuthHeaderHandler < SOAP::Header::SimpleHandler
@@ -162,13 +162,6 @@ class TestAuthHeader < Test::Unit::TestCase
     @t = Thread.new {
       @server.start
     }
-    while @server.status != :Running
-      sleep 0.1
-      unless @t.alive?
-	@t.join
-	raise
-      end
-    end
   end
 
   def setup_client
diff --git a/test/soap/header/test_authheader_cgi.rb b/test/soap/header/test_authheader_cgi.rb
index 03bd1bb965..d70b022ad8 100644
--- a/test/soap/header/test_authheader_cgi.rb
+++ b/test/soap/header/test_authheader_cgi.rb
@@ -72,13 +72,6 @@ class TestAuthHeaderCGI < Test::Unit::TestCase
       Thread.current.abort_on_exception = true
       @server.start
     }
-    while @server.status != :Running
-      sleep 0.1
-      unless @t.alive?
-	@t.join
-	raise
-      end
-    end
   end
 
   def setup_client