Commit Graph

356 Commits

Author SHA1 Message Date
Rob Richards
2479cd6ec9 fix crash with entity declarations 2010-12-27 18:57:49 +00:00
Rob Richards
8bd6c63f66 fix crash with entity declarations 2010-12-27 18:57:49 +00:00
Pierre Joye
d8d014be78 - revert fix for #52655, rev. 302614 2010-08-23 17:01:44 +00:00
Pierre Joye
a6c5363f05 - revert fix for #52655, rev. 302614 2010-08-23 17:01:44 +00:00
Kalle Sommer Nielsen
3947bfeadf Fixed bug #52655 (SimpleXMLIterator supports ArrayAccess without implementing the interface) 2010-08-21 16:22:46 +00:00
Kalle Sommer Nielsen
77755af9b6 Fixed bug #52655 (SimpleXMLIterator supports ArrayAccess without implementing the interface) 2010-08-21 16:22:46 +00:00
Dmitry Stogov
04e72491bb Fixed a possible crash because of recursive GC invocation 2010-05-17 07:50:33 +00:00
Dmitry Stogov
059e2be153 Fixed a possible crash because of recursive GC invocation 2010-05-17 07:50:33 +00:00
Rob Richards
1e96fbe4a8 fix bug #48601 (xpath() returns FALSE for legitimate query)
add test
2010-05-05 11:40:11 +00:00
Rob Richards
8a0450698d fix bug #48601 (xpath() returns FALSE for legitimate query)
add test
2010-05-05 11:40:11 +00:00
Felipe Pena
df43d76e62 - Fixed bug #51615 (PHP crash with wrong HTML in SimpleXML) 2010-04-20 16:24:21 +00:00
Felipe Pena
3a0a2af52c - Fixed bug #51615 (PHP crash with wrong HTML in SimpleXML) 2010-04-20 16:24:21 +00:00
Dmitry Stogov
94dd83722b Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table 2010-04-20 10:57:45 +00:00
Kalle Sommer Nielsen
8c634336f3 Added parameter parsing check to SimpleXMLElement::count() 2010-02-25 17:06:32 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Ilia Alshanetsky
b6b56ba87a Fixed bug #49800 (SimpleXML allow (un)serialize() calls without warning).
# original patch by wmeler at wp-sa dot pl
2009-10-07 12:46:29 +00:00
Hannes Magnusson
4ed202e185 MFH: Mark spl as required and fix extension loading order
# Not needed in 5.2 as the simplexmliterator is part of spl there
2009-06-11 09:41:15 +00:00
David Coallier
0328eaea77 - Fixed Bug #46048 (SimpleXML top-level @attributes not part of iterator)
- Added test for bug #46048
2009-02-03 21:42:35 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Rob Richards
5690e188da MFH: properly export functions 2008-12-26 20:28:43 +00:00
Etienne Kneuss
3919b16f04 MFH: Fix #46241 (stacked error_handlers, error_handling in general) 2008-11-19 02:00:53 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Etienne Kneuss
27e41ff48c MFH: Fix #45976 (Move SXE from SPL to SimpleXML) 2008-11-06 00:37:13 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Arnaud Le Blanc
1d5ba8bb21 MFH: initialize optional vars 2008-10-21 23:39:15 +00:00
Rob Richards
2f3b8856ee MFH: fix bug #46323 (compilation of simplexml for NetWare breaks) 2008-10-20 19:29:04 +00:00
Alexey Zakhlestin
5058774e1f propagated const, to avoid "discards qualifiers from pointer target type" errors 2008-10-16 11:38:25 +00:00
Rob Richards
dea7f49f70 MFH: fix bug #46047 (SimpleXML converts empty nodes into object with nested array)
add test
2008-09-11 14:21:33 +00:00
Rob Richards
dcda8d83dd MFH: fix bug #46003 (isset on nonexisting node return unexpected results)
add test
2008-09-10 16:28:53 +00:00
Rob Richards
6d59a6d6b5 MFH: fix bug #45553 (Using XPath for attributes with a namespace does not work)
add test
2008-09-10 11:21:12 +00:00
Etienne Kneuss
c77ca4c34a MFH: Fix error_handling usage in various extensions 2008-08-08 22:07:07 +00:00
Etienne Kneuss
003841e312 MFH: Move SXI::count to SXE::count and make it user-friendly 2008-07-09 21:27:28 +00:00
Felipe Pena
2675046a95 - Added arginfo 2008-06-27 15:46:44 +00:00
Ilia Alshanetsky
33cb218c93 When dumping entire document to file via asXml() don't lose the encoding 2008-05-23 15:46:13 +00:00
Etienne Kneuss
57b8e83945 MFH: Fix #44484 (define SimpleXMLElement::__toString()) 2008-05-03 15:09:37 +00:00
Rob Richards
7c91532eac MFH: fix bug #44478 (Inconsistent behaviour when assigning new nodes)
add test
2008-03-20 16:48:10 +00:00
Felipe Pena
2b10c53ae1 MFH: Dropped zend.ze1_compatibility_mode
[DOC]
2008-03-18 14:10:45 +00:00
Rob Richards
d1459b8554 MFH: fix bug #42369 (Implicit conversion to string leaks memory)
add test
2008-01-31 21:58:57 +00:00
Dmitry Stogov
58433c9b11 Fixed bug #43918 (Segmentation fault in garbage collector) 2008-01-29 09:59:42 +00:00
Antony Dovgal
a5505302e4 fix leak appearing when appending data to unnamed attribute 2008-01-23 09:52:57 +00:00
Marcus Boerger
10a0f20652 - MFH Bugfix #37076 (SimpleXML ignores .=). (felipe, marcus) 2008-01-22 20:42:22 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Antony Dovgal
f5b1ee4b2b MFH: fix folding 2007-11-30 13:15:59 +00:00
Rob Richards
5d10360d5a MFH: fix bug #43221 (SimpleXML adding default namespace in addAttribute)
add test
2007-11-12 18:58:48 +00:00
Marcus Boerger
8ce1211a62 - MFH debug object helper 2007-10-11 01:03:19 +00:00
Yiduo (David) Wang
4b4d634cb9 MFH: Added macros for managing zval refcounts and is_ref statuses 2007-10-07 05:22:07 +00:00
Dmitry Stogov
6c810b0d4c Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:00:48 +00:00
Rob Richards
e0a2d149f5 MFH: fix bug #41833 (addChild() on a non-existent node, no node created, getName() segfaults) 2007-07-31 15:40:49 +00:00
Rob Richards
ce582024a5 MFH: fix possible crash 2007-07-31 15:07:54 +00:00
Rob Richards
796d9cd783 fix bug #41947 (SimpleXML incorrectly registers empty strings as namespaces
add test
2007-07-10 12:24:51 +00:00
Sara Golemon
1ac512f547 MFH (r-1.240)
Fix behavior of empty($sxe->element) and empty($sxe['prop'])
when used on empty elements properties (apply PHP emptiness rules)
2007-07-04 05:05:57 +00:00
Rob Richards
d6756845e8 fix bug #41861 (getNamespaces() returns namespaces of node's siblings)
add test
2007-07-03 14:55:53 +00:00
Rob Richards
4938221a36 fix bug #41867 (getName is broken)
add test
2007-07-02 11:35:18 +00:00
Nuno Lopes
7f47814c4e fix memleak in sxe_prop_dim_read()
#found by coverity
2007-06-24 11:41:12 +00:00
Dmitry Stogov
f018ec9024 Fixed wrong fix for bug #41582 2007-06-13 13:38:26 +00:00
Antony Dovgal
5d8ae45309 MFH: fix #41582 (SimpleXML crashes when accessing newly created element) 2007-06-05 10:03:12 +00:00
Ilia Alshanetsky
af7a7a4e36 Fixed error message to reflect the check 2007-04-24 14:11:28 +00:00
Ilia Alshanetsky
bc9f8f582c Fixed bug #41175 (addAttribute() fails to add an attribute with an empty
value).
2007-04-24 13:54:59 +00:00
Rob Richards
b7c2eb3228 fix bug #37386 (autocreating element doesn't assign value to first node)
all single SimpleXMLElements are addressable using offset 0
use correct node for xpath context node
add test
2007-03-26 20:14:58 +00:00
Antony Dovgal
180baf0109 MFH: fix leak and errmsg
add test
2007-02-20 14:08:43 +00:00
Antony Dovgal
e7544f28b8 MFH: fix #38406 (crash when assigning objects to SimpleXML attributes) 2007-02-20 13:22:41 +00:00
Antony Dovgal
2c31b1e194 fix #40451 (addAttribute() may crash when used with non-existent child node) 2007-02-12 21:06:29 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Rob Richards
604f18c20d fix bug #39760 (cloning fails on nested SimpleXML-Object)
add test
2006-12-30 15:41:17 +00:00
Antony Dovgal
4cc29fef5c MFH 2006-11-29 22:53:26 +00:00
Rob Richards
d5d1801df7 correct fix for bug #39662 to fix leak and tree corruption
fix test
2006-11-29 08:51:36 +00:00
Antony Dovgal
d55eb93c94 MFH: fix #39662 (Segfault when calling asXML() of a cloned SimpleXMLElement) 2006-11-28 18:59:53 +00:00
Nuno Lopes
b772a83282 fix one more parameter (int*->int) 2006-09-06 15:31:48 +00:00
Rob Richards
a0c941aad1 fix bug #38424 (Different attribute assignment if new or existing)
add test
2006-08-14 11:57:50 +00:00
Rob Richards
ee82fb781a should be RETURN_ not RETVAL_ 2006-08-07 10:15:12 +00:00
Rob Richards
65ae8773b5 asXML() needs to return bool when serializing doc and filename is passed in
do not copy the content of the outputbuffer twice in asXML()
fix compiler warnings
2006-08-07 10:09:52 +00:00
Christian Stocker
42982ac3a1 Fix #38354 (Unwanted reformatting of XML when using AsXML) 2006-08-06 19:38:45 +00:00
Antony Dovgal
07b5c8fe2a MFH: fix #38347 (Segmentation fault when using foreach with an unknown/empty SimpleXMLElement) 2006-08-06 17:41:51 +00:00
Antony Dovgal
218aa04f79 avoid extra strlen() call 2006-08-06 13:27:46 +00:00
Hannes Magnusson
ae1ec65637 Added SimpleXMLElement::saveXML() as an alias for SimpleXMLElement::asXML() 2006-06-26 13:41:52 +00:00
Rob Richards
d6a526d66b restore missing ze1 compat code 2006-06-06 12:05:30 +00:00
Zeev Suraski
66b90c7052 Final ze1_compat restoration - it was mostly done by hand, so if anybody
spots any (new) problems, let me know.  Test wise, the same tests that
failed before are failing now.
2006-06-05 16:53:21 +00:00
Marcus Boerger
200c627aeb - MFH Sync with head (namespace prefix handling) 2006-05-23 22:24:44 +00:00
Marcus Boerger
64701cf42b - MFH Bugfix #37565 2006-05-23 21:58:44 +00:00
Marcus Boerger
09b741ff47 - MFH Proto fix/add 2006-05-17 00:07:28 +00:00
Marcus Boerger
0dacd6d5c0 - ze1 cleanup (bjori) /thx 2006-05-10 19:41:34 +00:00
Marcus Boerger
77c1b56cd7 - Update after api changes 2006-05-10 00:00:13 +00:00
Marcus Boerger
011266f7e1 - MFH Fix properties access to children() result 2006-04-14 15:19:45 +00:00
Marcus Boerger
45b64e7a99 - Coverity issue 59 2006-04-10 23:23:09 +00:00
Antony Dovgal
0f510a6a95 #ifdef new functions and use their bodies to make PECL extensions compile with PHP < 5.1.3
(as was agreed with Ilia)
2006-04-03 14:59:30 +00:00
Antony Dovgal
59b8592c8c fix bug #36898 (__set() leaks in classes extending internal ones)
Added:
ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSRMLS_DC)
ZEND_API void zend_object_std_dtor(zend_object *object TSRMLS_DC)

