Change #262290

Category	None
Changed by	Stefan Eissing <stefanohnoyoudont@eissing.org>
Changed at	Wed 25 Mar 2026 12:17:58
Repository	https://api.github.com/repos/curl/curl
Project	curl/curl
Branch	master
Revision	dc9a03e8557237636460464cdfaec8171641e3e5

Comments

multi: multi_wait fixes after #20832

The refactoring in #20832 introduced some inconsistencies between
windows and posix handling, pointed out by reviews. Fix them:

- rename `wait_on_nop` back to `extrawait` as it was called before
- use multi_timeout() to shorten the user supplied timeout for
  both windows/posix in the same way
- remove the extra multi_timeout() check in the posix function
- Add the multi's wakeup socket for monitoring only when there
  are other sockets to poll on or when the caller wants the
  extra waiting time.

Closes #21072

Changed files

lib/multi.c