mirror of
https://github.com/php/php-src.git
synced 2024-11-24 02:15:04 +08:00
Undo accidental revert of patch for bug #34729
This commit is contained in:
parent
9e8bf1a20f
commit
d5bb2e38ef
@ -107,6 +107,8 @@ php_basic_globals basic_globals;
|
||||
#include "php_fopen_wrappers.h"
|
||||
#include "streamsfuncs.h"
|
||||
|
||||
static zend_class_entry *incomplete_class_entry = NULL;
|
||||
|
||||
static
|
||||
ZEND_BEGIN_ARG_INFO(first_and_second__args_force_ref, 0)
|
||||
ZEND_ARG_PASS_INFO(1)
|
||||
@ -955,8 +957,7 @@ static void basic_globals_ctor(php_basic_globals *basic_globals_p TSRMLS_DC)
|
||||
#if defined(_REENTRANT) && defined(HAVE_MBRLEN) && defined(HAVE_MBSTATE_T)
|
||||
memset(&BG(mblen_state), 0, sizeof(BG(mblen_state)));
|
||||
#endif
|
||||
|
||||
BG(incomplete_class) = php_create_incomplete_class(TSRMLS_C);
|
||||
BG(incomplete_class) = incomplete_class_entry;
|
||||
}
|
||||
|
||||
|
||||
@ -1022,6 +1023,8 @@ PHP_MINIT_FUNCTION(basic)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
BG(incomplete_class) = incomplete_class_entry = php_create_incomplete_class(TSRMLS_C);
|
||||
|
||||
REGISTER_LONG_CONSTANT("CONNECTION_ABORTED", PHP_CONNECTION_ABORTED, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CONNECTION_NORMAL", PHP_CONNECTION_NORMAL, CONST_CS | CONST_PERSISTENT);
|
||||
REGISTER_LONG_CONSTANT("CONNECTION_TIMEOUT", PHP_CONNECTION_TIMEOUT, CONST_CS | CONST_PERSISTENT);
|
||||
|
Loading…
Reference in New Issue
Block a user