to initialize and destroy zend_object structs
2006-03-29 14:28:43 +00:00
Rob Richards
8dffbf217d - Synch with head 2006-03-07 15:22:48 +00:00
Antony Dovgal
a9080d38f4 fix #36611 (assignment to SimpleXML object attribute changes argument type to string) 2006-03-05 15:36:03 +00:00
Rob Richards
84ad62553d nuke tests for libxml2 version - will always be > 2.6.0 2006-03-01 15:37:45 +00:00
Marcus Boerger
c5d70528d7 - MFH Fix count/foreach interaction 2006-02-27 13:38:03 +00:00
Marcus Boerger
44d4ba478f - Cleanup 2006-02-27 11:55:18 +00:00
Dmitry Stogov
cde6f6e0cc Fixed memory leak 2006-02-27 07:12:14 +00:00
Marcus Boerger
4d442447f1 - Synch with head 2006-02-26 23:14:45 +00:00
Antony Dovgal
c353a52a11 initialize variables 2006-02-06 10:52:34 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
foobar
3e669bc950 MFH: nuke php3 legacy 2005-12-06 02:28:41 +00:00
Marcus Boerger
40a3cdd97b - MFH
. Fix memleaks
  . Add tests
  . Add functions: getNamespaces(), getDocNamespaces()
  . Fixed var_dump()
  . Fixed bugs: #35028 XML object fails FALSE test
