diff options
| author | Remi Collet <remi@php.net> | 2014-06-10 10:32:26 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-06-10 10:32:26 +0200 |
| commit | d440bb3e6854070f3b0a02b0d73b9b06065959af (patch) | |
| tree | 3973fa8db894bb40a8221f6ca83074f3a0b1419d /sapi | |
| parent | 95fcf868d3b71be3e370ee9f27aa4c120109e7ca (diff) | |
| parent | 949cab09f24abb80b8585af744bd964dc17f7401 (diff) | |
| download | php-git-d440bb3e6854070f3b0a02b0d73b9b06065959af.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
NEWS
Fixed bug #67406 built-in web-server segfaults on startup
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 98727da66f..3ca3325046 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -894,11 +894,11 @@ static void php_cli_server_poller_remove(php_cli_server_poller *poller, int mode #endif } /* }}} */ -static int php_cli_server_poller_poll(php_cli_server_poller *poller, const struct timeval *tv) /* {{{ */ +static int php_cli_server_poller_poll(php_cli_server_poller *poller, struct timeval *tv) /* {{{ */ { memmove(&poller->active.rfds, &poller->rfds, sizeof(poller->rfds)); memmove(&poller->active.wfds, &poller->wfds, sizeof(poller->wfds)); - return php_select(poller->max_fd + 1, &poller->active.rfds, &poller->active.wfds, NULL, (struct timeval *)tv); + return php_select(poller->max_fd + 1, &poller->active.rfds, &poller->active.wfds, NULL, tv); } /* }}} */ static int php_cli_server_poller_iter_on_active(php_cli_server_poller *poller, void *opaque, int(*callback)(void *, int fd, int events)) /* {{{ */ @@ -2476,7 +2476,7 @@ static int php_cli_server_do_event_loop(php_cli_server *server TSRMLS_DC) /* {{{ { int retval = SUCCESS; while (server->is_running) { - static const struct timeval tv = { 1, 0 }; + struct timeval tv = { 1, 0 }; int n = php_cli_server_poller_poll(&server->poller, &tv); if (n > 0) { php_cli_server_do_event_for_each_fd(server, |