[packages/poldek] - added proxy-fix.patch from poldek repo

[witekfl]

commit af0b010b0c4a10f8e3c78ecfc4770635ff5c994e
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Tue Mar 4 10:48:37 2025 +0100

    - added proxy-fix.patch from poldek repo

 poldek.spec     |   2 +
 proxy-fix.patch | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)
---
diff --git a/poldek.spec b/poldek.spec
index 8d09e4a..e48404f 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -53,6 +53,7 @@ Patch1:		pm-hooks.patch
 Patch2:		%{name}-ext-down-enable.patch
 Patch3:		fix-reinstall-sigsev.patch
 Patch4:		restore-verify-all.patch
+Patch5:		proxy-fix.patch
 URL:		http://poldek.pld-linux.org/
 %{?with_rpm5:BuildRequires:	%{db_pkg}-devel >= %{ver_db}}
 BuildRequires:	autoconf >= 2.63
@@ -230,6 +231,7 @@ Moduły języka Python dla poldka.
 %patch -P 2 -p1
 %patch -P 3 -p1
 %patch -P 4 -p1
+%patch -P 5 -p1
 
 %{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4
diff --git a/proxy-fix.patch b/proxy-fix.patch
new file mode 100644
index 0000000..06aeb7c
--- /dev/null
+++ b/proxy-fix.patch
@@ -0,0 +1,119 @@
+commit ab4f31ec7afa21d7a769ad6ceb5ec176667191b2
+Author: mis <mistoo at gmail.com>
+Date:   Sat Mar 1 20:02:11 2025 +0100
+
+    fix: do not check http connection with 'HEAD /' when proxied
+
+diff --git a/vfile/vfff/http.c b/vfile/vfff/http.c
+index 92effa2..fa0fc74 100644
+--- a/vfile/vfff/http.c
++++ b/vfile/vfff/http.c
+@@ -790,27 +790,6 @@ static time_t parse_date(const char *dt)
+     return ts;
+ }
+ 
+-static
+-int vhttp_vcn_is_alive(struct vcn *cn)
+-{
+-    char req_line[256];
+-
+-    if (cn->state != VCN_ALIVE)
+-        return 0;
+-
+-    make_req_line(req_line, sizeof(req_line), "HEAD", "/");
+-
+-    if (!httpcn_req(cn, req_line, NULL))
+-        return 0;
+-
+-    if (!httpcn_get_resp(cn)) {
+-        cn->state = VCN_DEAD;
+-        return 0;
+-    }
+-
+-    return 1;
+-}
+-
+ static int is_closing_connection_status(struct http_resp *resp)
+ {
+     int close_cn = 0;
+@@ -836,6 +815,34 @@ static int is_closing_connection_status(struct http_resp *resp)
+     return close_cn;
+ }
+ 
++static int vhttp_vcn_is_alive(struct vcn *cn)
++{
++    char req_line[256];
++
++    if (cn->state != VCN_ALIVE)
++        return 0;
++
++    if (cn->flags & VCN_PROXIED)
++        return 0;
++
++    make_req_line(req_line, sizeof(req_line), "HEAD", "/");
++
++    if (!httpcn_req(cn, req_line, NULL))
++        return 0;
++
++    if (!httpcn_get_resp(cn)) {
++        cn->state = VCN_DEAD;
++        return 0;
++    }
++
++    if (is_closing_connection_status(cn->resp)) {
++        cn->state = VCN_DEAD;
++        return 0;
++    }
++
++    return 1;
++}
++
+ static
+ int is_redirected_connection(struct http_resp *resp, struct vfff_req *rreq)
+ {
+diff --git a/vfile/vfff/vfff.c b/vfile/vfff/vfff.c
+index f745ec1..cd014f9 100644
+--- a/vfile/vfff/vfff.c
++++ b/vfile/vfff/vfff.c
+@@ -436,5 +436,10 @@ int vfff_transfer_file(struct vcn *cn, struct vfff_req *vreq, long total_size)
+     if (vreq->progress_fn)
+         vreq->progress_fn(vreq->progress_fn_data, total_size, -1);
+ 
+-    return is_err == 0;
++    if (is_err == 0 && cn->state == VCN_ALIVE) {
++        cn->ts_is_alive = time(0); /* update alive timestamp on success */
++        return 1;
++    }
++
++    return 0;
+ }
+diff --git a/vfile/vfff/vfff.h b/vfile/vfff/vfff.h
+index 22665b0..4f448de 100644
+--- a/vfile/vfff/vfff.h
++++ b/vfile/vfff/vfff.h
+@@ -60,6 +60,7 @@ struct vfff_req;
+ /* flags */
+ #define VCN_SUPPORTS_SIZE  (1 << 0)
+ #define VCN_SUPPORTS_MDTM  (1 << 1)
++#define VCN_PROXIED        (1 << 9)
+ 
+ struct vcn {
+     int       proto;
+diff --git a/vfile/vfffmod.c b/vfile/vfffmod.c
+index 98f828d..c6a8503 100644
+--- a/vfile/vfffmod.c
++++ b/vfile/vfffmod.c
+@@ -202,8 +202,12 @@ static struct vcn *vcn_pool_do_connect(struct vf_request *req)
+     if (cn == NULL) {
+         cn = vcn_new(vcn_proto, host, port, login, passwd,
+                      req->proxy_login, req->proxy_passwd);
+-        if (cn)
++        if (cn) {
++            if (req->proxy_host)
++                cn->flags |= VCN_PROXIED;
++
+             n_list_push(vcn_pool, cn);
++        }
+     }
+ 
+     return cn;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/poldek.git/commitdiff/af0b010b0c4a10f8e3c78ecfc4770635ff5c994e