Remove set_socket_blocking

diff --git a/NEWS b/NEWS
index a34366253c0d4e334c3ed2ef7e1bc4e8a74a2249..17b17c6951a23f7cc6935cefc7c95bcff5119641 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -115,6 +115,8 @@
 - Streams:
   . Fixed bug #68532 (convert.base64-encode omits padding bytes).
     (blaesius at krumedia dot de)
+  . Removed set_socket_blocking() in favor of its alias stream_set_blocking().
+    (Nikita)
 
 - XSL:
   . Fixed bug #64776 (The XSLT extension is not thread safe). (Mike)

diff --git a/UPGRADING b/UPGRADING
index 77a54c80c2468f7b23e6d87095417c8011f04473..e077053163e1c9521747dc410df4bf6deb2208c8 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -80,6 +80,9 @@ PHP X.Y UPGRADE NOTES
     instead.
   . Removed set_magic_quotes_runtime() and its alias magic_quotes_runtime().
 
+- Stream:
+  . Removed set_socket_blocking() in favor of its alias stream_set_blocking().
+
 ========================================
 2. New Features
 ========================================

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 096971eedcf6f71154863c5711daef64159c6c8b..940c9e414175058440b2f3d9cc9491c79348fdc8 100644 (file)
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -3100,7 +3100,6 @@ const zend_function_entry basic_functions[] = { /* {{{ */
        PHP_FALIAS(set_file_buffer, stream_set_write_buffer,                                    arginfo_stream_set_write_buffer)
        PHP_FE(stream_set_chunk_size,                                                                                   arginfo_stream_set_chunk_size)
 
-       PHP_DEP_FALIAS(set_socket_blocking, stream_set_blocking,                                arginfo_stream_set_blocking)
        PHP_FE(stream_set_blocking,                                                                                             arginfo_stream_set_blocking)
        PHP_FALIAS(socket_set_blocking, stream_set_blocking,                                    arginfo_stream_set_blocking)