Unify copyright comment format

[tofuproxy.git] / rounds / warc.go

diff --git a/rounds/warc.go b/rounds/warc.go
index d9ab78e147aa2bf83560fa77e78571c7bcfa11b5..19c745d27bd562659af37d106ff10cfb80a8aa29 100644 (file)
--- a/rounds/warc.go
+++ b/rounds/warc.go
@@ -1,19 +1,18 @@
-/*
-tofuproxy -- flexible HTTP/WARC proxy with TLS certificates management
-Copyright (C) 2021 Sergey Matveev <stargrave@stargrave.org>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, version 3 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// tofuproxy -- flexible HTTP/HTTPS proxy, TLS terminator, X.509 TOFU
+//              manager, WARC/geminispace browser
+// Copyright (C) 2021-2024 Sergey Matveev <stargrave@stargrave.org>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 3 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 package rounds
 
@@ -123,17 +122,20 @@ func RoundWARC(
        if rec == nil {
                if WARCOnly {
                        http.NotFound(w, req)
-                       fifos.LogNonOK <- fmt.Sprintf("%s %s\tnot in WARC", req.Method, req.URL)
+                       fifos.LogNonOK <- fmt.Sprintf(
+                               "%s %s\tnot in WARC", req.Method, req.URL,
+                       )
                        return false, nil
                }
                return true, nil
        }
 
-       wr, err := rec.Reader(true)
+       wr, err := rec.Reader(true, warc.WARCsOffsets)
        if err != nil {
                log.Printf("WARC: error during %s: %+v\n", req.URL, err)
                return false, err
        }
+       defer wr.Close()
        hj, ok := w.(http.Hijacker)
        if !ok {
                http.Error(w, "can not hijack", http.StatusInternalServerError)