diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-02-20 22:27:41 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-02-20 22:27:41 +0400 |
| commit | c737b89473df9dba6742b8fc8fbf6d009bf05c36 (patch) | |
| tree | 5d067fae4757d65bd66f57bab59c1a0dec0dc56c /ext/libxml/php_libxml.h | |
| parent | 021f57ef0e21868f6bbef34c4b1a1a2bf5461159 (diff) | |
| parent | 8e76d0404b7f664ee6719fd98f0483f0ac4669d6 (diff) | |
| download | php-git-c737b89473df9dba6742b8fc8fbf6d009bf05c36.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed external entity loading
Conflicts:
ext/libxml/libxml.c
ext/libxml/php_libxml.h
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); |