Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix #79497: Fix php_openssl_subtract_timeval()
This commit is contained in:
Nikita Popov 2020-04-20 10:26:45 +02:00
commit 8e9bc90004

View File

@ -2189,8 +2189,8 @@ static struct timeval php_openssl_subtract_timeval(struct timeval a, struct time
difference.tv_usec = a.tv_usec - b.tv_usec;
if (a.tv_usec < b.tv_usec) {
b.tv_sec -= 1L;
b.tv_usec += 1000000L;
difference.tv_sec -= 1L;
difference.tv_usec += 1000000L;
}
return difference;