diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-04-09 18:32:55 +0000 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2011-04-09 18:32:55 +0000 |
| commit | 047ed8dfbb1beded4bf3fbc590a4052c87644ed2 (patch) | |
| tree | e8f488fb9a51aa0addf86474bf1e4887a682fc88 | |
| parent | f2cfb997de5aa7cebaacc3f5b00454ed5fa28ba9 (diff) | |
| download | php-git-047ed8dfbb1beded4bf3fbc590a4052c87644ed2.tar.gz | |
- Fixed bug #54440: libxml extension ignores default context.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/libxml/libxml.c | 4 | ||||
| -rw-r--r-- | ext/libxml/tests/bug54440.phpt | 51 |
3 files changed, 55 insertions, 3 deletions
@@ -41,6 +41,9 @@ PHP NEWS . Fixed bug #53339 (Fails to build when compilng with gcc 4.5 and DSO libraries). (Clint Byrum, Raphael) +- libxml extension: + . Fixed bug #54440 (libxml extension ignores default context). (Gustavo) + - mbstring extension: . Fixed bug #54494 (mb_substr() mishandles UTF-32LE and UCS-2LE). (Gustavo) diff --git a/ext/libxml/libxml.c b/ext/libxml/libxml.c index 0c3b64ea2f..c9fb2871f3 100644 --- a/ext/libxml/libxml.c +++ b/ext/libxml/libxml.c @@ -310,9 +310,7 @@ static void *php_libxml_streams_IO_open_wrapper(const char *filename, const char } } - if (LIBXML(stream_context)) { - context = zend_fetch_resource(&LIBXML(stream_context) TSRMLS_CC, -1, "Stream-Context", NULL, 1, php_le_stream_context()); - } + context = php_stream_context_from_zval(LIBXML(stream_context), 0); ret_val = php_stream_open_wrapper_ex(path_to_open, (char *)mode, ENFORCE_SAFE_MODE|REPORT_ERRORS, NULL, context); if (isescaped) { diff --git a/ext/libxml/tests/bug54440.phpt b/ext/libxml/tests/bug54440.phpt new file mode 100644 index 0000000000..4074ff9fe8 --- /dev/null +++ b/ext/libxml/tests/bug54440.phpt @@ -0,0 +1,51 @@ +--TEST-- +Bug #54440: libxml extension ignores default context +--SKIPIF-- +<?php if (!extension_loaded('simplexml')) die('skip simplexml required for this test'); ?> +--FILE-- +<?php + +class TestWrapper { + +function stream_open($path, $mode, $options, &$opened_path) +{ + if ($this->context) + print_r(stream_context_get_options($this->context)); + return false; +} + +function url_stat($path, $flags) +{ +return array(); +} + +} + +stream_wrapper_register("test", "TestWrapper") + or die("Failed to register protocol"); + +$ctx1 = stream_context_create(array('test'=>array('test'=>'test 1'))); +$ctx2 = stream_context_create(array('test'=>array('test'=>'test 2'))); + +stream_context_set_default(stream_context_get_options($ctx1)); +@simplexml_load_file('test://sdfsdf'); + +libxml_set_streams_context($ctx2); +@simplexml_load_file('test://sdfsdf'); +--EXPECT-- +Array +( + [test] => Array + ( + [test] => test 1 + ) + +) +Array +( + [test] => Array + ( + [test] => test 2 + ) + +) |