com php-src: Fixed bug #70718 stream_select() when Op enSSL extension is loaded on PHP Win64: ext /openssl/xp_ssl.c
| From: | Anatol Belski | Date: | Mon, 26 Oct 2015 14:54:29 +0000 |
| Subject: | com php-src: Fixed bug #70718 stream_select() when Op enSSL extension is loaded on PHP Win64: ext /openssl/xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89531@lists.php.net to get a copy of this message | ||
Commit: 83bfefeccbae59168a5e6baf6eaf34db0a0047e0
Author: Anatol Belski <ab@php.net> Mon, 26 Oct 2015 15:54:29 +0100
Parents: 36311ee4fd0ad33735ab0dc02f795b65888ca72d
Branches: PHP-5.6 PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=83bfefeccbae59168a5e6baf6eaf34db0a0047e0
Log:
Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64
Bugs:
https://bugs.php.net/70718
Changed paths:
M ext/openssl/xp_ssl.c
Diff:
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c
index e24d32c..ea0c6cb 100644
--- a/ext/openssl/xp_ssl.c
+++ b/ext/openssl/xp_ssl..c
@@ -2298,7 +2298,7 @@ static int php_openssl_sockop_cast(php_stream *stream, int castas, void **ret
TS
: stream->chunk_size);
}
- *(int *)ret = sslsock->s.socket;
+ *(php_socket_t *)ret = sslsock->s.socket;
}
return SUCCESS;