From 71d496acbe76f16366a43c533147cdecdbd96078 Mon Sep 17 00:00:00 2001
From: Zhang Jingqiang <zhangjingqiang@bytedance.com>
Date: Fri, 3 Jan 2025 10:59:48 +0800
Subject: [PATCH] g3proxy version 1.10.4

---
 Cargo.lock               | 2 +-
 g3proxy/CHANGELOG        | 6 ++++++
 g3proxy/Cargo.toml       | 2 +-
 g3proxy/debian/changelog | 4 ++--
 g3proxy/g3proxy.spec     | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 36d719b80..c46a911a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1876,7 +1876,7 @@ dependencies = [
 
 [[package]]
 name = "g3proxy"
-version = "1.10.3"
+version = "1.10.4"
 dependencies = [
  "ahash",
  "anyhow",
diff --git a/g3proxy/CHANGELOG b/g3proxy/CHANGELOG
index c2071a2dc..fc8b46f34 100644
--- a/g3proxy/CHANGELOG
+++ b/g3proxy/CHANGELOG
@@ -1,4 +1,10 @@
 
+v1.10.4:
+ - BUG FIX: correctly handle ICAP null-body response
+ - BUG FIX: fix ICAP connection state when reading modified SMTP/IMAP message
+ - BUG FIX: fix chunked encoding of H2 body stream when sending to ICAP server
+ - BUG FIX: keep control socket open on accept error
+
 v1.10.3:
  - BUG FIX: fix read of trailer for chunked FTP over HTTP upload
  - BUG FIX: fix idle check in udp copy and udp relay task
diff --git a/g3proxy/Cargo.toml b/g3proxy/Cargo.toml
index d71b6d4d0..cb657717e 100644
--- a/g3proxy/Cargo.toml
+++ b/g3proxy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "g3proxy"
-version = "1.10.3"
+version = "1.10.4"
 license.workspace = true
 edition.workspace = true
 rust-version = "1.80.0"
diff --git a/g3proxy/debian/changelog b/g3proxy/debian/changelog
index 280b65cb1..e74eff4d6 100644
--- a/g3proxy/debian/changelog
+++ b/g3proxy/debian/changelog
@@ -1,5 +1,5 @@
-g3proxy (1.10.3-1) UNRELEASED; urgency=medium
+g3proxy (1.10.4-1) UNRELEASED; urgency=medium
 
   * New upstream release.
 
- -- G3proxy Maintainers <g3proxy-maintainers@devel.machine>  Fri, 29 Nov 2024 14:07:20 +0800
+ -- G3proxy Maintainers <g3proxy-maintainers@devel.machine>  Fri, 03 Jan 2025 10:59:28 +0800
diff --git a/g3proxy/g3proxy.spec b/g3proxy/g3proxy.spec
index 343350be0..7858aa0b7 100644
--- a/g3proxy/g3proxy.spec
+++ b/g3proxy/g3proxy.spec
@@ -13,7 +13,7 @@
 %define build_profile release-lto
 
 Name:           g3proxy
-Version:        1.10.3
+Version:        1.10.4
 Release:        1%{?dist}
 Summary:        Generic proxy for G3 Project
 
@@ -70,5 +70,5 @@ install -m 644 -D %{name}/service/g3proxy@.service %{buildroot}/lib/systemd/syst
 
 
 %changelog
-* Fri Nov 29 2024 G3proxy Maintainers <g3proxy-maintainers@devel.machine> - 1.10.3-1
+* Fri Jan 03 2025 G3proxy Maintainers <g3proxy-maintainers@devel.machine> - 1.10.4-1
 - New upstream release