From 4941dc0b9a67893d9a93272bfc265bf46fd0b869 Mon Sep 17 00:00:00 2001
From: Ciprian Dorin Craciun <ciprian@volution.ro>
Date: Sat, 18 Dec 2021 01:56:34 +0200
Subject: [PATCH] [server]  Add new `--dummy-empty` flag that is equivalent of
 just `return` in the handler.

---
 sources/cmd/server/server.go | 56 +++++++++++++++++++++++++-----------
 sources/cmd/server/usage.txt | 20 ++++++-------
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/sources/cmd/server/server.go b/sources/cmd/server/server.go
index 3916dad..ad03f49 100644
--- a/sources/cmd/server/server.go
+++ b/sources/cmd/server/server.go
@@ -59,7 +59,8 @@ type server struct {
 	debug bool
 	quiet bool
 	dummy bool
-	delay time.Duration
+	dummyEmpty bool
+	dummyDelay time.Duration
 }
 
 
@@ -69,7 +70,12 @@ func (_server *server) Serve (_context *fasthttp.RequestCtx) () {
 	
 	
 	if _server.dummy {
-		_server.ServeDummy (_context)
+		if !_server.dummyEmpty {
+			_server.ServeDummy (_context)
+		}
+		if _server.dummyDelay != 0 {
+			time.Sleep (_server.dummyDelay)
+		}
 		return
 	}
 	
@@ -356,8 +362,8 @@ func (_server *server) Serve (_context *fasthttp.RequestCtx) () {
 		log.Printf ("[dd] [b15f3cad]  [http-x..]  serving for `%s`...\n", *_requestUriString)
 	}
 	
-	if _server.delay != 0 {
-		time.Sleep (_server.delay)
+	if _server.dummyDelay != 0 {
+		time.Sleep (_server.dummyDelay)
 	}
 	
 	_response.SetStatusCode (_responseStatus)
@@ -476,13 +482,18 @@ func (_server *server) ServeHTTP (_response http.ResponseWriter, _request *http.
 	}
 	
 	if _server.dummy {
-		_responseHeaders := _response.Header ()
-		_responseHeaders["Content-Type"] = []string { DummyContentType }
-		_responseHeaders["Content-Encoding"] = []string { DummyContentEncoding }
-		_responseHeaders["Cache-Control"] = []string { "no-store, max-age=0" }
-		_responseHeaders["Date"] = nil
-		_response.WriteHeader (http.StatusOK)
-		_response.Write (DummyData)
+		if !_server.dummyEmpty {
+			_responseHeaders := _response.Header ()
+			_responseHeaders["Content-Type"] = []string { DummyContentType }
+			_responseHeaders["Content-Encoding"] = []string { DummyContentEncoding }
+			_responseHeaders["Cache-Control"] = []string { "no-store, max-age=0" }
+			_responseHeaders["Date"] = nil
+			_response.WriteHeader (http.StatusOK)
+			_response.Write (DummyData)
+		}
+		if _server.dummyDelay != 0 {
+			time.Sleep (_server.dummyDelay)
+		}
 		return
 	}
 	
@@ -587,7 +598,8 @@ func main_0 () (error) {
 	var _debug bool
 	var _quiet bool
 	var _dummy bool
-	var _delay time.Duration
+	var _dummyEmpty bool
+	var _dummyDelay time.Duration
 	var _profileCpu string
 	var _profileMem string
 	var _limitMemory uint
@@ -631,7 +643,8 @@ func main_0 () (error) {
 		_debug_0 := _flags.Bool ("debug", false, "")
 		_quiet_0 := _flags.Bool ("quiet", false, "")
 		_dummy_0 := _flags.Bool ("dummy", false, "")
-		_delay_0 := _flags.Duration ("delay", 0, "")
+		_dummyEmpty_0 := _flags.Bool ("dummy-empty", false, "")
+		_dummyDelay_0 := _flags.Duration ("dummy-delay", 0, "")
 		_profileCpu_0 := _flags.String ("profile-cpu", "", "")
 		_profileMem_0 := _flags.String ("profile-mem", "", "")
 		_limitMemory_0 := _flags.Uint ("limit-memory", 0, "")
@@ -663,7 +676,8 @@ func main_0 () (error) {
 		_debug = *_debug_0
 		_quiet = *_quiet_0 && !_debug
 		_dummy = *_dummy_0
-		_delay = *_delay_0
+		_dummyEmpty = *_dummyEmpty_0
+		_dummyDelay = *_dummyDelay_0
 		_profileCpu = *_profileCpu_0
 		_profileMem = *_profileMem_0
 		_limitMemory = *_limitMemory_0
@@ -725,6 +739,7 @@ func main_0 () (error) {
 			CanonicalHeaderValueRegister (_http3AltSvc)
 		}
 		
+		_dummy = _dummy || _dummyEmpty
 		if !_dummy {
 			if _archivePath == "" {
 				AbortError (nil, "[eefe1a38]  expected archive file argument!")
@@ -749,9 +764,9 @@ func main_0 () (error) {
 			_indexDataMeta = false
 			_indexDataContent = false
 		}
-		if !_dummy && (_delay != 0) {
+		if !_dummy && (_dummyDelay != 0) {
 			if _isMaster {
-				log.Printf ("[ww] [e9296c03]  running with a response delay of `%s`!\n", _delay)
+				log.Printf ("[ww] [e9296c03]  running with a response delay of `%s`!\n", _dummyDelay)
 			}
 		}
 		
@@ -917,6 +932,12 @@ func main_0 () (error) {
 		if _dummy {
 			_processArguments = append (_processArguments, "--dummy")
 		}
+		if _dummyEmpty {
+			_processArguments = append (_processArguments, "--dummy-empty")
+		}
+		if _dummyDelay != 0 {
+			_processArguments = append (_processArguments, "--dummy-delay", fmt.Sprintf ("%s", _dummyDelay))
+		}
 		_processArguments = append (_processArguments, "--threads", fmt.Sprintf ("%d", _threads))
 		
 		_processAttributes := & os.ProcAttr {
@@ -1308,7 +1329,8 @@ func main_0 () (error) {
 			quiet : _quiet,
 			debug : _debug,
 			dummy : _dummy,
-			delay : _delay,
+			dummyEmpty : _dummyEmpty,
+			dummyDelay : _dummyDelay,
 		}
 	
 	
diff --git a/sources/cmd/server/usage.txt b/sources/cmd/server/usage.txt
index 1a3a4e9..e3148c5 100644
--- a/sources/cmd/server/usage.txt
+++ b/sources/cmd/server/usage.txt
@@ -16,9 +16,10 @@
     --archive-mmap            (memory-mapped archive file)
     --archive-preload         (preload archive in OS cache)
 
-    --bind <ip>:<port>        (HTTP, only HTTP/1.1)
-    --bind-tls <ip>:<port>    (HTTPS, only HTTP/1.1)
-    --bind-tls-2 <ip>:<port>  (HTTPS, with HTTP/2)
+    --bind <ip>:<port>        (HTTP, only HTTP/1.1, FastHTTP)
+    --bind-2 <ip>:<port>      (HTTP, only HTTP/1.1, Go net/http)
+    --bind-tls <ip>:<port>    (HTTPS, only HTTP/1.1, FastHTTP)
+    --bind-tls-2 <ip>:<port>  (HTTPS, with HTTP/2, Go net/http)
     --bind-quic <ip>:<port>   (HTTPS, with HTTP/3)
 
     --http1-disable
@@ -39,18 +40,13 @@
 
     --security-headers-tls
     --security-headers-disable
-    --timeout-disable
-
-    --profile-cpu <path>
-    --profile-mem <path>
 
     --limit-memory <MiB>
+    --timeout-disable
+    --profile-cpu <path> ; --profile-mem <path>
 
-    --quiet
-    --debug
-
-    --dummy
-    --delay <duration>
+    --quiet ; --debug
+    --dummy ; --dummy-empty ; --dummy-delay <duration>
 
   ** for details see:
      https://github.com/volution/kawipiko#kawipiko-server