Commit Graph

38 Commits

Author SHA1 Message Date
Dmitry Stogov
c737b89473 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
2013-02-20 22:27:41 +04:00
Dmitry Stogov
8e76d0404b Fixed external entity loading 2013-02-20 22:14:59 +04:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332 Happy New Year~ 2013-01-01 16:02:16 +08:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Gustavo André dos Santos Lopes
7bd505021c - Turns out the external entity loader is not a per-thread global but a true
global. Changed code accordingly; however, applications that embed PHP and
  also use libxml2 may be affected negatively.
2011-08-30 01:08:22 +00:00
Gustavo André dos Santos Lopes
0d7e6a73d6 - Added libxml_set_external_entity_loader(). 2011-08-29 05:00:26 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Rob Richards
cb3bc15807 MFH: Visibility (bug #45557) 2008-07-22 10:30:38 +00:00
Dmitry Stogov
240fa244c3 Improved PHP binary size and startup speed with GCC4 visibility control (Nuno) 2008-01-30 09:41:12 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Antony Dovgal
d5a59064f9 MFH 2007-08-01 11:43:05 +00:00
Jani Taskinen
10a6af6bd0 MFH: cs+ws+compile warning fixes 2007-07-21 00:51:17 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Nuno Lopes
ec46e5e510 mark a few variables and functions as static 2006-11-10 18:05:11 +00:00
Dmitry Stogov
1dbaae2795 Added automatic module globals management 2006-06-15 18:33:09 +00:00
Rob Richards
3997d6663b MFH: move document property struct from xml_common.h 2006-05-22 17:09:05 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
Rob Richards
6818826bbd MFH: add additional constants
remove un-needed ifdefs
2005-09-08 10:37:57 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
foobar
e0c4f9b9be - Possible fix for bug #32778 2005-04-21 11:19:29 +00:00
Rob Richards
b7cf6f4539 add function to allow extensions to use new error handling if set by user 2005-02-20 21:49:45 +00:00
Rob Richards
4967138514 initial cut of new error handling 2005-02-10 15:52:38 +00:00
Dmitry Stogov
9c5661f05d Fixed bug #29211 (SoapClient doesn't request wsdl through proxy). (Rob) 2004-11-09 08:13:35 +00:00
Rob Richards
ccb99d0a1e implement php_libxml_xmlCheckUTF8
- workaround for pre libxml2-2.6.13 function
2004-09-08 10:15:41 +00:00
Rob Richards
a1c33af793 export php_libxml_error_handler for win32 build 2004-07-25 12:00:28 +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
Marcus Boerger
c66c9e7102 Fix memory corruption with libxml's error handling. 2004-01-10 13:23:58 +00:00
foobar
ccfc46b0aa - Happy new year and PHP 5 for rest of the files too..
# Should the LICENSE and Zend/LICENSE dates be updated too?
2004-01-08 17:33:29 +00:00
Rob Richards
4dd0dbfd79 consolidate error handling 2003-12-12 13:54:06 +00:00
Rob Richards
1f33239c91 buffer error messages until newline is hit 2003-12-09 21:55:02 +00:00
Rob Richards
d29fb55bbb common functions for interoperability 2003-10-26 15:53:20 +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
Shane Caraveo
399095e7a5 Add libxml extension for common code that is needed to be shared between
various xml extensions.  currently the only implemented support is the
addition of the streams support for libxml.  One new function,
libxml_set_streams_context, which allows a streams context to bet set
prior to loading or writing documents.  This works transparently with any
extension that uses libxml.  All ini settings that effect streams will
also now effect the loading and writing of xml documents.

TODO: linux support, not sure if config.m4 will work right.
2003-10-19 21:48:46 +00:00