jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'devel' into bigbreak

Browse source 
Conflicts:
	lib/pure/ftpclient.nim
This commit is contained in:
Dominik Picheta 2014-08-30 11:58:54 +01:00
commit 361657dea4
5 changed files with 436 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pure/asynchttpserver.nim
View file

@ -100,7 +100,8 @@ proc sendStatus(client: PAsyncSocket, status: string): PFuture[void] =
client.send("HTTP/1.1 " & status & "\c\L")
proc processClient(client: PAsyncSocket, address: string,
callback: proc (request: TRequest): PFuture[void]) {.async.} =
callback: proc (request: TRequest):
PFuture[void] {.closure, gcsafe.}) {.async.} =
while true:
# GET /path HTTP/1.1
# Header: val
@ -187,7 +188,7 @@ proc processClient(client: PAsyncSocket, address: string,
break
proc serve*(server: PAsyncHttpServer, port: TPort,
callback: proc (request: TRequest): PFuture[void] {.gcsafe.},
callback: proc (request: TRequest): PFuture[void] {.closure,gcsafe.},
address = "") {.async.} =
## Starts the process of listening for incoming HTTP connections on the
## specified address and port.