cvs: php-src /ext/openssl xp_ssl.c
| From: | Joe Orton | Date: | Fri, 04 Apr 2008 12:49:57 +0000 |
| Subject: | cvs: php-src /ext/openssl xp_ssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-49494@lists.php.net to get a copy of this message | ||
jorton Fri Apr 4 12:49:57 2008 UTC
Modified files:
/php-src/ext/openssl xp_ssl.c
Log:
Fixed bug #32979 (OpenSSL stream->fd casts broken in 64-bit build)
(stotty at tvnet dot hu)
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.35&r2=1.36&diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.35 php-src/ext/openssl/xp_ssl.c:1.36
--- php-src/ext/openssl/xp_ssl.c:1.35 Mon Dec 31 07:12:12 2007
+++ php-src/ext/openssl/xp_ssl.c Fri Apr 4 12:49:57 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_ssl.c,v 1.35 2007/12/31 07:12:12 sebastian Exp $ */
+/* $Id: xp_ssl.c,v 1.36 2008/04/04 12:49:57 jorton Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -727,7 +727,7 @@
case PHP_STREAM_AS_FD_FOR_SELECT:
if (ret) {
- *ret = (void*)sslsock->s.socket;
+ *(int *)ret = sslsock->s.socket;
}
return SUCCESS;
@@ -737,7 +737,7 @@
return FAILURE;
}
if (ret) {
- *ret = (void*)sslsock->s.socket;
+ *(int *)ret = sslsock->s.socket;
}
return SUCCESS;
default: