Merge branch 'master' into 20.09

2 files changed, 9 insertions, 13 deletions

diff --git a/krebs/5pkgs/simple/htgen-imgur/default.nix b/krebs/5pkgs/simple/htgen-imgur/default.nix
index f909cb98b..fe0b2ab04 100644
--- a/krebs/5pkgs/simple/htgen-imgur/default.nix
+++ b/krebs/5pkgs/simple/htgen-imgur/default.nix
@@ -2,7 +2,7 @@ with import <stockholm/lib>;
 { attr, coreutils, exiv2, findutils, gnugrep, jq, nix, utillinux, stdenv }:
 stdenv.mkDerivation rec {
   pname = "htgen-imgur";
-  version = "1.1.0";
+  version = "1.0.0";
 
   src = ./src;
 
diff --git a/krebs/5pkgs/simple/htgen-imgur/src/htgen-imgur b/krebs/5pkgs/simple/htgen-imgur/src/htgen-imgur
index f30265ba7..af092d007 100644
--- a/krebs/5pkgs/simple/htgen-imgur/src/htgen-imgur
+++ b/krebs/5pkgs/simple/htgen-imgur/src/htgen-imgur
@@ -27,15 +27,13 @@ basic_response() {(
     }
   ')
 
-  if test "$HTGEN_VERBOSE" = true; then
-    printf "HTTP/1.1 $status_code $status_reason\r\n"
-    printf 'Connection: close\r\n'
-    printf 'Content-Length: %d\r\n' $(expr ${#response_body} + 1)
-    printf 'Content-Type: application/json; charset=UTF-8\r\n'
-    printf 'Server: %s\r\n' "$Server"
-    printf '\r\n'
-    printf '%s\n' "$response_body"
-  fi
+  printf "HTTP/1.1 $status_code $status_reason\r\n"
+  printf 'Connection: close\r\n'
+  printf 'Content-Length: %d\r\n' $(expr ${#response_body} + 1)
+  printf 'Content-Type: application/json; charset=UTF-8\r\n'
+  printf 'Server: %s\r\n' "$Server"
+  printf '\r\n'
+  printf '%s\n' "$response_body"
 
 )}
 
@@ -80,9 +78,7 @@ case "$Method $path" in
     trap "rm $content >&2" EXIT
 
     case ${req_expect-} in 100-continue)
-      if test "$HTGEN_VERBOSE" = true; then
-        printf 'HTTP/1.1 100 Continue\r\n\r\n'
-      fi
+      printf 'HTTP/1.1 100 Continue\r\n\r\n'
     esac
 
     head -c $req_content_length > $content