Merge core-8-branch

1 files changed, 5 insertions, 2 deletions

diff --git a/tests/http.test b/tests/http.test
index 9986a77..81a810c 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -46,6 +46,7 @@ if {![file exists $httpdFile]} {
 catch {package require Thread 2.7-}
 if {[catch {package present Thread}] == 0 && [file exists $httpdFile]} {
     set httpthread [thread::create -preserved]
+    lappend threadStack [list thread::release $httpthread]
     thread::send $httpthread [list source $httpdFile]
     thread::send $httpthread [list set bindata $bindata]
     thread::send $httpthread {httpd_init 0; set port} port
@@ -63,6 +64,7 @@ if {[catch {package present Thread}] == 0 && [file exists $httpdFile]} {
 	catch {unset port}
 	return
     }
+    set threadStack {}
 }
 
 if {![info exists ThreadLevel]} {
@@ -77,6 +79,7 @@ if {![info exists ThreadLevel]} {
     foreach ThreadLevel $ValueRange {
         source [info script]
     }
+    eval [lpop threadStack]
     catch {unset ThreadLevel}
     catch {unset ValueRange}
     return
@@ -1167,8 +1170,8 @@ catch {unset url}
 catch {unset badurl}
 catch {unset port}
 catch {unset data}
-if {[info exists httpthread]} {
-    thread::release $httpthread
+if {[llength $threadStack]} {
+    eval [lpop threadStack]
 } else {
     close $listen
 }