cvs: php-src(PHP_5_1) / NEWS /ext/sockets sockets.c

mike Thu Nov 3 10:00:51 2005 EDT Modified files: (Branch: PHP_5_1) /php-src NEWS /php-src/ext/sockets sockets.c Log: - MFB44: #34851 (SO_RECVTIMEO and SO_SNDTIMEO socket options expect integer parameter on Windows) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.173&r2=1.2027.2.174&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.173 php-src/NEWS:1.2027.2.174 --- php-src/NEWS:1.2027.2.173 Wed Nov 2 10:53:47 2005 +++ php-src/NEWS Thu Nov 3 10:00:48 2005 @@ -7,6 +7,8 @@ - Fixed bug #35017 (Exception thrown in error handler may cause unexpected behavior). (Dmitry) - Fixed bug #35014 (array_product() always returns 0). (Ilia) +- Fixed bug #34851 (SO_RECVTIMEO and SO_SNDTIMEO socket options expect integer + parameter on Windows). (Mike) 28 Oct 2005, PHP 5.1 Release Candidate 4 - Fixed fgetcsv() and fputcsv() inconsistency. (Dmitry) http://cvs.php.net/diff.php/php-src/ext/sockets/sockets.c?r1=1.171.2.1&r2=1.171.2.2&ty=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.171.2.1 php-src/ext/sockets/sockets.c:1.171.2.2 --- php-src/ext/sockets/sockets.c:1.171.2.1 Fri Sep 23 05:54:31 2005 +++ php-src/ext/sockets/sockets.c Thu Nov 3 10:00:51 2005 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.171.2.1 2005/09/23 09:54:31 hyanantha Exp $ */ +/* $Id: sockets.c,v 1.171.2.2 2005/11/03 15:00:51 mike Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1506,6 +1506,7 @@ zval *arg1; struct linger linger_val; struct timeval tv; + int timeout = 0; socklen_t optlen; php_socket *php_sock; int other_val; @@ -1533,12 +1534,24 @@ break; case SO_RCVTIMEO: case SO_SNDTIMEO: +#ifndef PHP_WIN32 optlen = sizeof(tv); if (getsockopt(php_sock->bsd_socket, level, optname, (char*)&tv, &optlen) != 0) { PHP_SOCKET_ERROR(php_sock, "unable to retrieve socket option", errno); RETURN_FALSE; } +#else + optlen = sizeof(int); + + if (getsockopt(php_sock->bsd_socket, level, optname, (char*)&timeout, &optlen) != 0) { + PHP_SOCKET_ERROR(php_sock, "unable to retrieve socket option", errno); + RETURN_FALSE; + } + + tv.tv_sec = timeout ? timeout / 1000 : 0; + tv.tv_usec = timeout ? (timeout * 1000) % 1000000 : 0; +#endif array_init(return_value); @@ -1568,7 +1581,7 @@ struct linger lv; struct timeval tv; php_socket *php_sock; - int ov, optlen, retval; + int ov, optlen, retval, timeout; long level, optname; void *opt_ptr; @@ -1628,11 +1641,16 @@ convert_to_long_ex(sec); convert_to_long_ex(usec); +#ifndef PHP_WIN32 tv.tv_sec = Z_LVAL_PP(sec); tv.tv_usec = Z_LVAL_PP(usec); - optlen = sizeof(tv); opt_ptr = &tv; +#else + timeout = Z_LVAL_PP(sec) * 1000 + Z_LVAL_PP(usec) / 1000; + optlen = sizeof(int); + opt_ptr = &timeout; +#endif break; default: convert_to_long_ex(&arg4);