svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/sockets/sockets.c branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt
branches/PHP_5_3/main/network.c trunk/UPGRADING
| From: | Gustavo André dos Santos Lopes | Date: | Wed, 23 Mar 2011 00:51:22 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/sockets/sockets.c branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt branches/PHP_5_3/main/network.c trunk/UPGRADING |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-64741@lists.php.net to get a copy of this message | ||
cataphract Wed, 23 Mar 2011 00:51:22 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=309579
Log:
- Updating UPGRADING for r309516 and modest merge to 5.3.
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
U php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt
U php/php-src/branches/PHP_5_3/main/network.c
U php/php-src/trunk/UPGRADING
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2011-03-23 00:01:17 UTC (rev 309578)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-03-23 00:51:22 UTC (rev 309579)
@@ -37,6 +37,8 @@
. Fixed bug #54312 (soap_version logic bug). (tom at samplonius dot org)
- Sockets extension:
+ . Changed socket_set_block() and socket_set_nonblock() so they emit warnings
+ on error. (Gustavo)
. Fixed bug #51958 (socket_accept() fails on IPv6 server sockets). (Gustavo)
- SPL extension:
Modified: php/php-src/branches/PHP_5_3/ext/sockets/sockets.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2011-03-23 00:01:17 UTC (rev 309578)
+++ php/php-src/branches/PHP_5_3/ext/sockets/sockets.c 2011-03-23 00:51:22 UTC (rev 309579)
@@ -916,8 +916,10 @@
if (php_set_sock_blocking(php_sock->bsd_socket, 0 TSRMLS_CC) == SUCCESS) {
php_sock->blocking = 0;
RETURN_TRUE;
+ } else {
+ PHP_SOCKET_ERROR(php_sock, "unable to set nonblocking mode", errno);
+ RETURN_FALSE;
}
- RETURN_FALSE;
}
/* }}} */
@@ -937,8 +939,10 @@
if (php_set_sock_blocking(php_sock->bsd_socket, 1 TSRMLS_CC) == SUCCESS) {
php_sock->blocking = 1;
RETURN_TRUE;
+ } else {
+ PHP_SOCKET_ERROR(php_sock, "unable to set blocking mode", errno);
+ RETURN_FALSE;
}
- RETURN_FALSE;
}
/* }}} */
Modified: php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt 2011-03-23 00:01:17 UTC (rev
309578)
+++ php/php-src/branches/PHP_5_3/ext/sockets/tests/socket_strerror.phpt 2011-03-23 00:51:22 UTC (rev
309579)
@@ -154,4 +154,4 @@
string(27) "Key was rejected by service"
string(10) "Owner died"
string(21) "State not recoverable"
-string(17) "Unknown error 132"
+string(37) "Operation not possible due to RF-kill"
Modified: php/php-src/branches/PHP_5_3/main/network.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/network.c 2011-03-23 00:01:17 UTC (rev 309578)
+++ php/php-src/branches/PHP_5_3/main/network.c 2011-03-23 00:51:22 UTC (rev 309579)
@@ -1095,7 +1095,9 @@
} else {
flags &= ~myflag;
}
- fcntl(socketd, F_SETFL, flags);
+ if (fcntl(socketd, F_SETFL, flags) == -1) {
+ ret = FAILURE;
+ }
#endif
return ret;
}
Modified: php/php-src/trunk/UPGRADING
===================================================================
--- php/php-src/trunk/UPGRADING 2011-03-23 00:01:17 UTC (rev 309578)
+++ php/php-src/trunk/UPGRADING 2011-03-23 00:51:22 UTC (rev 309579)
@@ -330,6 +330,7 @@
- http_response_code()
- trait_exists()
- stream_set_chunk_size()
+ - socket_import_stream()
f. New global constants