Skip to content

Commit cea2419

Browse files
author
Ilia Alshanetsky
committed
Upgraded the bundled expat library to 1.95.5 (latest stable, atm).
Fixed bug #20442.
1 parent 2969593 commit cea2419

File tree

18 files changed

+5314
-3923
lines changed

18 files changed

+5314
-3923
lines changed

ext/xml/config.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ dnl
55
AC_C_BIGENDIAN
66

77
if test "$ac_cv_c_bigendian" = "yes"; then
8-
order=21
8+
order=4321
99
else
10-
order=12
10+
order=1234
1111
fi
1212

1313
PHP_ARG_ENABLE(xml,whether to enable XML support,
@@ -21,7 +21,7 @@ if test "$PHP_XML" = "yes"; then
2121

2222
if test "$PHP_EXPAT_DIR" = "no"; then
2323
AC_DEFINE(HAVE_LIBEXPAT_BUNDLED, 1, [ ])
24-
PHP_NEW_EXTENSION(xml, xml.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c, $ext_shared,,-DXML_BYTE_ORDER=$order)
24+
PHP_NEW_EXTENSION(xml, xml.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c, $ext_shared,,-DBYTEORDER=$order)
2525
PHP_ADD_INCLUDE($ext_srcdir/expat)
2626
PHP_ADD_BUILD_DIR($ext_builddir/expat)
2727
else

ext/xml/expat/Changes

Lines changed: 96 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,99 @@
1+
Release 1.95.5 Fri Sep 6 2002
2+
- Added XML_UseForeignDTD() for improved SAX2 support.
3+
- Added XML_GetFeatureList().
4+
- Defined XML_Bool type and the values XML_TRUE and XML_FALSE.
5+
- Use an incomplete struct instead of a void* for the parser
6+
(may not retain).
7+
- Fixed UTF-8 decoding bug that caused legal UTF-8 to be rejected.
8+
- Finally fixed bug where default handler would report DTD
9+
events that were already handled by another handler.
10+
Initial patch contributed by Darryl Miller.
11+
- Removed unnecessary DllMain() function that caused static
12+
linking into a DLL to be difficult.
13+
- Added VC++ projects for building static libraries.
14+
- Reduced line-length for all source code and headers to be
15+
no longer than 80 characters, to help with AS/400 support.
16+
- Reduced memory copying during parsing (SF patch #600964).
17+
- Fixed a variety of bugs: see SF issues 580793, 434664,
18+
483514, 580503, 581069, 584041, 584183, 584832, 585537,
19+
596555, 596678, 598352, 598944, 599715, 600479, 600971.
20+
21+
Release 1.95.4 Fri Jul 12 2002
22+
- Added support for VMS, contributed by Craig Berry. See
23+
vms/README.vms for more information.
24+
- Added Mac OS (classic) support, with a makefile for MPW,
25+
contributed by Thomas Wegner and Daryle Walker.
26+
- Added Borland C++ Builder 5 / BCC 5.5 support, contributed
27+
by Patrick McConnell (SF patch #538032).
28+
- Fixed a variety of bugs: see SF issues 441449, 563184,
29+
564342, 566334, 566901, 569461, 570263, 575168, 579196.
30+
- Made skippedEntityHandler conform to SAX2 (see source comment)
31+
- Re-implemented WFC: Entity Declared from XML 1.0 spec and
32+
added a new error "entity declared in parameter entity":
33+
see SF bug report 569461 and SF patch 578161
34+
- Re-implemented section 5.1 from XML 1.0 spec:
35+
see SF bug report 570263 and SF patch 578161
36+
37+
Release 1.95.3 Mon Jun 3 2002
38+
- Added a project to the MSVC workspace to create a wchar_t
39+
version of the library; the DLLs are named libexpatw.dll.
40+
- Changed the name of the Windows DLLs from expat.dll to
41+
libexpat.dll; this fixes SF bug #432456.
42+
- Added the XML_ParserReset() API function.
43+
- Fixed XML_SetReturnNSTriplet() to work for element names.
44+
- Made the XML_UNICODE builds usable (thanks, Karl!).
45+
- Allow xmlwf to read from standard input.
46+
- Install a man page for xmlwf on Unix systems.
47+
- Fixed many bugs; see SF bug reports 231864, 461380, 464837,
48+
466885, 469226, 477667, 484419, 487840, 494749, 496505,
49+
547350. Other bugs which we can't test as easily may also
50+
have been fixed, especially in the area of build support.
51+
152
Release 1.95.2 Fri Jul 27 2001
2-
- Nore changes to make MSVC happy with the build; add a single
3-
workspace to support both the library and xmlwf applicatiion.
4-
- Added a Windows installer for Windows users; includes
5-
xmlwf.exe.
6-
- Added compile-time constants that can be used to determine the
7-
Expat version
8-
- Removed a lot of GNU-specific dependencies to aide portability
9-
among the various Unix flavors.
10-
- Fix the UTF-8 BOM bug.
11-
- Cleaned up warning messages for several compilers.
12-
- Added the -Wall, -Wstrict-prototypes options for GCC.
53+
- More changes to make MSVC happy with the build; add a single
54+
workspace to support both the library and xmlwf application.
55+
- Added a Windows installer for Windows users; includes
56+
xmlwf.exe.
57+
- Added compile-time constants that can be used to determine the
58+
Expat version
59+
- Removed a lot of GNU-specific dependencies to aide portability
60+
among the various Unix flavors.
61+
- Fix the UTF-8 BOM bug.
62+
- Cleaned up warning messages for several compilers.
63+
- Added the -Wall, -Wstrict-prototypes options for GCC.
64+
1365
Release 1.95.1 Sun Oct 22 15:11:36 EDT 2000
14-
- Changes to get expat to build under Microsoft compiler
15-
- Removed all aborts and instead return an UNEXPECTED_STATE error.
16-
- Fixed a bug where a stray '%' in an entity value would cause an
17-
abort.
18-
- Defined XML_SetEndNamespaceDeclHandler. Thanks to Darryl Miles for
19-
finding this oversight.
20-
- Changed default patterns in lib/Makefile.in to fit non-GNU makes
21-
Thanks to robin@unrated.net for reporting and providing an
22-
account to test on.
23-
- The reference had the wrong label for XML_SetStartNamespaceDecl.
24-
Reported by an anonymous user.
66+
- Changes to get expat to build under Microsoft compiler
67+
- Removed all aborts and instead return an UNEXPECTED_STATE error.
68+
- Fixed a bug where a stray '%' in an entity value would cause an
69+
abort.
70+
- Defined XML_SetEndNamespaceDeclHandler. Thanks to Darryl Miles for
71+
finding this oversight.
72+
- Changed default patterns in lib/Makefile.in to fit non-GNU makes
73+
Thanks to robin@unrated.net for reporting and providing an
74+
account to test on.
75+
- The reference had the wrong label for XML_SetStartNamespaceDecl.
76+
Reported by an anonymous user.
77+
2578
Release 1.95.0 Fri Sep 29 2000
26-
- XML_ParserCreate_MM
27-
Allows you to set a memory management suite to replace the
28-
standard malloc,realloc, and free.
29-
- XML_SetReturnNSTriplet
30-
If you turn this feature on when namespace processing is in
31-
effect, then qualified, prefixed element and attribute names
32-
are returned as "uri|name|prefix" where '|' is whatever
33-
separator character is used in namespace processing.
34-
- Merged in features from perl-expat
35-
o XML_SetElementDeclHandler
36-
o XML_SetAttlistDeclHandler
37-
o XML_SetXmlDeclHandler
38-
o XML_SetEntityDeclHandler
39-
o StartDoctypeDeclHandler takes 3 additional parameters:
40-
sysid, pubid, has_internal_subset
41-
o Many paired handler setters (like XML_SetElementHandler)
42-
now have corresponding individual handler setters
43-
o XML_GetInputContext for getting the input context of
44-
the current parse position.
45-
- Added reference material
46-
- Packaged into a distribution that builds a sharable library
79+
- XML_ParserCreate_MM
80+
Allows you to set a memory management suite to replace the
81+
standard malloc,realloc, and free.
82+
- XML_SetReturnNSTriplet
83+
If you turn this feature on when namespace processing is in
84+
effect, then qualified, prefixed element and attribute names
85+
are returned as "uri|name|prefix" where '|' is whatever
86+
separator character is used in namespace processing.
87+
- Merged in features from perl-expat
88+
o XML_SetElementDeclHandler
89+
o XML_SetAttlistDeclHandler
90+
o XML_SetXmlDeclHandler
91+
o XML_SetEntityDeclHandler
92+
o StartDoctypeDeclHandler takes 3 additional parameters:
93+
sysid, pubid, has_internal_subset
94+
o Many paired handler setters (like XML_SetElementHandler)
95+
now have corresponding individual handler setters
96+
o XML_GetInputContext for getting the input context of
97+
the current parse position.
98+
- Added reference material
99+
- Packaged into a distribution that builds a sharable library

ext/xml/expat/ascii.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
/*
2-
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
3-
See the file COPYING for copying permission.
1+
/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
2+
See the file COPYING for copying permission.
43
*/
54

65
#define ASCII_A 0x41

ext/xml/expat/asciitab.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
/*
2-
Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
3-
See the file COPYING for copying permission.
1+
/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
2+
See the file COPYING for copying permission.
43
*/
54

65
/* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,

0 commit comments

Comments
 (0)