Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
nim:
- 1.4.8
- 1.6.18
- 2.0.2
os:
- ubuntu-latest
Expand Down
15 changes: 12 additions & 3 deletions jester.nim
Original file line number Diff line number Diff line change
Expand Up @@ -532,20 +532,29 @@ proc serve*(
[$self.settings.port, self.settings.appName])

var jes = self
let domain = block:
if self.settings.bindAddr != "":
let ip = self.settings.bindAddr.parseIpAddress()
if ip.family == IPv4:
AF_INET
else:
AF_INET6
else:
AF_INET
when useHttpBeast:
run(
proc (req: httpbeast.Request): Future[void] =
{.gcsafe.}:
{.gcsafe.}:
result = handleRequest(jes, req),
httpbeast.initSettings(self.settings.port, self.settings.bindAddr, self.settings.numThreads, startup = self.settings.startup)
httpbeast.initSettings(self.settings.port, self.settings.bindAddr, self.settings.numThreads, startup = self.settings.startup, domain = domain)
)
else:
self.httpServer = newAsyncHttpServer(reusePort=self.settings.reusePort, maxBody=self.settings.maxBody)
let serveFut = self.httpServer.serve(
self.settings.port,
proc (req: asynchttpserver.Request): Future[void] {.gcsafe, closure.} =
result = handleRequest(jes, req),
self.settings.bindAddr)
self.settings.bindAddr, domain = domain)
if not self.settings.futureErrorHandler.isNil:
serveFut.callback = self.settings.futureErrorHandler
else:
Expand Down
2 changes: 1 addition & 1 deletion jester.nimble
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ skipDirs = @["tests"]

# Deps

requires "nim >= 1.4.8"
requires "nim >= 1.6.18"

when not defined(windows):
when NimMajor >= 2:
Expand Down
2 changes: 1 addition & 1 deletion jester/request.nim
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import uri, cgi, tables, logging, strutils, re, options
from sequtils import map

import jester/private/utils
import private/utils

when useHttpBeast:
import httpbeast except Settings
Expand Down