MFH: Fixed bug #32979 (OpenSSL stream->fd casts broken in 64-bit build)

   (stotty at tvnet dot hu)
MFH: Fix another case of a broken stream->fd cast in 64-bit builds.

diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index 74752936f7f50fb00031a1f29587d2aad5331bfa..ef109d5c6557fe6f230b9e597e403581981e193b 100644 (file)
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl.c
@@ -728,7 +728,7 @@ static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret TS
 
                case PHP_STREAM_AS_FD_FOR_SELECT:
                        if (ret) {
-                               *ret = (void*)sslsock->s.socket;
+                               *(int *)ret = sslsock->s.socket;
                        }
                        return SUCCESS;
 
@@ -738,7 +738,7 @@ static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret TS
                                return FAILURE;
                        }
                        if (ret) {
-                               *ret = (void*)sslsock->s.socket;
+                               *(int *)ret = sslsock->s.socket;
                        }
                        return SUCCESS;
                default:

diff --git a/ext/soap/php_http.c b/ext/soap/php_http.c
index 2df048256380afd6e6d352bb91cc5f69ec7592ab..717a85d9803cbfe110670939dcd37f34a6fc7816 100644 (file)
--- a/ext/soap/php_http.c
+++ b/ext/soap/php_http.c
@@ -33,7 +33,7 @@ static int get_http_headers(php_stream *socketd,char **response, int *out_size T
 
 static int stream_alive(php_stream *stream  TSRMLS_DC)
 {
-       long socket;
+       int socket;
        char buf;
 
        /* maybe better to use: