Skip to content

Commit 0ca5ab4

Browse files
authored
Add host for php_network_getaddresses getaddrinfo failed error message. (#7181)
1 parent c4a005b commit 0ca5ab4

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

ext/ftp/tests/ftp_ssl_connect_error.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ echo "===DONE===\n";
2727

2828
-- Testing ftp_ssl_connect() function on failure --
2929

30-
Warning: ftp_ssl_connect(): php_network_getaddresses: getaddrinfo failed: %s in %s on line %d
30+
Warning: ftp_ssl_connect(): php_network_getaddresses: getaddrinfo for %s failed: %s in %s on line %d
3131
bool(false)
3232

3333
-- Testing ftp_ssl_connect() function timeout exception for value 0 --

ext/standard/tests/network/bindto.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ $fp = stream_socket_client(
1313
);
1414
?>
1515
--EXPECTF--
16-
Warning: stream_socket_client(): php_network_getaddresses: getaddrinfo failed: %s in %s on line %d
16+
Warning: stream_socket_client(): php_network_getaddresses: getaddrinfo for www.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.com failed: %s in %s on line %d
1717

18-
Warning: stream_socket_client(): Unable to connect to tcp://www.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.com:80 (php_network_getaddresses: getaddrinfo failed: %s) in %s on line %d
18+
Warning: stream_socket_client(): Unable to connect to tcp://www.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.com:80 (php_network_getaddresses: getaddrinfo for %s failed: %s) in %s on line %d

main/network.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka
201201
if (*error_string) {
202202
zend_string_release_ex(*error_string, 0);
203203
}
204-
*error_string = strpprintf(0, "php_network_getaddresses: getaddrinfo failed: %s", PHP_GAI_STRERROR(n));
204+
*error_string = strpprintf(0, "php_network_getaddresses: getaddrinfo for %s failed: %s", host, PHP_GAI_STRERROR(n));
205205
php_error_docref(NULL, E_WARNING, "%s", ZSTR_VAL(*error_string));
206206
} else {
207-
php_error_docref(NULL, E_WARNING, "php_network_getaddresses: getaddrinfo failed: %s", PHP_GAI_STRERROR(n));
207+
php_error_docref(NULL, E_WARNING, "php_network_getaddresses: getaddrinfo for %s failed: %s", host, PHP_GAI_STRERROR(n));
208208
}
209209
return 0;
210210
} else if (res == NULL) {
@@ -213,10 +213,10 @@ PHPAPI int php_network_getaddresses(const char *host, int socktype, struct socka
213213
if (*error_string) {
214214
zend_string_release_ex(*error_string, 0);
215215
}
216-
*error_string = strpprintf(0, "php_network_getaddresses: getaddrinfo failed (null result pointer) errno=%d", errno);
216+
*error_string = strpprintf(0, "php_network_getaddresses: getaddrinfo for %s failed (null result pointer) errno=%d", host, errno);
217217
php_error_docref(NULL, E_WARNING, "%s", ZSTR_VAL(*error_string));
218218
} else {
219-
php_error_docref(NULL, E_WARNING, "php_network_getaddresses: getaddrinfo failed (null result pointer)");
219+
php_error_docref(NULL, E_WARNING, "php_network_getaddresses: getaddrinfo for %s failed (null result pointer)", host);
220220
}
221221
return 0;
222222
}

0 commit comments

Comments
 (0)