summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2014-09-10 17:31:37 +0200
committerNikita Popov <nikic@php.net>2015-01-17 18:26:45 +0100
commitca11bc0325496bef94d4417f300e323040fb11db (patch)
tree82dda72933931c570072b1eb73003656e01d0e5b
parenta60efc5e11b65083ef4cc8a132df620e1642dd76 (diff)
downloadphp-git-ca11bc0325496bef94d4417f300e323040fb11db.tar.gz
Remove set_socket_blocking
-rw-r--r--NEWS2
-rw-r--r--UPGRADING3
-rw-r--r--ext/standard/basic_functions.c1
3 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index a34366253c..17b17c6951 100644
--- 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 77a54c80c2..e077053163 100644
--- 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 096971eedc..940c9e4141 100644
--- 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)