# This plan was decided before 5.1.0 came out with ilia and checked again
# just now. The extension currently shows no more memleaks or errors using
# the test suite.
2005-11-29 02:51:07 +00:00
Marcus Boerger
cfeb12ccf5 - MFH Fix parameter parsing 2005-11-20 13:05:15 +00:00
Rasmus Lerdorf
b03351633a And simplexml doesn't need dom anymore to do the import 2005-11-05 22:37:18 +00:00
Marcus Boerger
9622ccface - Drop unnecessary exports to prevent forward BC problems 2005-10-31 21:20:44 +00:00
Marcus Boerger
5460d2dad6 - Fix issue with entities in attributes 2005-10-24 08:29:36 +00:00
Marcus Boerger
308a64bc08 - MFH Really allow SXE being shared by not using anything from it directly in SPL 2005-10-03 16:05:08 +00:00
Rob Richards
ab78a63357 MFH: make sxe_properties_get respect namespace scope 2005-08-31 17:00:46 +00:00
foobar
9477097564 MFH: Nuked EOLs from error messages 2005-08-18 13:34:41 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Rasmus Lerdorf
3064cb787d Missing closing folding marker 2005-07-07 03:53:47 +00:00
foobar
340bcffdf0 - Unify (+ spl can't be build shared so COMPILE_DL_SPL 2005-06-30 11:15:00 +00:00
foobar
78a5b7693c Use the new dependency system 2005-06-17 11:35:22 +00:00
Rob Richards
cb72e23c14 add optional parameter to pass libxml document load options 2004-12-05 12:02:35 +00:00
Rob Richards
a50166004d remove cloning under ze1_compatibility_mode
- minor BC break but doesnt work right under compat mode anyways
2004-08-30 17:29:22 +00:00
Sara Golemon
b48af415cd ZTS Fix 2004-08-06 16:36:00 +00:00
Ilia Alshanetsky
ee656c4b32 php_error() -> php_error_docref() 2004-08-05 23:57:51 +00:00
Antony Dovgal
58f9ed3a8e nuke unused variable 2004-08-04 14:57:40 +00:00
Zeev Suraski
84e6f8f075 Fix prototypes 2004-08-04 14:41:56 +00:00
Christian Stocker
0936bfa42c renamed registerNamespace() to registerXPathNamespace() 2004-07-25 14:59:21 +00:00
Christian Stocker
0b244def73 added new method SimpleXMLElement->registerNamespace(string prefix, string uri)
"registers a prefix <-> namespaceURI combination for use in a later xpath query. "
2004-07-25 11:02:43 +00:00
Wez Furlong
263723ec9b Update for count_elements handler for overloaded objects. 2004-05-04 15:03:48 +00:00
Marcus Boerger
b6321d4e8a Fix class names 2004-03-29 19:58:01 +00:00
Marcus Boerger
f8ff2ccf20 Fix writing of SQLite and SimpleXMl extension and add Rob to the credits
line of the latter. Add ext/SPL.
2004-03-28 20:27:18 +00:00
George Schlossnagle
b9c04fe19a fixed non-existent elements check
ref: http://news.php.net/article.php?group=php.internals&article=8660
2004-03-24 05:04:26 +00:00
Stanislav Malyshev
5b0f6b1f34 Update for new read_property API 2004-03-21 18:28:38 +00:00
Derick Rethans
f66c62cef8 - Fixed compilation on the 'broken' IRIX native compiler. 2004-03-16 21:39:43 +00:00
Marcus Boerger
6b0f57ee50 Rename hasMore() to valid() as discussed. (Part II) 2004-03-08 18:05:41 +00:00
Rob Richards
76ee5707f7 Fix bug #27436 dom_import_simplexml innaccurate
extensions register callbacks to export nodes
prevents segfault passing invalid objects to import functions
2004-03-01 12:09:24 +00:00
Rob Richards
16136dfe93 Fix bug #27237: Working with simplexml crashes apache2
object dtor must be used to cleanup iterator data correctly
Fix asXML() outputing incorrect node
2004-02-13 15:05:18 +00:00
Derick Rethans
cd4a39edf9 - Fixed start-up problem if both SPL and SimpleXML were enabled. The
double initialization of apache 1.3 was causing problems here.
2004-02-12 23:39:46 +00:00
Zeev Suraski
30171a7590 zend_default_classes.h -> zend_exceptions.h 2004-02-12 10:43:27 +00:00
Zeev Suraski
c8c0e97982 Prevent SimpleXML from silently modifying types of variables that are
assigned to its objects.

Implementation notes for overloaded object modules:

- If you return a zval which is not otherwise referenced by the extension
  or the engine's symbol table, its reference count should be 0.
- If you receive a value zval in write_property/write_dimension, you
  may only modify it if its reference count is 1.  Otherwise, you must
  create a copy of that zval before making any changes.  You should NOT
  modify the reference count of the value passed to you.

Have fun!
2004-02-11 19:15:30 +00:00
Rob Richards
6e4a4e8a9a Fix compiler warnings
Update tests
2004-02-11 12:19:26 +00:00
Zeev Suraski
e8e9b2afee Implement get callback for SimpleXML (it now supports pre/post increment
as well as binary-assign-ops)
2004-02-10 09:30:38 +00:00
Zeev Suraski
2a9e1294bc Update to new API 2004-02-08 17:25:54 +00:00
Zeev Suraski
8424be849f - Update with new destructor code 2004-02-04 11:14:47 +00:00
foobar
7ad385b109 CS fix (functions should not be available if they are not available :) 2004-02-02 08:10:31 +00:00
Rob Richards
bc2521b662 Fix bug #27010: segfault after returning nodes with children()
Fix segfault in match_ns when matching prefix and node without ns
some general cleanup and code consilidation
better write handling - engine support dependent
better isset handling - engine support dependent
namespace fixes for reading/writing
2004-01-22 21:30:14 +00:00
Rob Richards
a4c2f31751 Fix namespace regression bug
Read attributes correctly
Update sxe_prop_dim_exists logic
Update profile
2004-01-21 14:04:47 +00:00
Rob Richards
500fa86c1b Fix Bug #26976 (Can not access array elements using array indices)
return index 0 as non iterable object
update test
2004-01-21 11:32:30 +00:00
foobar
bdd3b13c53 Goto targets should not be indented (some compilers choke on this, iirc) 2004-01-21 01:09:41 +00:00
Sterling Hughes
bd306c8b52 - 2004-01-20 05:31:50 +00:00
Frank M. Kromann
0d6fcd02cb Fix compilation of simplexml when spl is build as shared object 2004-01-19 23:44:03 +00:00
Marcus Boerger
b0620b27be Rename header to prevent name clashes with external files 2004-01-18 23:35:13 +00:00
Marcus Boerger
517c5f5fc5 Necessary as long as SPL is shared/dll 2004-01-18 22:20:54 +00:00
Marcus Boerger
913f5ce8ec Fix Warning 2004-01-18 15:21:49 +00:00
Marcus Boerger
8f4e9d9e42 Enable inherited classes inside SPL and respect order of module init. 2004-01-18 15:16:26 +00:00
Marcus Boerger
9d5ef0070f Export access to class_entry by function. 2004-01-18 13:19:41 +00:00
Sterling Hughes
cb7e90119f namespace accesses are now soley URI based as opposed to prefix based. 2004-01-17 21:22:26 +00:00
Marcus Boerger
9e29f17493 Major bugfix for consistency.
# After long discussions we came to a conclusion on how to make this
# extension consistent in itself.
# Thanks to Rob for all the work
2004-01-17 19:41:32 +00:00
Marcus Boerger
665a834a76 Fix parameter list and protos 2004-01-17 16:36:04 +00:00
Marcus Boerger
9df72efb7c Make inherited sxe classes work 2004-01-17 15:56:29 +00:00
Marcus Boerger
43b0a9e96b Drop userspace iteration correctly.
# People if you do such things then please fix the class tree.
2004-01-15 09:28:01 +00:00