config: clean up redundant CHA_DIR, update CGI docs

"No CGI dir configured" is no longer a common case, so it's OK to just
return "CGI file not found".

2 files changed, 15 insertions, 20 deletions

diff --git a/src/server/connecterror.nim b/src/server/connecterror.nim
index 5b428526..41e4c89e 100644
--- a/src/server/connecterror.nim
+++ b/src/server/connecterror.nim
@@ -1,20 +1,19 @@
 type ConnectionError* = enum
-  ceCGICachedBodyUnavailable = -18
-  ceCGIOutputHandleNotFound = -17
-  ceCGIFailedToOpenCacheOutput = -16
-  ceCGICachedBodyNotFound = -15
-  ceFailedToRedirect = -14
-  ceURLNotInCache = -13
-  ceFileNotInCache = -12
-  ceFailedToExecuteCGIScript = -11
-  ceCGIMalformedHeader = -10
-  ceCGIInvalidChaControl = -9
-  ceTooManyRewrites = -8
-  ceInvalidURIMethodEntry = -7
-  ceCGIFileNotFound = -6
-  ceInvalidCGIPath = -5
-  ceFailedToSetUpCGI = -4
-  ceNoCGIDir = -3
+  ceCGICachedBodyUnavailable = -17
+  ceCGIOutputHandleNotFound = -16
+  ceCGIFailedToOpenCacheOutput = -15
+  ceCGICachedBodyNotFound = -14
+  ceFailedToRedirect = -13
+  ceURLNotInCache = -12
+  ceFileNotInCache = -11
+  ceFailedToExecuteCGIScript = -10
+  ceCGIMalformedHeader = -9
+  ceCGIInvalidChaControl = -8
+  ceTooManyRewrites = -7
+  ceInvalidURIMethodEntry = -6
+  ceCGIFileNotFound = -5
+  ceInvalidCGIPath = -4
+  ceFailedToSetUpCGI = -3
   ceDisallowedURL = -2
   ceUnknownScheme = -1
   ceNone = 0
@@ -46,7 +45,6 @@ const ErrorMessages* = [
   ceCGIFileNotFound: "CGI file not found",
   ceInvalidCGIPath: "invalid CGI path",
   ceFailedToSetUpCGI: "failed to set up CGI script",
-  ceNoCGIDir: "no local-CGI directory configured",
   ceDisallowedURL: "url not allowed by filter",
   ceUnknownScheme: "unknown scheme",
   ceNone: "connection successful",
diff --git a/src/server/loader.nim b/src/server/loader.nim
index ef32e455..93ecc1bb 100644
--- a/src/server/loader.nim
+++ b/src/server/loader.nim
@@ -780,9 +780,6 @@ proc parseCGIPath(ctx: LoaderContext; request: Request): CGIPath =
 
 proc loadCGI(ctx: LoaderContext; client: ClientData; handle: InputHandle;
     request: Request; prevURL: URL; config: LoaderClientConfig) =
-  if ctx.config.cgiDir.len == 0:
-    handle.sendResult(ceNoCGIDir)
-    return
   let cpath = ctx.parseCGIPath(request)
   if cpath.cmd == "" or cpath.basename in ["", ".", ".."] or
       cpath.basename[0] == '~':