diff options
| author | Anatol Belski <ab@php.net> | 2013-12-12 10:46:21 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-12-12 10:46:21 +0100 |
| commit | 39a2dcdeac1c65076b54750435786ae1fbcf2694 (patch) | |
| tree | 7b9f443f1cbb33312cc4500d324f6bb1a758544b | |
| parent | d40a5a2797970a316e32a3f6af18f0ce6e1c264a (diff) | |
| parent | da62fd5ed824bafc4dc3e90278c3d57d8e74cbe1 (diff) | |
| download | php-git-39a2dcdeac1c65076b54750435786ae1fbcf2694.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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; |