← Commit list

d65321f939

Antoine Pitrou

2023-05-19

FAILED Duration: 475s

Subject

select: avoid returning an error on EINTR from select() or poll()

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

$ git checkout -f d65321f93916e60f65b89d9bcb502341ea5c5939
Previous HEAD position was fbe23b5797 docs: document that curl_url_cleanup(NULL) is a safe no-op
HEAD is now at d65321f939 select: avoid returning an error on EINTR from select() or poll()

$ git clean -fdx
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing confdefs.h
Removing config.guess
Removing config.log
Removing config.sub
Removing configure
Removing conftest.c
Removing depcomp
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile.in
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile.in
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/Makefile.in
Removing lib/curl_config.h.in
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile.in
Removing packages/vms/Makefile.in
Removing run-compiler
Removing scripts/Makefile.in
Removing src/Makefile.in
Removing test-driver
Removing tests/Makefile.in
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile.in
Removing tests/data/Makefile.in
Removing tests/http/Makefile.in
Removing tests/http/clients/Makefile.in
Removing tests/libtest/Makefile.in
Removing tests/server/Makefile.in
Removing tests/unit/Makefile.in

$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:123: installing './compile'
configure.ac:439: installing './config.guess'
configure.ac:439: installing './config.sub'
configure.ac:123: installing './install-sh'
configure.ac:129: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
parallel-tests: installing './test-driver'

$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;

$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;

$ chmod +x configure

$ ./configure --disable-shared --without-ssl --disable-docs

[TIMEOUT]

Commit Diff GitHub →

lib/select.c +9 -4

lib/select.c+9 -4

@@ -61,8 +61,8 @@
	* for the intended use of this function in the library.
	*
	* Return values:
-	* -1 = system call error, invalid timeout value, or interrupted
-	* 0 = specified timeout has elapsed
+	* -1 = system call error, or invalid timeout value
+	* 0 = specified timeout has elapsed, or interrupted
	*/
	int Curl_wait_ms(timediff_t timeout_ms)
	{
@@ -99,8 +99,13 @@ int Curl_wait_ms(timediff_t timeout_ms)
	}
	#endif /* HAVE_POLL_FINE */
	#endif /* USE_WINSOCK */
-	if(r)
-	r = -1;
+	if(r) {
+	if((r == -1) && (SOCKERRNO == EINTR))
+	/* make EINTR from select or poll not a "lethal" error */
+	r = 0;
+	else
+	r = -1;
+	}
	return r;
	}