Merge branch 'master' into feature/http2

Author: KingMob

.circleci/config.yml

@@ -8,7 +8,6 @@ jobs:
     docker:
       # specify the version you desire here
       - image: cimg/clojure:1.11.1-openjdk-8.0
-
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
@@ -46,3 +45,5 @@ jobs:
 
       # run tests!
       - run: lein do clean, test
+    # The resource_class feature allows configuring CPU and RAM resources for each job. Different resource classes are available for different executors. https://circleci.com/docs/2.0/configuration-reference/#resourceclass
+    resource_class: large

CHANGES.md

@@ -1,3 +1,21 @@
+### 0.6.3
+
+* Bump Netty to 4.1.94.Final for CVE-2023-34462
+
+Contributions by Matthew Davidson and Stefan van den Oord.
+
+### 0.6.2
+
+* Fix backwards-compatibility for transport options
+* Bump Netty to 4.1.89.Final, and io_uring to 0.0.18.Final
+* Add `wrap-validation` middleware to validate Ring maps 
+* Bump deps and example deps
+* Upgrade CircleCI instance size
+* Switch to pedantic deps for CircleCI
+
+Contributions by Arnaud Geiser, Ertuğrul Çetin, Jeroen van Dijk, David Ongaro, 
+Matthew Davidson, and Moritz Heidkamp.
+
 ### 0.6.1
 
 * Switch back to JDK 8 in CI

README.md

@@ -8,11 +8,11 @@ Aleph exposes data from the network as a [Manifold](https://github.com/clj-commo
 
 Leiningen:
 ```clojure
-[aleph "0.6.1"]
+[aleph "0.6.3"]
 ```
 deps.edn:
 ```clojure
-aleph/aleph {:mvn/version "0.6.1"}
+aleph/aleph {:mvn/version "0.6.3"}
 ;; alternatively
 io.github.clj-commons/aleph {:git/sha "..."}
 ```

examples/project.clj

@@ -1,5 +1,5 @@
-(defproject aleph.examples "0.6.1"
-  :dependencies [[aleph "0.6.1"]
+(defproject aleph.examples "0.6.3"
+  :dependencies [[aleph "0.6.3"]
                  [gloss "0.2.6"]
                  [metosin/reitit "0.5.18"]
                  [org.clojure/clojure "1.11.1"]

project.clj

@@ -1,7 +1,7 @@
 ;; you'll need to run the script at `deps/lein-to-deps` after changing any dependencies
 (def netty-version "4.1.94.Final")
 
-(defproject aleph (or (System/getenv "PROJECT_VERSION") "0.6.1")
+(defproject aleph (or (System/getenv "PROJECT_VERSION") "0.6.3")
   :description "A framework for asynchronous communication"
   :url "https://github.com/clj-commons/aleph"
   :license {:name "MIT License"}

src/aleph/http/server.clj

@@ -99,7 +99,7 @@
       (map #(HttpHeaders/newEntity %) ["Server" "Connection" "Date" "Content-Type"])
 
       [server-value keep-alive-value close-value]
-      (map #(HttpHeaders/newEntity %) ["Aleph/0.6.1" "Keep-Alive" "Close"])]
+      (map #(HttpHeaders/newEntity %) ["Aleph/0.6.3" "Keep-Alive" "Close"])]
   (defn send-response
     [^ChannelHandlerContext ctx keep-alive? ssl? error-handler rsp]
     (let [[^HttpResponse rsp body]