Commit Graph

359 Commits

Author SHA1 Message Date
Moriyoshi Koizumi
cbddbca787 NULL pointers can be passed to free_fcn. This is the correct behaviour. 2003-12-08 07:15:32 +00:00
Wez Furlong
08218f5082 Tweak xml related build.
Still some warnings for ext/xsl, but I'll leave that to someone else for now.
2003-12-05 21:16:47 +00:00
Moriyoshi Koizumi
657b7e08d0 xmlCtxtSetOptions() isn't available in the versions up to 2.6.x
# Thanks Rob
2003-12-05 10:53:59 +00:00
Moriyoshi Koizumi
50dad38cd4 Fix libexpat build.
Improve replaceEntities patch.
2003-12-05 10:11:06 +00:00
Ilia Alshanetsky
ce0b3dec4c Fixed bug #26528 (HTML entities are not being decoded by
xml_parse()/xml_parse_into_struct()).
2003-12-05 01:16:16 +00:00
Wez Furlong
05b9b20ed8 Add new (optional!) win32 build infrastructure.
Will follow up to internals@ shortly.
2003-12-02 23:17:04 +00:00
Moriyoshi Koizumi
4b439176da Partial fix for bug #25803 (xml_get_current_byte_index() always returns 0) 2003-11-24 06:04:39 +00:00
foobar
32b5a41941 - Fixed bug #26072 (--disable-libxml does not work). 2003-11-12 23:42:38 +00:00
Moriyoshi Koizumi
668e8a87e6 Fix tests 2003-11-04 16:18:21 +00:00
Moriyoshi Koizumi
f0725828f0 Add XML_SAX_IMPL constant to determine which implementation (libxml / expat)
is selected for SAX interface.
2003-11-04 16:15:52 +00:00
Shane Caraveo
052f9378b2 add global init/shutdown functions for libxml. this is required as
shutdown is not safe to call multiple times, and to make streams work
correctly some init stuff has to happen in a specific order
2003-10-19 23:17:56 +00:00
Moriyoshi Koizumi
77726c734e Add regression test for bug #25666 2003-09-30 01:31:06 +00:00
Rob Richards
5fa23c593b fix for bug #25666 (XML namespaces broken in PHP5) 2003-09-29 11:35:39 +00:00
Hartmut Holzgraefe
075e66cc08 signed/unsigned compiler warning fixes 2003-09-26 08:09:56 +00:00
Rob Richards
8569ee1c1e move hash.h for libxml 2.6 compatibility 2003-09-22 19:04:49 +00:00
Zeev Suraski
8767205afa Fix Win32 linkage problems 2003-08-31 12:41:53 +00:00
Wez Furlong
21329c5e0c allow building without libxml2 under win32 2003-08-22 15:04:29 +00:00
Ilia Alshanetsky
93bcd55eaf emalloc -> safe_emalloc 2003-08-12 00:58:52 +00:00
Zeev Suraski
90b29aa076 Replace fast_call_user_function() with zend_call_function() 2003-08-05 10:29:03 +00:00
Zeev Suraski
538d58dd5f Use new infrastructure.
There are bound to be some messups, please report build/runtime bugs!
2003-08-03 17:44:39 +00:00
Rob Richards
a5a859361b increment refcount for arrays passed to xml_set_handler 2003-07-29 13:34:50 +00:00
Rob Richards
4d31aa4444 Fix bug #24801 (xml_call_handler() causes segmentation fault) 2003-07-27 20:32:55 +00:00
Sterling Hughes
8fcd71dccf boom bam bing 2003-07-09 03:14:41 +00:00
Sterling Hughes
e158cd285e Not really the best way to solve this. But it doesn't give a segfault on
self-referential structures, which is always a bonus
2003-07-02 20:05:13 +00:00
foobar
f3ac60d4a4 - Cleanup, simplifying, etc. 2003-06-30 17:23:52 +00:00
Sterling Hughes
681d6bfaeb fix libxml2 when dealing with character data 2003-06-29 18:26:23 +00:00
Sterling Hughes
a8eba3cc80 some friendly names... 2003-06-26 04:08:54 +00:00
Sterling Hughes
75abafdfc3 these should be enabled by default. At least this much was agreed upon when
the decision to debundle libxml2 was made.
2003-06-25 20:53:52 +00:00
Rob Richards
19a9489cb6 remove leftover parser->mem_hdlrs - compiles now 2003-06-15 20:56:48 +00:00
Moriyoshi Koizumi
f9b194f609 Removed xmlMemSetup() code as it doesn't help at all. 2003-06-15 20:40:45 +00:00
Rob Richards
c104c0d676 use xmlInitParser instead of xmlInitThreads
reentrant safe as well
2003-06-14 18:14:05 +00:00
Rob Richards
e6502514fb fix common libxml init and deinit routines 2003-06-14 15:08:48 +00:00
Rob Richards
68ff4becab export xml_parser_inited under win32 2003-06-14 11:22:13 +00:00
James Cox
f68c7ff249 updating license information in the headers. 2003-06-10 20:04:29 +00:00
Zeev Suraski
fa78f2b8eb XMLless build fix 2003-06-08 18:29:55 +00:00
Sterling Hughes
7b42eccfd6 prevent double destroy and double init badness 2003-06-05 17:48:51 +00:00
Ilia Alshanetsky
8dc90d446f Fix compiler warnings. 2003-05-27 00:50:00 +00:00
Sebastian Bergmann
70fa1ff7f5 Hopefully get correct display of version information. 2003-05-25 07:23:41 +00:00
Sterling Hughes
d844c2841d rename namespace to use_namespace to avoid a c++ keyword conflict
fix whitespace surrounding the enums, use tabs please :)
2003-05-22 03:29:05 +00:00
Sterling Hughes
bf022fd49f use zval_ptr_dtor() instead of the more verbose and less correct version 2003-05-22 03:08:48 +00:00
Sterling Hughes
8b50ea61a7 take advantage of the fast_call_user_function() api call for all of the
callbacks.
2003-05-22 03:04:11 +00:00
foobar
dab706ee2a - Go back to using --disable-xml and --enable-xml
. Require use of --with-libxml-dir and --with-libexpat-dir for ext/xml.
    Allows other extensions to use --with-expat-dir for now.
