jorton Fri Apr 4 13:02:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/openssl xp_ssl.c
/php-src/ext/soap php_http.c
Log:
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.
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.9.2.3&r2=1.22.2.3.2.9.2.4&diff_format=u
Index: php-src/ext/openssl/xp_ssl.c
diff -u php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.3
php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.4
--- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.9.2.3 Mon Dec 31 07:17:11 2007
+++ php-src/ext/openssl/xp_ssl.c Fri Apr 4 13:02:47 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.3 2007/12/31 07:17:11 sebastian Exp $ */
+/* $Id: xp_ssl.c,v 1.22.2.3.2.9.2.4 2008/04/04 13:02:47 jorton Exp $ */
#include "php.h"
#include "ext/standard/file.h"
@@ -728,7 +728,7 @@
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 @@
return FAILURE;
}
if (ret) {
- *ret = (void*)sslsock->s.socket;
+ *(int *)ret = sslsock->s.socket;
}
return SUCCESS;
default:
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.12.2.4&r2=1.77.2.11.2.12.2.5&diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.4
php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.5
--- php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.4 Fri Feb 22 05:04:34 2008
+++ php-src/ext/soap/php_http.c Fri Apr 4 13:02:48 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_http.c,v 1.77.2.11.2.12.2.4 2008/02/22 05:04:34 rasmus Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.12.2.5 2008/04/04 13:02:48 jorton Exp $ */
#include "php_soap.h"
#include "ext/standard/base64.h"
@@ -33,7 +33,7 @@
static int stream_alive(php_stream *stream TSRMLS_DC)
{
- long socket;
+ int socket;
char buf;
/* maybe better to use:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
