parent
1e54f18193
commit
2160f69f53
3 changed files with 4 additions and 67 deletions
|
@ -1,40 +0,0 @@
|
|||
From 52e822173aa3cd4f610531d32fbf943f026cdca6 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Weißschuh <thomas@t-8ch.de>
|
||||
Date: Sun, 3 Jul 2022 18:20:44 +0200
|
||||
Subject: select: do not return fatal error on EINTR from poll()
|
||||
|
||||
The same was done for select() in 5912da25 but poll() was missed.
|
||||
|
||||
Bug: https://bugs.archlinux.org/task/75201
|
||||
Reported-by: Alexandre Bury (gyscos at archlinux)
|
||||
|
||||
Ref: https://github.com/curl/curl/issues/8921
|
||||
Ref: https://github.com/curl/curl/pull/8961
|
||||
Ref: https://github.com/curl/curl/commit/5912da25#r77584294
|
||||
|
||||
Closes https://github.com/curl/curl/pull/9091
|
||||
---
|
||||
lib/select.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/select.c b/lib/select.c
|
||||
index c16358d56..2ac074677 100644
|
||||
--- a/lib/select.c
|
||||
+++ b/lib/select.c
|
||||
@@ -310,8 +310,12 @@ int Curl_poll(struct pollfd ufds[], unsigned int nfds, timediff_t timeout_ms)
|
||||
else
|
||||
pending_ms = 0;
|
||||
r = poll(ufds, nfds, pending_ms);
|
||||
- if(r <= 0)
|
||||
+ if(r <= 0) {
|
||||
+ if((r == -1) && (SOCKERRNO == EINTR))
|
||||
+ /* make EINTR from select or poll not a "lethal" error */
|
||||
+ r = 0;
|
||||
return r;
|
||||
+ }
|
||||
|
||||
for(i = 0; i < nfds; i++) {
|
||||
if(ufds[i].fd == CURL_SOCKET_BAD)
|
||||
--
|
||||
cgit v1.2.3-18-g5258
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
From 3f6beb669e4edc170e167aa6cca3b4a6ec4501e9 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Stenberg <daniel@haxx.se>
|
||||
Date: Mon, 27 Jun 2022 08:46:21 +0200
|
||||
Subject: [PATCH] easy_lock.h: include sched.h if available to fix build
|
||||
|
||||
Patched-by: Harry Sintonen
|
||||
---
|
||||
lib/easy_lock.h | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/lib/easy_lock.h b/lib/easy_lock.h
|
||||
index 819f50ce815b8..1f54289ceb2d3 100644
|
||||
--- a/lib/easy_lock.h
|
||||
+++ b/lib/easy_lock.h
|
||||
@@ -36,6 +36,9 @@
|
||||
|
||||
#elif defined (HAVE_ATOMIC)
|
||||
#include <stdatomic.h>
|
||||
+#if defined(HAVE_SCHED_YIELD)
|
||||
+#include <sched.h>
|
||||
+#endif
|
||||
|
||||
#define curl_simple_lock atomic_bool
|
||||
#define CURL_SIMPLE_LOCK_INIT false
|
|
@ -1,9 +1,10 @@
|
|||
# Template file for 'curl'
|
||||
pkgname=curl
|
||||
version=7.84.0
|
||||
revision=2
|
||||
version=7.86.0
|
||||
revision=1
|
||||
build_style=gnu-configure
|
||||
configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
|
||||
--enable-websockets
|
||||
$(vopt_with rtmp librtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
|
||||
$(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl) $(vopt_with zstd)
|
||||
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2
|
||||
|
@ -24,7 +25,7 @@ license="MIT"
|
|||
homepage="https://curl.haxx.se"
|
||||
changelog="https://curl.haxx.se/changes.html#${version//./_}"
|
||||
distfiles="${homepage}/download/${pkgname}-${version}.tar.bz2"
|
||||
checksum=702fb26e73190a3bd77071aa146f507b9817cc4dfce218d2ab87f00cd3bc059d
|
||||
checksum=f5ca69db03eea17fa8705bdfb1a9f58d76a46c9010518109bb38f313137e0a28
|
||||
build_options="gnutls gssapi ldap rtmp ssh ssl zstd"
|
||||
build_options_default="ssh ssl zstd"
|
||||
vopt_conflict ssl gnutls
|
||||
|
|
Loading…
Add table
Reference in a new issue