# still defaults to libxml if --with-libxml-dir and --with-libexpat-dir
# are not used.
2003-05-20 00:20:29 +00:00
Sterling Hughes
4cf3e8f3ee use libxml2 memory management throughout the file, which in turn uses the
PHP memory management.
2003-05-19 21:53:33 +00:00
Sterling Hughes
29eb399773 send some more data to the default handler
libxml2 is braindead when it comes to handling entities
2003-05-19 21:51:57 +00:00
foobar
4334f66065 Allow build with expat too. 2003-05-19 21:50:23 +00:00
foobar
efa8e404d8 Remove unnecessary test. 2003-05-19 21:45:49 +00:00
foobar
73415c9e01 - Unbundle libxml and expat. Now this compiles too.. 2003-05-19 15:33:19 +00:00
Sterling Hughes
00e48b7f70 send comments to the default handler like done with expat, add a
setcommenthandler function, which exists in expat, but isn't used by the
extension.
2003-05-17 22:09:58 +00:00
Moriyoshi Koizumi
b67f2dc98d Allow libxml to detect the document encoding if encoding parameter passed to
XML_ParserCreate_MM is null.
2003-05-16 23:21:48 +00:00
Moriyoshi Koizumi
bc741c67d4 Those pieces were not intended. Partly reverted.
# sorry for messing
2003-05-11 09:10:48 +00:00
Moriyoshi Koizumi
ebd92654c1 Added an encoding detection option for expat XML parser. 2003-05-11 09:04:05 +00:00
Moriyoshi Koizumi
82d769eefd Fixed compiler errors that occur when bundled libxml is not used. 2003-05-11 01:45:52 +00:00
Moriyoshi Koizumi
83ad8e3ae3 Added initialisation for thread safety 2003-05-08 16:01:50 +00:00
Moriyoshi Koizumi
1ba4e590ef WS fix 2003-05-08 15:12:04 +00:00
Moriyoshi Koizumi
2b5cebba16 Fixed memleak when the libxml compat layer is used. 2003-05-08 15:07:26 +00:00
Moriyoshi Koizumi
02c9b14ca2 Filled error_mappings[] with placeholders for actual error messages 2003-05-07 20:53:23 +00:00
Moriyoshi Koizumi
891bd02e10 Added missing object initialisation
Added missing sanity checks
2003-05-07 20:06:42 +00:00
Moriyoshi Koizumi
cced1b26ec Fixed typos 2003-05-07 19:52:30 +00:00
Moriyoshi Koizumi
8c539518fb This should be needed. 2003-05-07 15:28:58 +00:00
Moriyoshi Koizumi
21661d3bde Added even better allocator codes for both expat & libxml 2003-05-07 15:21:31 +00:00
Sterling Hughes
a0351b093f Bundle libxml and add compatibility layer 2003-05-06 19:38:49 +00:00
Sterling Hughes
c5a2f99703 remove this, its now in bundle 2003-05-02 04:05:23 +00:00
Sterling Hughes
80e9dc0b58 new file that deals with the bundle 2003-05-02 04:02:27 +00:00
Sterling Hughes
1d32bcf0bc no need to comment out, it doesn't belong there '.' 2003-05-01 03:47:54 +00:00
Moriyoshi Koizumi
cb38be1bd2 Fixed segfault in xml_parser_create()
# due to too many %s in printf spec
2003-04-03 01:00:45 +00:00
Sterling Hughes
ecef1df39c This broke the xml extension, and pres2, commented out for now 2003-03-21 05:26:56 +00:00
Stig Bakken
0e6fca4f22 * email address change 2003-03-18 12:06:09 +00:00
Ilia Alshanetsky
72b356c1bc Removed pointless memory allocation checks. 2003-01-18 19:28:10 +00:00
Anantha Kesari H Y
32ef849171 Modified for NetWare. 2003-01-03 14:31:31 +00:00
Anantha Kesari H Y
9c3f39a074 New file added for NetWare. 2003-01-03 14:24:34 +00:00
Sebastian Bergmann
b506f5c8f8 Bump year. 2002-12-31 16:08:15 +00:00
Marcus Boerger
4ce4a1c32c php_error -> php_error_docref 2002-12-05 21:53:25 +00:00
Thies C. Arntzen
6aaa7bc345 use FREE_ZVAL when freeing zvals 2002-11-18 17:34:55 +00:00
Edin Kadribasic
d40c5e2624 Really nuke win32 linking warnings. 2002-11-18 14:33:34 +00:00
Ilia Alshanetsky
6e99ecdb01 Hopefully fix win32 linker warnings. 2002-11-18 13:17:14 +00:00
Ilia Alshanetsky
c5107b8989 Removed duplicate php_compat.h include. 2002-11-18 02:30:27 +00:00
Sebastian Bergmann
9229918fd7 Fix warning. HAVE_MEMMOVE is already defined in config.w32.h. 2002-11-17 21:50:00 +00:00
Sebastian Bergmann
b4e42dd43f Fix Win32 build. (Lots of linkage warnings remain!) 2002-11-17 21:29:16 +00:00
Ilia Alshanetsky
cea2419529 Upgraded the bundled expat library to 1.95.5 (latest stable, atm).
Fixed bug #20442.
2002-11-17 18:37:48 +00:00
Brian France
3902b068c3 Changed: EXPAT_SHARED_LIBADD -> XML_SHARED_LIBADD
If the xml extension was built shared with a shared libexpat
	it would not get the required link to libexpat.so.
