From 0766f15fe2658a5d82c116192d9b0ee603ee798e Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Tue, 5 Dec 2023 15:29:01 -0500
Subject: [PATCH] prepare for 0.15

---
 CHANGES.md              | 6 ++++++
 dune-project            | 8 ++++++--
 src/Tiny_httpd_buf.mli  | 2 +-
 tiny_httpd.opam         | 6 +++++-
 tiny_httpd_camlzip.opam | 6 ++++--
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 50f0a717..03390c50 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,10 @@
 
+## 0.15
+
+- fix: do not block in `accept`, enabling more graceful shutdown
+- improve help message for tiny-httpd-vfs-pack
+- security: zero out buffers from pool before reusing them
+
 ## 0.14
 
 - breaking: `set_top_handler` takes a stream request, for more generality
diff --git a/dune-project b/dune-project
index 1b9e3c60..415fe81c 100644
--- a/dune-project
+++ b/dune-project
@@ -2,7 +2,9 @@
 (name tiny_httpd)
 (generate_opam_files true)
 
-(version 0.14)
+(authors c-cube)
+(maintainers c-cube)
+(version 0.15)
 (source (github c-cube/tiny_httpd))
 (homepage https://github.com/c-cube/tiny_httpd/)
 (license MIT)
@@ -13,6 +15,8 @@
   (tags (http thread server tiny_httpd http_of_dir simplehttpserver))
   (depends
     seq
+    base-threads
+    result
     (ocaml (>= 4.05))
     (odoc :with-doc)
     (conf-libcurl :with-test)
@@ -23,6 +27,6 @@
   (name tiny_httpd_camlzip)
   (synopsis "Interface to camlzip for tiny_httpd")
   (depends
-    (tiny_httpd_camlzip (= :version))
+    (tiny_httpd (= :version))
     (camlzip (>= 1.06))
     (odoc :with-doc)))
diff --git a/src/Tiny_httpd_buf.mli b/src/Tiny_httpd_buf.mli
index e0c92de2..e5ca90c1 100644
--- a/src/Tiny_httpd_buf.mli
+++ b/src/Tiny_httpd_buf.mli
@@ -15,7 +15,7 @@ val contents : t -> string
 
 val clear_and_zero : t -> unit
 (** Clear the buffer and zero out its storage.
-    @since NEXT_RELEASE *)
+    @since 0.15 *)
 
 val bytes_slice : t -> bytes
 (** Access underlying slice of bytes.
diff --git a/tiny_httpd.opam b/tiny_httpd.opam
index 1e877956..3cda25ee 100644
--- a/tiny_httpd.opam
+++ b/tiny_httpd.opam
@@ -1,7 +1,9 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.14"
+version: "0.15"
 synopsis: "Minimal HTTP server using threads"
+maintainer: ["c-cube"]
+authors: ["c-cube"]
 license: "MIT"
 tags: [
   "http" "thread" "server" "tiny_httpd" "http_of_dir" "simplehttpserver"
@@ -11,6 +13,8 @@ bug-reports: "https://github.com/c-cube/tiny_httpd/issues"
 depends: [
   "dune" {>= "2.9"}
   "seq"
+  "base-threads"
+  "result"
   "ocaml" {>= "4.05"}
   "odoc" {with-doc}
   "conf-libcurl" {with-test}
diff --git a/tiny_httpd_camlzip.opam b/tiny_httpd_camlzip.opam
index 0ec64002..e9237299 100644
--- a/tiny_httpd_camlzip.opam
+++ b/tiny_httpd_camlzip.opam
@@ -1,13 +1,15 @@
 # This file is generated by dune, edit dune-project instead
 opam-version: "2.0"
-version: "0.14"
+version: "0.15"
 synopsis: "Interface to camlzip for tiny_httpd"
+maintainer: ["c-cube"]
+authors: ["c-cube"]
 license: "MIT"
 homepage: "https://github.com/c-cube/tiny_httpd/"
 bug-reports: "https://github.com/c-cube/tiny_httpd/issues"
 depends: [
   "dune" {>= "2.9"}
-  "tiny_httpd_camlzip" {= version}
+  "tiny_httpd" {= version}
   "camlzip" {>= "1.06"}
   "odoc" {with-doc}
 ]