Fix #247

JuliaWeb · Jun 4, 2018 · 1ac16e7 · 1ac16e7
1 parent 4e64c07
commit 1ac16e7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/ConnectionPool.jl b/src/ConnectionPool.jl
@@ -271,7 +271,11 @@ function IOExtras.closeread(t::Transaction)
     notify(poolcondition)
 
     if !isbusy(t.c)
-        @async monitor_idle_connection(t.c)
+        @static if VERSION < v"0.7.0-alpha.0"
+            @schedule monitor_idle_connection(t.c)
+        else
+            @async monitor_idle_connection(t.c)
+        end
     end
 
     @ensure !isreadable(t)
@@ -537,13 +541,25 @@ function getconnection(::Type{TCPSocket},
     Base.connect!(tcp, Sockets.getaddrinfo(host), p)
 
     timeout = Ref{Bool}(false)
-    @async begin
-        sleep(connect_timeout)
-        if tcp.status == Base.StatusConnecting
-            timeout[] = true
-            tcp.status = Base.StatusClosing
-            ccall(:jl_forceclose_uv, Nothing, (Ptr{Nothing},), tcp.handle)
-            #close(tcp)
+    @static if VERSION < v"0.7.0-alpha.0"
+        @schedule begin
+            sleep(connect_timeout)
+            if tcp.status == Base.StatusConnecting
+                timeout[] = true
+                tcp.status = Base.StatusClosing
+                ccall(:jl_forceclose_uv, Nothing, (Ptr{Nothing},), tcp.handle)
+                #close(tcp)
+            end
+        end
+    else
+        @async begin
+            sleep(connect_timeout)
+            if tcp.status == Base.StatusConnecting
+                timeout[] = true
+                tcp.status = Base.StatusClosing
+                ccall(:jl_forceclose_uv, Nothing, (Ptr{Nothing},), tcp.handle)
+                #close(tcp)
+            end
         end
     end
     try

diff --git a/src/compat.jl b/src/compat.jl
@@ -1,6 +1,6 @@
 
 v06 = v"0.6.2"
-v07 = v"0.7.0-DEV.4654"
+v07 = v"0.7.0-alpha.0"
 
 supported() = VERSION >= v07 ||
              (VERSION >= v06 && VERSION < v"0.7.0-DEV")