2002-11-07 19:31:08 +00:00
Marcus Boerger
d0c535d0a6 Fix tests
#Why do i need to define the class infront of its usage in ZE2?
2002-10-29 12:12:19 +00:00
Marcus Boerger
c9f7fb8b4e rename and WS fixes 2002-10-29 11:59:24 +00:00
Marcus Boerger
65222ddfb3 do not dl() load in skipif.inc 2002-10-29 11:43:46 +00:00
Sascha Schumann
2909e5c9c9 centralize #include "build-defs.h" and drop (sometimes inconsistent) other
instances
2002-10-24 13:15:49 +00:00
Melvyn Sopacua
b4b26c2f9b Skip this when strtoupper doesn't behave as expected, because casefolding
depends on this.
2002-10-21 08:55:07 +00:00
James Cox
5d4080ec38 remove uneeded def 2002-09-06 10:34:30 +00:00
Anantha Kesari H Y
8f14aafe97 NetWare related changes/modifications 2002-09-06 10:20:39 +00:00
foobar
3bf7519210 @- Added --disable-all configure option. (Jani) 2002-09-04 18:47:28 +00:00
Sascha Schumann
3c89ce7843 Fix --enable-xml=shared 2002-05-04 16:48:01 +00:00
Markus Fischer
c7a1d96f8a - Fix a possible memory leak in xml_set_handler().
I stumbled over this while trying out 'pear package' which, while doing
  xml parsing, re-assigns the variaous callback handlers depending
  on the version during xml processing.

  If this check causes problems, let me know.
