archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- Better error handling.

Browse source
This commit is contained in:
Moriyoshi Koizumi 2011-07-20 08:43:12 +00:00
parent a07a4af30b
commit b0683007c9
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
sapi/cli/php_cli_server.c
View file

@ -1805,9 +1805,9 @@ static int php_cli_server_ctor(php_cli_server *server, const char *addr, const c
int err = 0;
int port = 3000;
php_socket_t server_sock = SOCK_ERR;
char *p = NULL;
if (addr[0] == '[') {
char *p;
host = pestrdup(addr + 1, 1);
if (!host) {
return FAILURE;
@ -1817,27 +1817,32 @@ static int php_cli_server_ctor(php_cli_server *server, const char *addr, const c
*p++ = '\0';
if (*p == ':') {
port = strtol(p + 1, &p, 10);
if (port <= 0) {
p = NULL;
}
} else if (*p != '\0') {
p = NULL;
}
}
if (!p) {
fprintf(stderr, "Invalid IPv6 address: %s\n", host);
retval = FAILURE;
goto out;
}
} else {
char *p;
host = pestrdup(addr, 1);
if (!host) {
return FAILURE;
}
p = strrchr(host, ':');
p = strchr(host, ':');
if (p) {
*p++ = '\0';
port = strtol(p, &p, 10);
if (port <= 0) {
p = NULL;
}
}
}
if (!p) {
fprintf(stderr, "Invalid address: %s\n", addr);
retval = FAILURE;
goto out;
}
server_sock = php_network_listen_socket(host, &port, SOCK_STREAM, &server->address_family, &server->socklen, &errstr TSRMLS_CC);
if (server_sock == SOCK_ERR) {