diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-12-12 13:59:37 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-12-12 13:59:37 +0400 |
| commit | a23bcba875a9a17717f77e6365fd16d17ef16db5 (patch) | |
| tree | d8916272f1578f5f0e3289225541aedd54cfcaac | |
| parent | 8738e6d86f79db67c47f633dbb42601c8a4ab1ff (diff) | |
| parent | 58b754ca4af52fe1a3c2d696c3cd1c747ac38012 (diff) | |
| download | php-git-a23bcba875a9a17717f77e6365fd16d17ef16db5.tar.gz | |
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Fixed bug #65486 mysqli_poll() is broken on Win x64
| -rw-r--r-- | ext/openssl/xp_ssl.c | 4 | ||||
| -rw-r--r-- | main/streams/xp_socket.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 2e7f0cdc3f..9c9f2a3592 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -867,7 +867,7 @@ static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret TS case PHP_STREAM_AS_FD_FOR_SELECT: if (ret) { - *(int *)ret = sslsock->s.socket; + *(php_socket_t *)ret = sslsock->s.socket; } return SUCCESS; @@ -877,7 +877,7 @@ static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret TS return FAILURE; } if (ret) { - *(int *)ret = sslsock->s.socket; + *(php_socket_t *)ret = sslsock->s.socket; } return SUCCESS; default: diff --git a/main/streams/xp_socket.c b/main/streams/xp_socket.c index 4edc68b015..0366027c1d 100644 --- a/main/streams/xp_socket.c +++ b/main/streams/xp_socket.c @@ -426,7 +426,7 @@ static int php_sockop_cast(php_stream *stream, int castas, void **ret TSRMLS_DC) case PHP_STREAM_AS_FD: case PHP_STREAM_AS_SOCKETD: if (ret) - *(int*)ret = sock->socket; + *(php_socket_t *)ret = sock->socket; return SUCCESS; default: return FAILURE; |