]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4' into master
authorChristoph M. Becker <cmbecker69@gmx.de>
Fri, 11 Sep 2020 12:49:07 +0000 (14:49 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Fri, 11 Sep 2020 12:49:07 +0000 (14:49 +0200)
* PHP-7.4:
  Fix #80067: Omitting the port in bindto setting errors

1  2 
ext/standard/tests/network/bindto.phpt
main/network.c
main/streams/xp_socket.c

index bfff64a5e094027b11fb7acdaa2f42d21e561f9e,27ae45e5ff07829c007b954fa7d5cef20737bff5..2cd56a7f6af8c0b343b17770adb1883c9b6c188a
@@@ -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
diff --cc main/network.c
Simple merge
Simple merge