Merge branch 'PHP-7.3' into PHP-7.4

nikic · nikic · commit a230b5a6c92c · 2020-04-20T10:26:22.000+02:00
* PHP-7.3:
  Fix #79497: Fix php_openssl_subtract_timeval()
diff --git a/NEWS b/NEWS
@@ -19,6 +19,10 @@ PHP                                                                        NEWS
   . Fixed bug #79441 (Segfault in mb_chr() if internal encoding is unsupported).
     (Girgias)
 
+- OpenSSL:
+  . Fixed bug #79497 (stream_socket_client() throws an unknown error sometimes
+    with <1s timeout). (Joe Cai)
+
 - SPL:
   . Fixed bug #69264 (__debugInfo() ignored while extending SPL classes). (cmb)
 
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
@@ -2253,8 +2253,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;

Original file line number	Diff line number	Diff line change
`@@ -2253,8 +2253,8 @@ static struct timeval php_openssl_subtract_timeval(struct timeval a, struct time`
`2253`	`2253`	`difference.tv_usec = a.tv_usec - b.tv_usec;`
`2254`	`2254`
`2255`	`2255`	`if (a.tv_usec < b.tv_usec) {`
`2256`		`- b.tv_sec -= 1L;`
`2257`		`- b.tv_usec += 1000000L;`
	`2256`	`+ difference.tv_sec -= 1L;`
	`2257`	`+ difference.tv_usec += 1000000L;`
`2258`	`2258`	`}`
`2259`	`2259`
`2260`	`2260`	`return difference;`