jorton          Tue Apr  8 14:11:50 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/openssl        xp_ssl.c 
    /php-src/ext/soap   php_http.c 
    /php-src    NEWS 
  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.10&r2=1.22.2.3.2.11&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.10 
php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.11
--- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.10  Mon Dec 31 07:20:09 2007
+++ php-src/ext/openssl/xp_ssl.c        Tue Apr  8 14:11:49 2008
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: xp_ssl.c,v 1.22.2.3.2.10 2007/12/31 07:20:09 sebastian Exp $ */
+/* $Id: xp_ssl.c,v 1.22.2.3.2.11 2008/04/08 14:11:49 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.14&r2=1.77.2.11.2.15&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.14 
php-src/ext/soap/php_http.c:1.77.2.11.2.15
--- php-src/ext/soap/php_http.c:1.77.2.11.2.14  Mon Dec 31 07:20:11 2007
+++ php-src/ext/soap/php_http.c Tue Apr  8 14:11:49 2008
@@ -17,7 +17,7 @@
   |          Dmitry Stogov <[EMAIL PROTECTED]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: php_http.c,v 1.77.2.11.2.14 2007/12/31 07:20:11 sebastian Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.15 2008/04/08 14:11:49 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:
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1135&r2=1.2027.2.547.2.1136&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1135 php-src/NEWS:1.2027.2.547.2.1136
--- php-src/NEWS:1.2027.2.547.2.1135    Tue Apr  8 08:45:51 2008
+++ php-src/NEWS        Tue Apr  8 14:11:49 2008
@@ -4,6 +4,8 @@
 - Fixed bug #44667 (proc_open() does not handle pipes with the mode 'wb'
   correctly). (Jani)
 - Fixed bug #44591 (imagegif's filename parameter). (Felipe)
+- Fixed bug #32979 (OpenSSL stream->fd casts broken in 64-bit build)
+  (stotty at tvnet dot hu)
 
 03 Apr 2008, PHP 5.2.6RC4
 - Fixed possible stack buffer overflow in FastCGI SAPI. (Andrei Nigmatulin)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to