diff options
author | Dmitry Stogov <dmitry@zend.com> | 2013-02-20 22:31:52 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2013-02-20 22:31:52 +0400 |
commit | b7f89bc70118db6481196e343dc9c244bca022b0 (patch) | |
tree | 9755e06ccdc17274639fc33911edffcac13d44ae /ext/libxml/php_libxml.h | |
parent | 39fb14acb7aa39c9c7f9a070d0871f0a240c4369 (diff) | |
parent | 20c623c9be2ad9c408b991e805780ac1fc5493e8 (diff) | |
download | php-git-b7f89bc70118db6481196e343dc9c244bca022b0.tar.gz |
Merge branch 'PHP-5.5'
* PHP-5.5:
Fixed external entity loading
Diffstat (limited to 'ext/libxml/php_libxml.h')
-rw-r--r-- | ext/libxml/php_libxml.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h index 8b9acc044e..04f8b4933b 100644 --- a/ext/libxml/php_libxml.h +++ b/ext/libxml/php_libxml.h @@ -47,6 +47,7 @@ ZEND_BEGIN_MODULE_GLOBALS(libxml) zend_fcall_info fci; zend_fcall_info_cache fcc; } entity_loader; + zend_bool entity_loader_disabled; ZEND_END_MODULE_GLOBALS(libxml) typedef struct _libxml_doc_props { @@ -97,6 +98,7 @@ PHP_LIBXML_API void php_libxml_ctx_error(void *ctx, const char *msg, ...); PHP_LIBXML_API int php_libxml_xmlCheckUTF8(const unsigned char *s); PHP_LIBXML_API zval *php_libxml_switch_context(zval *context TSRMLS_DC); PHP_LIBXML_API void php_libxml_issue_error(int level, const char *msg TSRMLS_DC); +PHP_LIBXML_API zend_bool php_libxml_disable_entity_loader(zend_bool disable TSRMLS_DC); /* Init/shutdown functions*/ PHP_LIBXML_API void php_libxml_initialize(void); |