diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-12-12 14:00:03 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-12-12 14:00:03 +0400 |
| commit | 47f41385e1cad7cf2d4b78163004407689e0a8e7 (patch) | |
| tree | 2194482f3a0b8c9fb783c85ae7fa6817fe96af6a | |
| parent | 0344e6a4298339d4f54ebc614af8a848cff85376 (diff) | |
| parent | da62fd5ed824bafc4dc3e90278c3d57d8e74cbe1 (diff) | |
| download | php-git-47f41385e1cad7cf2d4b78163004407689e0a8e7.tar.gz | |
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src:
Fixed bug #65486 mysqli_poll() is broken on Win x64
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/openssl/xp_ssl.c | 4 | ||||
| -rw-r--r-- | main/streams/xp_socket.c | 2 |
3 files changed, 6 insertions, 3 deletions
@@ -27,6 +27,9 @@ PHP NEWS . Fixed bug #64405 (Use freetype-config for determining freetype2 dir(s)). (Adam) +- MySQLi: + . Fixed bug #65486 (mysqli_poll() is broken on win x64). (Anatol) + - SOAP . Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at) diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index a1a7ffc3f4..1d1c91f132 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -825,7 +825,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; @@ -835,7 +835,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 a9c050f267..34a106e280 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; |