Merge branch 'devel' into bigbreak

Conflicts: lib/pure/ftpclient.nim
2014-08-30 11:58:54 +01:00 · 2014-08-30 11:58:54 +01:00 · 361657dea4
commit 361657dea4
parent c6034277fc 3a00692ef8
5 changed files with 436 additions and 128 deletions
--- a/lib/pure/httpclient.nim
+++ b/lib/pure/httpclient.nim
@ -662,8 +662,7 @@ when isMainModule:
      resp = await client.request("http://nim-lang.org/download.html")
      echo("Got response: ", resp.status)

-    asyncCheck main()
-    runForever()
+    waitFor main()

  else:
    #downloadFile("http://force7.de/nim/index.html", "nimindex.html")