From aa6cb2aeef0f21ed8b41ab9e643ebb83f7451119 Mon Sep 17 00:00:00 2001 From: Seednode Date: Mon, 13 Nov 2023 17:31:00 -0600 Subject: [PATCH] Allow --fallback as sole format option --- cmd/root.go | 4 ++-- cmd/uri.go | 6 +++--- cmd/web.go | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 8bd476e..bd0ddb5 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -12,7 +12,7 @@ import ( ) const ( - ReleaseVersion string = "3.2.9" + ReleaseVersion string = "3.2.10" ) var ( @@ -119,7 +119,7 @@ func init() { rootCmd.CompletionOptions.HiddenDefaultCmd = true - rootCmd.MarkFlagsOneRequired("all", "audio", "code", "flash", "images", "text", "video") + rootCmd.MarkFlagsOneRequired("all", "audio", "code", "fallback", "flash", "images", "text", "video") rootCmd.SilenceErrors = true rootCmd.SetHelpCommand(&cobra.Command{ diff --git a/cmd/uri.go b/cmd/uri.go index fca0bca..b3b07d3 100644 --- a/cmd/uri.go +++ b/cmd/uri.go @@ -135,12 +135,12 @@ func realIP(r *http.Request) string { remotePort := remoteAddr[len(remoteAddr)-1] - cfIP := r.Header.Get("Cf-Connecting-Ip") + cfIp := r.Header.Get("Cf-Connecting-Ip") xRealIp := r.Header.Get("X-Real-Ip") switch { - case cfIP != "": - return cfIP + ":" + remotePort + case cfIp != "": + return cfIp + ":" + remotePort case xRealIp != "": return xRealIp + ":" + remotePort default: diff --git a/cmd/web.go b/cmd/web.go index 7833d2a..12fc590 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -88,7 +88,6 @@ func serveStaticFile(paths []string, index *fileIndex, errorChannel chan<- error return } - if !exists { notFound(w, r, filePath)