From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 11 Sep 2020 12:49:07 +0000 (+0200)
Subject: Merge branch 'PHP-7.4' into master
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d860005419bf23874fffd1f53663f50be6826e9;p=php

Merge branch 'PHP-7.4' into master

* PHP-7.4:
  Fix #80067: Omitting the port in bindto setting errors
---

4d860005419bf23874fffd1f53663f50be6826e9
diff --cc ext/standard/tests/network/bindto.phpt
index bfff64a5e0,27ae45e5ff..2cd56a7f6a
--- a/ext/standard/tests/network/bindto.phpt
+++ b/ext/standard/tests/network/bindto.phpt
@@@ -13,4 -13,6 +13,6 @@@ $fp = stream_socket_client
  );
  ?>
  --EXPECTF--
- Warning: stream_socket_client(): Unable to connect to tcp://%s:80 (Failed to parse address "invalid") in %s on line %d
+ Warning: stream_socket_client(): php_network_getaddresses: getaddrinfo failed: %s in %s on line %d
+ 
 -Warning: stream_socket_client(): unable to connect to tcp://www.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.com:80 (php_network_getaddresses: getaddrinfo failed: %s) in %s on line %d
++Warning: stream_socket_client(): Unable to connect to tcp://www.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.com:80 (php_network_getaddresses: getaddrinfo failed: %s) in %s on line %d