Revert "Fix GH-8409: SSL handshake timeout persistent connections hanging"

This reverts commit d052742.

This patch makes Swoole/Swow can not work anymore, because Coroutine will yield to another one during socket operation, EG(record_errors) assertion will always fail, and zend_begin_record_errors() was only used during compile time before.
Note: zend_emit_recorded_errors() and the typo fix are reserved.

Author: bukka

NEWS

@@ -49,8 +49,6 @@ PHP                                                                        NEWS
 - Streams:
   . Fixed bug GH-8472 (The resource returned by stream_socket_accept may have
     incorrect metadata). (Jakub Zelenka)
-  . Fixed bug GH-8409 (SSL handshake timeout leaves persistent connections
-    hanging). (Jakub Zelenka)
 
 04 Aug 2022, PHP 8.1.9
 

Zend/zend.c

@@ -1366,9 +1366,6 @@ ZEND_API ZEND_COLD void zend_error_zstr_at(
 		EG(num_errors)++;
 		EG(errors) = erealloc(EG(errors), sizeof(zend_error_info) * EG(num_errors));
 		EG(errors)[EG(num_errors)-1] = info;
-		if (EG(record_errors_without_emitting)) {
-			return;
-		}
 	}
 
 	/* Report about uncaught exception in case of fatal errors */
@@ -1622,25 +1619,14 @@ ZEND_API ZEND_COLD void zend_error_zstr(int type, zend_string *message) {
 	zend_error_zstr_at(type, filename, lineno, message);
 }
 
-static zend_always_inline void zend_begin_record_errors_ex(bool no_emmitting)
+ZEND_API void zend_begin_record_errors(void)
 {
 	ZEND_ASSERT(!EG(record_errors) && "Error recording already enabled");
 	EG(record_errors) = true;
-	EG(record_errors_without_emitting) = no_emmitting;
 	EG(num_errors) = 0;
 	EG(errors) = NULL;
 }
 
-ZEND_API void zend_begin_record_errors(void)
-{
-	zend_begin_record_errors_ex(false);
-}
-
-ZEND_API void zend_begin_record_errors_without_emitting(void)
-{
-	zend_begin_record_errors_ex(true);
-}
-
 ZEND_API void zend_emit_recorded_errors(void)
 {
 	EG(record_errors) = false;

Zend/zend.h

@@ -394,7 +394,6 @@ ZEND_API void zend_save_error_handling(zend_error_handling *current);
 ZEND_API void zend_replace_error_handling(zend_error_handling_t error_handling, zend_class_entry *exception_class, zend_error_handling *current);
 ZEND_API void zend_restore_error_handling(zend_error_handling *saved);
 ZEND_API void zend_begin_record_errors(void);
-ZEND_API void zend_begin_record_errors_without_emitting(void);
 ZEND_API void zend_emit_recorded_errors(void);
 ZEND_API void zend_free_recorded_errors(void);
 END_EXTERN_C()

Zend/zend_globals.h

@@ -261,10 +261,8 @@ struct _zend_executor_globals {
 	zend_long fiber_stack_size;
 
 	/* If record_errors is enabled, all emitted diagnostics will be recorded,
-	 * in addition to being processed as usual unless record_errors_without_emitting
-	 * is enabled which supresses processing when the errors are recorded. */
+	 * in addition to being processed as usual. */
 	bool record_errors;
-	bool record_errors_without_emitting;
 	uint32_t num_errors;
 	zend_error_info **errors;
 

ext/standard/tests/streams/gh8409.phpt

@@ -131,8 +131,6 @@ PHPAPI php_stream *_php_stream_xport_create(const char *name, size_t namelen, in
 			(char*)name, namelen, persistent_id, options, flags, timeout,
 			context STREAMS_REL_CC);
 
-	zend_begin_record_errors_without_emitting();
-
 	if (stream) {
 		php_stream_context_set(stream, context);
 
@@ -183,9 +181,6 @@ PHPAPI php_stream *_php_stream_xport_create(const char *name, size_t namelen, in
 		stream = NULL;
 	}
 
-	zend_emit_recorded_errors();
-	zend_free_recorded_errors();
-
 	return stream;
 }