diff --git a/src/os_unix.c b/src/os_unix.c index 074a9fed34..1094899390 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -9637,8 +9637,10 @@ socket_server_send( if (pending.result != NULL) break; +#ifdef ELAPSED_FUNC if (ELAPSED_FUNC(start_tv) >= (timeout > 0 ? timeout : 1000)) break; +#endif } if (pending.result == NULL) diff --git a/src/version.c b/src/version.c index 042b995aac..903c459b95 100644 --- a/src/version.c +++ b/src/version.c @@ -724,6 +724,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1723, /**/ 1722, /**/