From: Joe Watkins <krakjoe@php.net>
Date: Tue, 11 Jun 2019 07:06:48 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c195fb846082e0e7652c04a47364f410b1b6dee;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Clean up opcache func flags for set_socket_blocking
---

6c195fb846082e0e7652c04a47364f410b1b6dee
diff --cc ext/opcache/Optimizer/zend_func_info.c
index 146d7d1a1f,ee1445f3ce..ace1075f91
--- a/ext/opcache/Optimizer/zend_func_info.c
+++ b/ext/opcache/Optimizer/zend_func_info.c
@@@ -541,10 -671,9 +541,9 @@@ static const func_info_t func_infos[] 
  	F0("stream_set_write_buffer",      MAY_BE_FALSE | MAY_BE_LONG),
  	F0("set_file_buffer",              MAY_BE_FALSE | MAY_BE_LONG),
  	F0("stream_set_chunk_size",        MAY_BE_FALSE | MAY_BE_LONG),
- 	F0("set_socket_blocking",          MAY_BE_FALSE | MAY_BE_TRUE),
 -	F0("stream_set_blocking",          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
 -	F0("socket_set_blocking",          MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_TRUE),
 -	F1("stream_get_meta_data",         MAY_BE_NULL | MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
 +	F0("stream_set_blocking",          MAY_BE_FALSE | MAY_BE_TRUE),
 +	F0("socket_set_blocking",          MAY_BE_FALSE | MAY_BE_TRUE),
 +	F1("stream_get_meta_data",         MAY_BE_FALSE | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_STRING | MAY_BE_ARRAY_OF_ANY),
  	F1("stream_get_line",              MAY_BE_FALSE | MAY_BE_STRING),
  	F0("stream_wrapper_register",      MAY_BE_FALSE | MAY_BE_TRUE),
  	F0("stream_register_wrapper",      MAY_BE_FALSE | MAY_BE_TRUE),