2002-04-13 05:06:33 +00:00
Stig Bakken
704713caf8 * remove extra end-fold 2002-04-09 17:32:39 +00:00
foobar
d658b1a8d7 Revert the bogus patch. 2002-04-04 14:33:05 +00:00
Jan Lehnardt
8897845f3b - fix "xml_parse_into_struct/umlauts in tags" testcase. It never really
- worked
2002-03-23 23:24:48 +00:00
Hartmut Holzgraefe
8c0fd5bc35 proto fixes 2002-03-21 16:10:08 +00:00
Sascha Schumann
d9a2bb2ec0 Remove old Makefile templates 2002-03-12 16:44:50 +00:00
Sascha Schumann
2a8d55ff1d Add global include path, so that other extensions can access
the expat header.
2002-03-11 13:32:44 +00:00
Sascha Schumann
9d9d39a0de Please welcome the new build system.
If you encounter any problems, please make sure to email sas@php.net
directly.

An introduction can be found on

http://schumann.cx/buildv5.txt
2002-03-07 14:20:02 +00:00
Derick Rethans
eeeb95595f - More test fixes 2002-03-05 09:02:02 +00:00
Sebastian Bergmann
90613d2282 Maintain headers. 2002-02-28 08:29:35 +00:00
Jon Parise
ea089d09ae Add a note that this statement will never be reached. 2002-01-27 07:23:21 +00:00
Andi Gutmans
66d88ba07b - Fix bug in XML extension which exists due to a not perfect work around
- with ZE1. In ZE2 the correct code seems to work well.
2001-12-29 18:10:01 +00:00
Hartmut Holzgraefe
dcda91c1a1 proto fix 2001-12-17 21:01:06 +00:00
Thies C. Arntzen
7155e1311f add todo 2001-12-14 09:42:39 +00:00
Sebastian Bergmann
38933514e1 Update headers. 2001-12-11 15:32:16 +00:00
foobar
f1397d5339 Unified the configure messages. 2001-11-30 19:00:13 +00:00
Stig Bakken
689252082c * zend_module_entry change: apino, debug and zts are moved first,
see README.EXTENSIONS file for upgrade help.
@Introduced extension version numbers (Stig)
2001-10-11 23:33:59 +00:00
Dan Libby
061cd20400 include php_compat.h, so that we use php_XML_* if necessary. Better to do it in expat.h, so that other libs, eg xmlrpc, inherit this behavior and we can link 2001-09-27 00:29:34 +00:00
Jeroen van Wolffelaar
6cfba2a3ea 2nd phase in back-substitution those macro's
I've got pretty much everything now...
2001-09-25 22:49:04 +00:00
Jeroen van Wolffelaar
c033288573 Back-substitute for Z_* macro's. If it breaks some extension (the script isn't optimal, it parses for example var->zval.value incorrect) please let me know. 2001-09-25 21:58:48 +00:00
Derick Rethans
78747bd2df - Don't wrap lines... this is annoying while coding. 2001-09-09 13:29:31 +00:00
foobar
e4df7dc7bf if test -f /usr/local/lib/libexample.s?; then <-- no workie
if test -f /usr/local/lib/libexample.so; then   <-- workie
#
# You can all point at me and laugh now..  :(
#
2001-09-07 00:24:06 +00:00
foobar
c902ad74f0 null terminate the returned string in here too. 2001-08-18 23:43:04 +00:00
foobar
1ffbcc5ecf ws fix. 2001-08-18 23:07:10 +00:00
Sebastian Bergmann
fd5eea8b96 Fix warning. 2001-08-12 18:57:35 +00:00
Thies C. Arntzen
d5b1a7f440 tags need to be UTF8-decoded as well.
guys, case_folding can only work when the parser target encoding equal (or
compatible) with the locale setting of the system as we use toupper to "do it"
2001-08-12 18:44:42 +00:00
Zeev Suraski
aa1772ca72 More TSRMLS_FETCH annihilation 2001-07-31 05:44:11 +00:00
Thies C. Arntzen
33e059062b @- Bump bundled expat to 1.95.2 (Thies) 2001-07-30 15:10:53 +00:00
Zeev Suraski
c43806f415 Zend compatibility patch 2001-07-30 08:24:42 +00:00
Zeev Suraski
797a079a95 More TSRMLS_FETCH work, and a bit of cleanup 2001-07-30 06:18:13 +00:00
Zeev Suraski
7b1c400631 More TSRMLS_FETCH annihilation (Zend compatibility patch) 2001-07-30 04:58:07 +00:00
Andi Gutmans
d42f85427a - Use object macros 2001-07-28 18:40:18 +00:00
Zeev Suraski
d87cc976e1 Redesigned thread safety mechanism - nua nua 2001-07-28 11:36:37 +00:00
Zeev Suraski
fe6f8712a4 - Get rid of ELS_*(), and use TSRMLS_*() instead.
- Move to the new ts_allocate_id() API
This patch is *bound* to break some files, as I must have had typos somewhere.
If you use any uncommon extension, please try to build it...
2001-07-27 10:16:41 +00:00
Thies C. Arntzen
0ef0f8e32b ZVAL_BOOL(v,0) -> ZVAL_FALSE(v) 2001-07-11 12:42:25 +00:00
Zeev Suraski
66d94bc655 Nuke zval_reset 2001-07-11 11:39:10 +00:00
Zeev Suraski
d70ce7be27 var_reset -> ZVAL_RESET 2001-07-11 09:39:09 +00:00
Thies C. Arntzen
6708768c07 xml_utf8_encode: make sure the returned data is zero-terminated 2001-07-09 06:49:34 +00:00
Rasmus Lerdorf
81e2cf03ac Fix folding and clean up some extensions 2001-06-06 13:06:12 +00:00
Rasmus Lerdorf
25c3a3a39d vim-6 does folding - clean up a bunch of missing folding tags plus
some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 13:12:10 +00:00
Sascha Schumann
72b9547d26 Fix XML build.
# sniper, did you ever test one of your patches?
2001-06-03 17:11:05 +00:00
Sascha Schumann
36cfb10d79 fix logic 2001-06-03 13:59:21 +00:00
foobar
16216e3eed Make use of the --with-expat-dir configure option 2001-06-01 06:32:02 +00:00
Stig Bakken
1beda9ee1e * include "config.h" if HAVE_CONFIG_H is defined (for standalone dso build) 2001-05-24 10:07:29 +00:00
Sascha Schumann
82c4ac7423 Remove extraneous tab 2001-05-21 00:05:51 +00:00
Sascha Schumann
ae503d3a14 Whoops, the expat directory needs the XML_BYTE_ORDER macro 2001-05-20 22:18:03 +00:00
Sascha Schumann
244ea9f6c8 Don't add -DXML_BYTE_ORDER to global CPPFLAGS 2001-05-20 22:15:25 +00:00
Sascha Schumann
3b822e5752 Looks like this was a bogus gcc warning.
Submitted by: Sebastian Bergmann
2001-05-19 10:10:49 +00:00
Sascha Schumann
991e05d062 Nuke some warnings. 2001-05-19 09:56:42 +00:00
Thies C. Arntzen
56cebea057 added expat version to phpinfo(); 2001-05-14 11:35:25 +00:00
Daniel Beulshausen
e91089edb9 hopefully fix win32 build, untested 2001-05-12 20:01:59 +00:00
Sascha Schumann
afdaee9e47 Nuke more quotes 2001-05-12 11:09:05 +00:00
Thies C. Arntzen
679f794eb4 add missing file 2001-05-12 08:21:20 +00:00
Thies C. Arntzen
cd2f057f1a bump bundled expat to 1.95.1
win32 project _needs_ updating and i don't have windows
2001-05-11 17:57:37 +00:00
foobar
8a26918ed1 Renamed the AC_ prefixed macros defined in acinclude.m4 to PHP_* prefixes.
# Heads up people! I tested this before committing but you never know..
2001-03-27 20:35:04 +00:00
foobar
de3f405997 Removed skipif.php + Fixed tests to use skipif.inc instead. 2001-03-20 01:22:07 +00:00
Andi Gutmans
01ed33d1b6 - Pointed out by Andrei. zval_ptr_dtor() should be used instead of the
zval_del_ref() function which should be nuked.
2001-02-27 20:16:35 +00:00
Andi Gutmans
eb6ba01d1c - Fix copyright notices with 2001 2001-02-26 06:11:02 +00:00
Thies C. Arntzen
72ec2e8f12 fixed SEGFAULT when using xml_set_object. Zend does not yes support
cyclic references!
2001-02-15 13:41:04 +00:00
Rui Hirokawa
c2881f7c6b disable directory search for libexpat and disable some macros for libxml-1.95. 2001-01-10 14:41:01 +00:00
Daniel Beulshausen
315e790ccc remove stupid ifdef's 2001-01-05 18:09:43 +00:00