diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-02-20 22:30:59 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-02-20 22:30:59 +0400 |
| commit | 20c623c9be2ad9c408b991e805780ac1fc5493e8 (patch) | |
| tree | f7226e2d6059f8a766fba738a8817bfd6690fb9e /ext/libxml/php_libxml.h | |
| parent | b157e05f573a2ec3b3344317c6a981f933ff4c9a (diff) | |
| parent | c737b89473df9dba6742b8fc8fbf6d009bf05c36 (diff) | |
| download | php-git-20c623c9be2ad9c408b991e805780ac1fc5493e8.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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); |