diff options
author | Nikita Popov <nikic@php.net> | 2014-09-10 17:31:37 +0200 |
---|---|---|
committer | Nikita Popov <nikic@php.net> | 2015-01-17 18:26:45 +0100 |
commit | ca11bc0325496bef94d4417f300e323040fb11db (patch) | |
tree | 82dda72933931c570072b1eb73003656e01d0e5b | |
parent | a60efc5e11b65083ef4cc8a132df620e1642dd76 (diff) | |
download | php-git-ca11bc0325496bef94d4417f300e323040fb11db.tar.gz |
Remove set_socket_blocking
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | UPGRADING | 3 | ||||
-rw-r--r-- | ext/standard/basic_functions.c | 1 |
3 files changed, 5 insertions, 1 deletions
@@ -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) @@ -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) |