diff options
| author | Joe Orton <jorton@php.net> | 2008-04-04 13:02:48 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@php.net> | 2008-04-04 13:02:48 +0000 |
| commit | c3474b91163118f69d24d2859d7c3ff07460e992 (patch) | |
| tree | 99f137b11b90bed0dcf4d5e80b7a7f3ec752f850 | |
| parent | 6157fc76813321778ee0c99ebc9cf6c40eefc99d (diff) | |
| download | php-git-c3474b91163118f69d24d2859d7c3ff07460e992.tar.gz | |
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.
| -rw-r--r-- | ext/openssl/xp_ssl.c | 4 | ||||
| -rw-r--r-- | 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: |