- Updating UPGRADING for r309516 and modest merge to 5.3.

diff --git a/NEWS b/NEWS
index e3e7f7d543c847119fcca6ab89ddbb9ca24d053a..5c67a490964c591ed116da6c7240098896f9047e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -37,6 +37,8 @@ PHP                                                                        NEWS
   . 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:

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 7b3c54ff88050bc591520af312f1e84d743ebb0f..91ae979827c20fca44de18a26a35ef7c27f8c42d 100644 (file)
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -916,8 +916,10 @@ PHP_FUNCTION(socket_set_nonblock)
        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 @@ PHP_FUNCTION(socket_set_block)
        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;
 }
 /* }}} */
 

diff --git a/ext/sockets/tests/socket_strerror.phpt b/ext/sockets/tests/socket_strerror.phpt
index d1759c582cba29c7ce4229c1b8f4b0c21102997a..d3abe8fb59babc31b48a950b512991ebb01da460 100644 (file)
--- a/ext/sockets/tests/socket_strerror.phpt
+++ b/ext/sockets/tests/socket_strerror.phpt
@@ -154,4 +154,4 @@ string(20) "Key has been revoked"
 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"

diff --git a/main/network.c b/main/network.c
index 1133fc59016334e823a9bc72f2b18dfae5a1bcb6..770a6d8252b82b3cdb896620e0dec15c5efc8729 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -1095,7 +1095,9 @@ PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC)
        } else {
                flags &= ~myflag;
        }
-       fcntl(socketd, F_SETFL, flags);
+       if (fcntl(socketd, F_SETFL, flags) == -1) {
+               ret = FAILURE;
+       }
 #endif
        return ret;
 }