From c3474b91163118f69d24d2859d7c3ff07460e992 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 4 Apr 2008 13:02:48 +0000 Subject: [PATCH] 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. --- ext/openssl/xp_ssl.c | 4 ++-- ext/soap/php_http.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 74752936f7..ef109d5c65 100644 --- 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 2df0482563..717a85d980 100644 --- 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: -- 2.50.1