diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 16:30:47 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-12 16:30:47 +0200 |
| commit | 608f2112e957f75c1982785593cb9b417046ef5c (patch) | |
| tree | d18ea85e1a5b84ea6c777025d2e2165a375d7b42 /ext/libxml/libxml.c | |
| parent | 76783a9bcc900cf90bc1bcd9d43d700b50c87f95 (diff) | |
| parent | 9d141f98890847f6b239a5ce7f02801912202525 (diff) | |
| download | php-git-608f2112e957f75c1982785593cb9b417046ef5c.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
Diffstat (limited to 'ext/libxml/libxml.c')
| -rw-r--r-- | ext/libxml/libxml.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 15ef274ee4..efccf0a407 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -871,13 +871,14 @@ static PHP_RINIT_FUNCTION(libxml) xmlSetGenericErrorFunc(NULL, php_libxml_error_handler); xmlParserInputBufferCreateFilenameDefault(php_libxml_input_buffer_create_filename); xmlOutputBufferCreateFilenameDefault(php_libxml_output_buffer_create_filename); - - /* Enable the entity loader by default. This ensures that - * other threads/requests that might have disabled the loader - * do not affect the current request. - */ - LIBXML(entity_loader_disabled) = 0; } + + /* Enable the entity loader by default. This ensures that + * other threads/requests that might have disabled the loader + * do not affect the current request. + */ + LIBXML(entity_loader_disabled) = 0; + return SUCCESS; } |