You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rj...@apache.org on 2010/11/26 15:21:38 UTC
svn commit: r1039370 [1/5] - in /apr/apr-util/branches/1.4.x: ./ buckets/
build/ dbd/ misc/ test/ xml/ xml/expat/ xml/expat/conftools/ xml/expat/lib/
xml/expat/win32/
Author: rjung
Date: Fri Nov 26 14:21:37 2010
New Revision: 1039370
URL: http://svn.apache.org/viewvc?rev=1039370&view=rev
Log:
Upgrade bundled copy of expat library to 1.95.7.
Merged the following revisions from 1.3.x:
979221, 979222, 979232, 1001059, 1002632, 1002648,
1002733, 1002733, 1003214, 1003255, 1003358, 1003370
1003376, 1003602, 1005956, 1005962, 1006017, 1006137
and 1002504 from 1.5.x.
Added:
apr/apr-util/branches/1.4.x/xml/expat/conftools/ac_c_bigendian_cross.m4 (props changed)
- copied unchanged from r1002632, apr/apr-util/branches/1.3.x/xml/expat/conftools/ac_c_bigendian_cross.m4
apr/apr-util/branches/1.4.x/xml/expat/lib/expat.h (props changed)
- copied unchanged from r1002632, apr/apr-util/branches/1.3.x/xml/expat/lib/expat.h
apr/apr-util/branches/1.4.x/xml/expat/lib/expat_config.hnw
- copied unchanged from r1003358, apr/apr-util/branches/1.3.x/xml/expat/lib/expat_config.hnw
apr/apr-util/branches/1.4.x/xml/expat/lib/internal.h (props changed)
- copied unchanged from r1002632, apr/apr-util/branches/1.3.x/xml/expat/lib/internal.h
apr/apr-util/branches/1.4.x/xml/expat/win32/
- copied from r1002632, apr/apr-util/branches/1.3.x/xml/expat/win32/
apr/apr-util/branches/1.4.x/xml/expat/win32/MANIFEST.txt (props changed)
- copied unchanged from r1002632, apr/apr-util/branches/1.3.x/xml/expat/win32/MANIFEST.txt
apr/apr-util/branches/1.4.x/xml/expat/win32/expat.iss (props changed)
- copied unchanged from r1002632, apr/apr-util/branches/1.3.x/xml/expat/win32/expat.iss
Removed:
apr/apr-util/branches/1.4.x/xml/expat/acconfig.h
apr/apr-util/branches/1.4.x/xml/expat/lib/Makefile.in
apr/apr-util/branches/1.4.x/xml/expat/lib/config.hnw
apr/apr-util/branches/1.4.x/xml/expat/lib/expat.h.in
Modified:
apr/apr-util/branches/1.4.x/ (props changed)
apr/apr-util/branches/1.4.x/apu-config.in
apr/apr-util/branches/1.4.x/buckets/apr_brigade.c (props changed)
apr/apr-util/branches/1.4.x/build/apu-conf.m4
apr/apr-util/branches/1.4.x/dbd/apr_dbd_pgsql.c (props changed)
apr/apr-util/branches/1.4.x/libaprutil.dsp
apr/apr-util/branches/1.4.x/misc/apr_queue.c (props changed)
apr/apr-util/branches/1.4.x/test/NWGNUaputest (props changed)
apr/apr-util/branches/1.4.x/test/testxml.c
apr/apr-util/branches/1.4.x/xml/NWGNUmakefile
apr/apr-util/branches/1.4.x/xml/expat/ (props changed)
apr/apr-util/branches/1.4.x/xml/expat/COPYING
apr/apr-util/branches/1.4.x/xml/expat/Makefile.in
apr/apr-util/branches/1.4.x/xml/expat/README
apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh
apr/apr-util/branches/1.4.x/xml/expat/configure.in
apr/apr-util/branches/1.4.x/xml/expat/conftools/ (props changed)
apr/apr-util/branches/1.4.x/xml/expat/conftools/PrintPath
apr/apr-util/branches/1.4.x/xml/expat/lib/ (props changed)
apr/apr-util/branches/1.4.x/xml/expat/lib/ascii.h
apr/apr-util/branches/1.4.x/xml/expat/lib/asciitab.h
apr/apr-util/branches/1.4.x/xml/expat/lib/expat.dsp
apr/apr-util/branches/1.4.x/xml/expat/lib/iasciitab.h
apr/apr-util/branches/1.4.x/xml/expat/lib/latin1tab.h
apr/apr-util/branches/1.4.x/xml/expat/lib/utf8tab.h
apr/apr-util/branches/1.4.x/xml/expat/lib/winconfig.h
apr/apr-util/branches/1.4.x/xml/expat/lib/xml.dsp
apr/apr-util/branches/1.4.x/xml/expat/lib/xmlparse.c
apr/apr-util/branches/1.4.x/xml/expat/lib/xmlrole.c
apr/apr-util/branches/1.4.x/xml/expat/lib/xmlrole.h
apr/apr-util/branches/1.4.x/xml/expat/lib/xmltok.c
apr/apr-util/branches/1.4.x/xml/expat/lib/xmltok.h
apr/apr-util/branches/1.4.x/xml/expat/lib/xmltok_impl.c
apr/apr-util/branches/1.4.x/xml/expat/lib/xmltok_ns.c
Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:21:37 2010
@@ -1,2 +1,4 @@
/apr/apr/trunk:781403,781409,784519,784592,789965,794508,917837-917838
+/apr/apr-util/branches/1.3.x:979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137
+/apr/apr-util/branches/1.5.x:1002504,1002584-1002585,1002620,1002622-1002623,1002628
/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630
Modified: apr/apr-util/branches/1.4.x/apu-config.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/apu-config.in?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/apu-config.in (original)
+++ apr/apr-util/branches/1.4.x/apu-config.in Fri Nov 26 14:21:37 2010
@@ -86,7 +86,7 @@ fi
if test "$location" = "installed"; then
LA_FILE="$libdir/lib${APRUTIL_LIBNAME}.la"
- LIBS=`echo "$LIBS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s $prefix/lib/libexpat.la -lexpat g"`
+ LIBS=`echo "$LIBS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s $prefix/libexpat.la -lexpat g"`
LDFLAGS=`echo "$LDFLAGS" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g"`
INCLUDES=`echo "$INCLUDES" | sed -e "s $APU_BUILD_DIR/xml/expat $prefix g" -e "s -I$prefix/lib g"`
else
Propchange: apr/apr-util/branches/1.4.x/buckets/apr_brigade.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:21:37 2010
@@ -1,2 +1,4 @@
/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519,784592,789965,794508,917837-917838
+/apr/apr-util/branches/1.3.x/buckets/apr_brigade.c:979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137
+/apr/apr-util/branches/1.5.x/buckets/apr_brigade.c:1002504,1002584-1002585,1002620,1002622-1002623,1002628
/apr/apr-util/trunk/buckets/apr_brigade.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630
Modified: apr/apr-util/branches/1.4.x/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/build/apu-conf.m4?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/build/apu-conf.m4 (original)
+++ apr/apr-util/branches/1.4.x/build/apu-conf.m4 Fri Nov 26 14:21:37 2010
@@ -164,9 +164,9 @@ if test "${apu_has_expat}${apu_try_built
dnl we are working with the bundled version of the software.
bundled_subdir="xml/expat"
APR_SUBDIR_CONFIG($bundled_subdir, [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir])
- APR_ADDTO(APRUTIL_INCLUDES, [-I$top_builddir/$bundled_subdir/lib])
+ APR_ADDTO(APRUTIL_INCLUDES, [-I$abs_srcdir/$bundled_subdir/lib])
APR_ADDTO(LDFLAGS, [-L$top_builddir/$bundled_subdir/lib])
- apu_expat_libs="$top_builddir/$bundled_subdir/lib/libexpat.la"
+ apu_expat_libs="$top_builddir/$bundled_subdir/libexpat.la"
fi
APR_ADDTO(APRUTIL_EXPORT_LIBS, [$apu_expat_libs])
Propchange: apr/apr-util/branches/1.4.x/dbd/apr_dbd_pgsql.c
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 26 14:21:37 2010
@@ -0,0 +1,2 @@
+/apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c:1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137
+/apr/apr-util/branches/1.5.x/dbd/apr_dbd_pgsql.c:1002504,1002584-1002585,1002620,1002622-1002623,1002628
Modified: apr/apr-util/branches/1.4.x/libaprutil.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/libaprutil.dsp?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/libaprutil.dsp (original)
+++ apr/apr-util/branches/1.4.x/libaprutil.dsp Fri Nov 26 14:21:37 2010
@@ -45,7 +45,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -77,7 +77,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -109,7 +109,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -141,7 +141,7 @@ PostBuild_Cmds=if exist $(TargetPath).ma
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "./include" /I "../apr/include" /I "./include/private" /I "../apr-iconv/include" /I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /D "XML_STATIC" /D "WIN32" /D "_WINDOWS" /Fo"$(INTDIR)\" /Fd"$(INTDIR)\libaprutil_src" /FD /EHsc /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
# ADD BASE RSC /l 0x409 /d "_DEBUG"
Propchange: apr/apr-util/branches/1.4.x/misc/apr_queue.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 26 14:21:37 2010
@@ -1,3 +1,5 @@
/apr/apr/trunk/misc/apr_queue.c:781403,781409,784519,784592,789965,794508,917837-917838
/apr/apr/trunk/util-misc/apr_queue.c:784520
+/apr/apr-util/branches/1.3.x/misc/apr_queue.c:979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137
+/apr/apr-util/branches/1.5.x/misc/apr_queue.c:1002504,1002584-1002585,1002620,1002622-1002623,1002628
/apr/apr-util/trunk/misc/apr_queue.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630
Propchange: apr/apr-util/branches/1.4.x/test/NWGNUaputest
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 26 14:21:37 2010
@@ -0,0 +1,2 @@
+/apr/apr-util/branches/1.3.x/test/NWGNUaputest:1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137
+/apr/apr-util/branches/1.5.x/test/NWGNUaputest:1002504,1002584-1002585,1002620,1002622-1002623,1002628
Modified: apr/apr-util/branches/1.4.x/test/testxml.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/test/testxml.c?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/test/testxml.c (original)
+++ apr/apr-util/branches/1.4.x/test/testxml.c Fri Nov 26 14:21:37 2010
@@ -165,12 +165,40 @@ static void test_billion_laughs(abts_cas
apr_file_close(fd);
}
+static void test_CVE_2009_3720_alpha(abts_case *tc, void *data)
+{
+ apr_xml_parser *xp;
+ apr_xml_doc *doc;
+ apr_status_t rv;
+
+ xp = apr_xml_parser_create(p);
+
+ rv = apr_xml_parser_feed(xp, "\0\r\n", 3);
+ if (rv == APR_SUCCESS)
+ apr_xml_parser_done(xp, &doc);
+}
+
+static void test_CVE_2009_3720_beta(abts_case *tc, void *data)
+{
+ apr_xml_parser *xp;
+ apr_xml_doc *doc;
+ apr_status_t rv;
+
+ xp = apr_xml_parser_create(p);
+
+ rv = apr_xml_parser_feed(xp, "<?xml version\xc2\x85='1.0'?>\r\n", 25);
+ if (rv == APR_SUCCESS)
+ apr_xml_parser_done(xp, &doc);
+}
+
abts_suite *testxml(abts_suite *suite)
{
suite = ADD_SUITE(suite);
abts_run_test(suite, test_xml_parser, NULL);
abts_run_test(suite, test_billion_laughs, NULL);
+ abts_run_test(suite, test_CVE_2009_3720_alpha, NULL);
+ abts_run_test(suite, test_CVE_2009_3720_beta, NULL);
return suite;
}
Modified: apr/apr-util/branches/1.4.x/xml/NWGNUmakefile
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/NWGNUmakefile?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/NWGNUmakefile (original)
+++ apr/apr-util/branches/1.4.x/xml/NWGNUmakefile Fri Nov 26 14:21:37 2010
@@ -3,7 +3,7 @@
#
SUBDIRS = \
- $(EOLIST)
+ $(EOLIST)
#
# Get the 'head' of the build environment. This includes default targets and
@@ -37,6 +37,7 @@ XINCDIRS += \
# These flags will come after CFLAGS
#
XCFLAGS += \
+ -DHAVE_EXPAT_CONFIG_H \
$(EOLIST)
#
@@ -102,39 +103,39 @@ endif
# This is used by the link 'name' directive to name the nlm. If left blank
# TARGET_nlm (see below) will be used.
#
-NLM_NAME =
+NLM_NAME =
#
-# This is used by the link '-desc ' directive.
+# This is used by the link '-desc ' directive.
# If left blank, NLM_NAME will be used.
#
-NLM_DESCRIPTION =
+NLM_DESCRIPTION =
#
# This is used by the '-threadname' directive. If left blank,
# NLM_NAME Thread will be used.
#
-NLM_THREAD_NAME =
+NLM_THREAD_NAME =
#
-# If this is specified, it will override VERSION value in
+# If this is specified, it will override VERSION value in
# $(APR_WORK)\build\NWGNUenvironment.inc
#
-NLM_VERSION =
+NLM_VERSION =
#
# If this is specified, it will override the default of 64K
#
-NLM_STACK_SIZE =
+NLM_STACK_SIZE =
#
# If this is specified it will be used by the link '-entry' directive
#
-NLM_ENTRY_SYM =
+NLM_ENTRY_SYM =
#
# If this is specified it will be used by the link '-exit' directive
#
-NLM_EXIT_SYM =
+NLM_EXIT_SYM =
#
# If this is specified it will be used by the link '-check' directive
@@ -144,14 +145,14 @@ NLM_CHECK_SYM =
#
# If this is specified it will be used by the link '-flags' directive
#
-NLM_FLAGS =
-
+NLM_FLAGS =
+
#
-# If this is specified it will be linked in with the XDCData option in the def
-# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can
+# If this is specified it will be linked in with the XDCData option in the def
+# file instead of the default of $(APR)/misc/netware/apache.xdc. XDCData can
# be disabled by setting APACHE_UNIPROC in the environment
#
-XDCDATA =
+XDCDATA =
#
# Declare all target files (you must add your files here)
@@ -195,7 +196,7 @@ FILES_nlm_modules = \
# If the nlm has a msg file, put it's path here
#
FILE_nlm_msg =
-
+
#
# If the nlm has a hlp file put it's path here
#
@@ -211,14 +212,14 @@ FILE_nlm_copyright =
#
FILES_nlm_Ximports = \
$(EOLIST)
-
-#
+
+#
# Any symbols exported to here
#
FILES_nlm_exports = \
$(EOLIST)
-
-#
+
+#
# These are the OBJ files needed to create the LIB target above.
# Paths must all use the '/' character
#
@@ -238,7 +239,7 @@ libs :: $(OBJDIR) $(TARGET_lib)
nlms :: libs $(TARGET_nlm)
#
-# Updated this target to create necessary directories and copy files to the
+# Updated this target to create necessary directories and copy files to the
# correct place. (See $(APR_WORK)\build\NWGNUhead.inc for examples)
#
install :: nlms FORCE
Propchange: apr/apr-util/branches/1.4.x/xml/expat/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Nov 26 14:21:37 2010
@@ -7,3 +7,4 @@ config.h
config.log
config.status
autom4te.cache
+expat_config.h*
Propchange: apr/apr-util/branches/1.4.x/xml/expat/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Nov 26 14:21:37 2010
@@ -0,0 +1,6 @@
+/apr/apr/trunk/xml/expat:781403,781409,784519,784592,789965,794508,917837-917838
+/apr/apr-util/branches/1.3.x/xml/expat:692751,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137
+/apr/apr-util/branches/1.5.x/xml/expat:1002504,1002584-1002585,1002620,1002622-1002623,1002628
+/apr/apr-util/trunk/xml/expat:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630,781403
+/apr/apr-util/vendor/expat/1.95.7:1002560-1002564
+/apr/apr-util/vendor/expat/current:1002513-1002559
Modified: apr/apr-util/branches/1.4.x/xml/expat/COPYING
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/COPYING?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/COPYING (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/COPYING Fri Nov 26 14:21:37 2010
@@ -1,5 +1,6 @@
Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
and Clark Cooper
+Copyright (c) 2001, 2002 Expat maintainers.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Modified: apr/apr-util/branches/1.4.x/xml/expat/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/Makefile.in?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/Makefile.in (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/Makefile.in Fri Nov 26 14:21:37 2010
@@ -17,37 +17,20 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN EXPAT.
#
-# ---
-# I started using automake, but
-# 1) it seemed like overkill
-# 2) I don't want all the GNU policies
-# 3) I wanted more explicit control over what gets built
-#
-# So I'm doing my Makefile.in files manually. But a fair part is based
-# on what I learned from perusing the Makefile.in's generated by automake,
-# and the automake authors still get my kudos.
-#
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
includedir = @includedir@
-oldincludedir = /usr/include
+mandir = ${prefix}/man/man1
top_builddir = .
@@ -55,97 +38,76 @@ top_builddir = .
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+mkinstalldirs = $(SHELL) $(top_srcdir)/conftools/mkinstalldirs
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
+MANFILE = $(srcdir)/doc/xmlwf.1
+APIHEADER = $(srcdir)/lib/expat.h
+LIBRARY = libexpat.la
CC = @CC@
-
LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-PACKAGE = @PACKAGE@
-RANLIB = @RANLIB@
-VERSION = @VERSION@
-
-SUBDIRS = lib
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-CONFIG_HEADERS = config.h
-
-DISTDIR = $(PACKAGE)-$(VERSION)
-DISTRIBUTION = $(DISTDIR).tar.gz
-
-all: build-subdirs
-
-.PHONY: all build-subdirs clean distclean extraclean maintainer-clean dist install \
- uninstall distdir
-
-Makefile: Makefile.in config.status
- CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) config.status
-
-config.status: configure
- @if test -f $@; then \
- $(SHELL) config.status --recheck ; \
- else \
- $(SHELL) configure ; \
- fi
-
-config.h: config.h.in config.status
- CONFIG_FILES= CONFIG_HEADERS=$(CONFIG_HEADERS) \
- $(SHELL) ./config.status
-
-build-subdirs:
- @list='$(SUBDIRS)'; \
- for dir in $$list; do \
- cd $$dir; $(MAKE); cd ..; \
- done
+
+INCLUDES = -I$(srcdir)/lib -I.
+LDFLAGS = @LDFLAGS@
+CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@ -DHAVE_EXPAT_CONFIG_H
+VSNFLAG = -version-info @LIBCURRENT@:@LIBREVISION@:@LIBAGE@
+
+### autoconf this?
+LTFLAGS = --silent
+
+COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES)
+LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
+LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
+LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
+
+LIB_OBJS = lib/xmlparse.lo lib/xmltok.lo lib/xmlrole.lo
+
+all: $(LIBRARY)
clean:
- @list='$(SUBDIRS)'; for dir in $$list; do \
- cd $$dir; $(MAKE) clean; cd ..; \
- done
- rm -f core *~
-
-distclean:
- @list='$(SUBDIRS)'; for dir in $$list; do \
- cd $$dir; $(MAKE) distclean; cd ..; \
- done
- rm -f config.h config.status config.log libtool examples/Makefile xmlwf/Makefile Makefile
+ cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
+ rm -rf .libs libexpat.la
+
+clobber: clean
+
+distclean: clean
+ rm -f expat_config.h config.status config.log config.cache libtool
+ rm -f Makefile
extraclean: distclean
- rm -f configure aclocal.m4
+ rm -f expat_config.h.in configure
+ rm -f conftools/ltconfig conftools/ltmain.sh conftools/libtool.m4
+
+check: tests/runtests
+ tests/runtests
+
+install: installlib
+
+installlib: $(LIBRARY) $(APIHEADER)
+ $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
+ $(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
+ $(INSTALL_DATA) $(APIHEADER) $(DESTDIR)$(includedir)
+
+$(LIBRARY): $(LIB_OBJS)
+ $(LINK_LIB) $(LIB_OBJS)
+
+lib/xmlparse.lo: lib/xmlparse.c lib/expat.h lib/xmlrole.h lib/xmltok.h \
+ $(top_builddir)/expat_config.h lib/internal.h
+
+lib/xmltok.lo: lib/xmltok.c lib/xmltok_impl.c lib/xmltok_ns.c \
+ lib/ascii.h lib/asciitab.h lib/iasciitab.h lib/latin1tab.h \
+ lib/nametab.h lib/utf8tab.h lib/xmltok.h lib/xmltok_impl.h \
+ $(top_builddir)/expat_config.h
+
+.SUFFIXES: .c .lo .o
-maintainer-clean: distclean
- rm -f $(DISTRIBUTION)
- rm -rf $(DISTDIR)
-
-distdir: MANIFEST
- test -d $(DISTDIR) && rm -rf $(DISTDIR); \
- mkdir $(DISTDIR); \
- flist=`sed -e "s/[ ]:.*$$//" MANIFEST`; for file in $$flist; do \
- cp -P $$file $(DISTDIR); \
- done
-
-$(DISTRIBUTION): distdir
- tar cfz $(DISTRIBUTION) $(DISTDIR)
-
-dist: $(DISTRIBUTION)
-
-install:
- @list='$(SUBDIRS)'; for dir in $$list; do \
- cd $$dir; $(MAKE) install; cd ..; \
- done
-
-uninstall:
- @list='$(SUBDIRS)'; for dir in $$list; do \
- cd $$dir; $(MAKE) uninstall; cd ..; \
- done
+.c.o:
+ $(COMPILE) -o $@ -c $<
+.c.lo:
+ $(LTCOMPILE) -o $@ -c $<
-depend:
- echo SOMEONE SHOULD MAKE THIS DO SOMETHING!!!
+.PHONY: buildlib all \
+ clean distclean extraclean maintainer-clean \
+ dist distdir \
+ install uninstall
Modified: apr/apr-util/branches/1.4.x/xml/expat/README
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/README?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/README (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/README Fri Nov 26 14:21:37 2010
@@ -1,7 +1,7 @@
- Expat, Release 1.95.2
+ Expat, Release 1.95.7
-This is expat, a C library for parsing XML, written by James Clark.
+This is Expat, a C library for parsing XML, written by James Clark.
Expat is a stream-oriented XML parser. This means that you register
handlers with the parser before starting the parse. These handlers
are called when the parser discovers the associated structures in the
@@ -17,15 +17,26 @@ the terms of the License contained in th
with this package. This license is the same as the MIT/X Consortium
license.
-Versions of expat that have an odd minor version (the middle number in
+Versions of Expat that have an odd minor version (the middle number in
the release above), are development releases and should be considered
as beta software. Releases with even minor version numbers are
intended to be production grade software.
-To build expat, you first run the configuration shell script in the
-top level distribution directory:
+If you are building Expat from a check-out from the CVS repository,
+you need to run a script that generates the configure script using the
+GNU autoconf and libtool tools. To do this, you need to have
+autoconf 2.52 or newer and libtool 1.4 or newer. Run the script like
+this:
- ./configure
+ ./buildconf.sh
+
+Once this has been done, follow the same instructions as for building
+from a source distribution.
+
+To build Expat from a source distribution, you first run the
+configuration shell script in the top level distribution directory:
+
+ ./configure
There are many options which you may provide to configure (which you
can discover by running configure with the --help option). But the
@@ -36,19 +47,41 @@ xmlwf into /usr/local/bin. If, for exam
into /home/me/mystuff/lib, /home/me/mystuff/include, and
/home/me/mystuff/bin, you can tell configure about that with:
- ./configure --prefix=/home/me/mystuff
+ ./configure --prefix=/home/me/mystuff
After running the configure script, the "make" command will build
things and "make install" will install things into their proper
location. Note that you need to have write permission into the
directories into which things will be installed.
-When building for use with C++, you may need to add additional
-compiler flags to support proper interaction with exceptions. This
-can be done by setting the CFLAGS environment variable. For example,
-when using GCC, you can use:
+If you are interested in building Expat to provide document
+information in UTF-16 rather than the default UTF-8, following these
+instructions:
+
+ 1. For UTF-16 output as unsigned short (and version/error
+ strings as char), run:
+
+ ./configure CPPFLAGS=-DXML_UNICODE
+
+ For UTF-16 output as wchar_t (incl. version/error strings),
+ run:
+
+ ./configure CFLAGS="-g -O2 -fshort-wchar" \
+ CPPFLAGS=-DXML_UNICODE_WCHAR_T
+
+ 2. Edit the MakeFile, changing:
- CFLAGS=-fexceptions ./configure
+ LIBRARY = libexpat.la
+
+ to:
+
+ LIBRARY = libexpatw.la
+
+ (Note the additional "w" in the library name.)
+
+ 3. Run "make buildlib" (which builds the library only).
+
+ 4. Run "make installlib" (which installs the library only).
Note for Solaris users: The "ar" command is usually located in
"/usr/ccs/bin", which is not in the default PATH. You will need to
@@ -57,16 +90,30 @@ to GNU make (the "make" found in /usr/cc
properly -- appearantly it does not understand .PHONY directives). If
you're using ksh or bash, use this command to build:
- PATH=/usr/ccs/bin:$PATH make
+ PATH=/usr/ccs/bin:$PATH make
+
+The unit and regression tests for Expat require the "check" library on
+Unix; more information is available at http://check.sourceforge.net/,
+and downloadable packages are available from the library's project
+page on SourceForge: http://sourceforge.net/projects/check/. You do
+not need to install the check library to build and use Expat, only to
+build and run Expat's test suite.
+
+When using Expat with a project using autoconf for configuration, you
+can use the probing macro in conftools/expat.m4 to determine how to
+include Expat. See the comments at the top of that file for more
+information.
A reference manual is available in the file doc/reference.html in this
distribution.
-The homepage for this project is http://expat.sourceforge.net/. There
+The homepage for this project is http://www.libexpat.org/. There
are links there to connect you to the bug reports page. If you need
to report a bug when you don't have access to a browser, you may also
-send a bug report by email to expat-bugs@lists.sourceforge.net.
+send a bug report by email to expat-bugs@mail.libexpat.org.
Discussion related to the direction of future expat development takes
-place on expat-discuss@lists.sourceforge.net. Archives of this list
-may be found at http://www.geocrawler.com/redir-sf.php3?list=expat-discuss.
+place on expat-discuss@mail.libexpat.org. Archives of this list and
+other Expat-related lists may be found at:
+
+ http://mail.libexpat.org/mailman-21/listinfo/
Modified: apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/buildconf.sh Fri Nov 26 14:21:37 2010
@@ -22,8 +22,10 @@ echo "Copying libtool helper files ..."
# Remove any m4 cache and libtool files so one can switch between
# autoconf and libtool versions by simply rerunning the buildconf script.
#
-(cd conftools ; rm -f ltconfig ltmain.sh)
-rm -rf aclocal.m4 libtool.m4 ltsugar.m4 autom4te*.cache
+m4files='lt~obsolete.m4 ltversion.m4 ltoptions.m4 argz.m4 ltsugar.m4 libtool.m4'
+
+(cd conftools ; rm -f ltconfig ltmain.sh aclocal.m4 $m4files)
+rm -rf autom4te*.cache aclocal.m4
$libtoolize --copy --automake
@@ -35,7 +37,7 @@ if [ ! -f libtool.m4 ]; then
ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
if [ -f $ltfile ]; then
echo "libtool.m4 found at $ltfile"
- cp $ltfile libtool.m4
+ cp $ltfile conftools/libtool.m4
else
echo "libtool.m4 not found - aborting!"
exit 1
@@ -48,8 +50,9 @@ fi
echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
echo "dnl edits here will be lost" >> aclocal.m4
-for m4file in libtool.m4 ltsugar.m4 ltoptions.m4 ltversion.m4 lt~obsolete.m4
+for m4file in $m4files
do
+ m4file=conftools/$m4file
if [ -f $m4file ]; then
echo "Incorporating $m4file into aclocal.m4 ..."
cat $m4file >> aclocal.m4
@@ -70,6 +73,6 @@ echo "Creating configure ..."
${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
# Remove autoconf caches
-rm -rf autom4te*.cache
+rm -rf autom4te*.cache aclocal.m4
exit 0
Modified: apr/apr-util/branches/1.4.x/xml/expat/configure.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/configure.in?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/configure.in (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/configure.in Fri Nov 26 14:21:37 2010
@@ -10,24 +10,16 @@ dnl under the terms of the License (ba
dnl in the file COPYING that comes with this distribution.
dnl
-AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(conftools)
-AC_CONFIG_MACRO_DIR(.)
+dnl Ensure that Expat is configured with autoconf 2.52 or newer
+AC_PREREQ(2.52)
-dnl
-dnl Follow the GNU/Linux convention of odd number minor version for
-dnl beta/development releases and even number minor version for stable
-dnl releases. Edit is bumped with each release and set to 0 with
-dnl change to major or minor version.
-dnl
-EXPAT_MAJOR_VERSION=1
-EXPAT_MINOR_VERSION=95
-EXPAT_EDIT=2
-
-EXPAT_VERSION=$EXPAT_MAJOR_VERSION.$EXPAT_MINOR_VERSION.$EXPAT_EDIT
-VERSION=$EXPAT_VERSION
-PACKAGE=expat
+dnl ### apr-util hack: just hard-code the version here, as is done in expat.h.
+AC_INIT(expat, 1.95.7, expat-bugs@mail.libexpat.org)
+
+AC_CONFIG_SRCDIR(Makefile.in)
+AC_CONFIG_AUX_DIR(conftools)
+AC_CONFIG_MACRO_DIR(conftools)
dnl
dnl Increment LIBREVISION if source code has changed at all
@@ -40,13 +32,16 @@ dnl
dnl If the API changes incompatibly set LIBAGE back to 0
dnl
-LIBCURRENT=1
+LIBCURRENT=5
LIBREVISION=0
-LIBAGE=1
+LIBAGE=5
+
+AC_CONFIG_HEADER(expat_config.h)
-AC_CONFIG_HEADER(config.h)
+sinclude(conftools/ac_c_bigendian_cross.m4)
AC_CANONICAL_SYSTEM
+
case "$host_os" in
*os2*)
# Use a custom made libtool replacement
@@ -54,20 +49,11 @@ case "$host_os" in
LIBTOOL="$srcdir/../../../apr/build/aplibtool"
;;
*)
- AC_LIBTOOL_WIN32_DLL
+AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
;;
esac
-blddir=`pwd`
-AC_SUBST(blddir)
-
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-AC_SUBST(EXPAT_MAJOR_VERSION)
-AC_SUBST(EXPAT_MINOR_VERSION)
-AC_SUBST(EXPAT_EDIT)
-
AC_SUBST(LIBCURRENT)
AC_SUBST(LIBREVISION)
AC_SUBST(LIBAGE)
@@ -76,11 +62,8 @@ dnl Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
-dnl Checks for libraries.
-
dnl Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h string.h)
dnl Checks for typedefs, structures, and compiler characteristics.
dnl check for endianness
@@ -91,20 +74,26 @@ else
[byte order is unknown due to cross-compilation])
fi
AC_C_CONST
-AC_TYPE_OFF_T
AC_TYPE_SIZE_T
+AC_CHECK_FUNCS(memmove bcopy)
-dnl Checks for library functions.
+dnl Only needed for regression tests:
+AC_CHECK_HEADERS(check.h)
-AC_FUNC_MEMCMP
-AC_FUNC_MMAP
-AC_SUBST(FILEMAP_OBJ)
-if test -z "$HAVE_MMAP"; then
-FILEMAP_OBJ=unixfilemap.o
-else
-FILEMAP_OBJ=readfilemap.o
+dnl Some basic configuration:
+AC_DEFINE([XML_NS], 1,
+ [Define to make XML Namespaces functionality available.])
+AC_DEFINE([XML_DTD], 1,
+ [Define to make parameter entity parsing functionality available.])
+AC_DEFINE([XML_CONTEXT_BYTES], 1024,
+ [Define to specify how much context to retain around the current parse point.])
+
+AC_CONFIG_FILES(Makefile)
+AC_OUTPUT
+
+abs_srcdir="`cd $srcdir && pwd`"
+abs_builddir="`pwd`"
+if test "$abs_srcdir" != "$abs_builddir"; then
+ mkdir lib
fi
-AC_CHECK_FUNCS(memmove bcopy)
-
-AC_OUTPUT(Makefile lib/Makefile lib/expat.h)
Propchange: apr/apr-util/branches/1.4.x/xml/expat/conftools/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Nov 26 14:21:37 2010
@@ -1,3 +1,5 @@
ltconfig
ltmain.sh
ltcf-c.sh
+lt*.m4
+libtool.m4
Modified: apr/apr-util/branches/1.4.x/xml/expat/conftools/PrintPath
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/conftools/PrintPath?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/conftools/PrintPath (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/conftools/PrintPath Fri Nov 26 14:21:37 2010
@@ -1,4 +1,21 @@
#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
# Look for program[s] somewhere in $PATH.
#
# Options:
@@ -12,9 +29,6 @@
#
# Initially written by Jim Jagielski for the Apache configuration mechanism
# (with kudos to Kernighan/Pike)
-#
-# This script falls under the Apache License.
-# See http://www.apache.org/docs/LICENSE
##
# Some "constants"
@@ -45,7 +59,7 @@ done
#
# First of all, all OS/2 programs have the '.exe' extension.
# Next, we adjust PATH (or what was given to us as PATH) to
-# be whitespace seperated directories.
+# be whitespace separated directories.
# Finally, we try to determine the best flag to use for
# test/[] to look for an executable file. OS/2 just has '-r'
# but with other OSs, we do some funny stuff to check to see
Propchange: apr/apr-util/branches/1.4.x/xml/expat/conftools/ac_c_bigendian_cross.m4
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: apr/apr-util/branches/1.4.x/xml/expat/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Nov 26 14:21:37 2010
@@ -1,7 +1,6 @@
Makefile
.deps
.libs
-expat.h
*.lo
*.la
config.h
Modified: apr/apr-util/branches/1.4.x/xml/expat/lib/ascii.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/lib/ascii.h?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/lib/ascii.h (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/lib/ascii.h Fri Nov 26 14:21:37 2010
@@ -1,6 +1,5 @@
-/*
-Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
-See the file COPYING for copying permission.
+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+ See the file COPYING for copying permission.
*/
#define ASCII_A 0x41
@@ -69,7 +68,7 @@ See the file COPYING for copying permiss
#define ASCII_9 0x39
#define ASCII_TAB 0x09
-#define ASCII_SPACE 0x20
+#define ASCII_SPACE 0x20
#define ASCII_EXCL 0x21
#define ASCII_QUOT 0x22
#define ASCII_AMP 0x26
Modified: apr/apr-util/branches/1.4.x/xml/expat/lib/asciitab.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/lib/asciitab.h?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/lib/asciitab.h (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/lib/asciitab.h Fri Nov 26 14:21:37 2010
@@ -1,6 +1,5 @@
-/*
-Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
-See the file COPYING for copying permission.
+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+ See the file COPYING for copying permission.
*/
/* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML,
Modified: apr/apr-util/branches/1.4.x/xml/expat/lib/expat.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/lib/expat.dsp?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/lib/expat.dsp (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/lib/expat.dsp Fri Nov 26 14:21:37 2010
@@ -107,11 +107,11 @@ SOURCE=.\xmlparse.c
!IF "$(CFG)" == "expat - Win32 Release"
-# ADD CPP /D VERSION=\"expat_1.95.2\"
+# ADD CPP /D VERSION=\"expat_1.95.7\"
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
-# ADD CPP /EHsc- /Od /D VERSION=\"expat_1.95.2\"
+# ADD CPP /EHsc- /Od /D VERSION=\"expat_1.95.7\"
!ENDIF
@@ -122,11 +122,11 @@ SOURCE=.\xmlrole.c
!IF "$(CFG)" == "expat - Win32 Release"
-# ADD CPP /D VERSION=\"expat_1.95.2\"
+# ADD CPP /D VERSION=\"expat_1.95.7\"
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
-# ADD CPP /D VERSION=\"expat_1.95.2\"
+# ADD CPP /D VERSION=\"expat_1.95.7\"
!ENDIF
@@ -137,11 +137,11 @@ SOURCE=.\xmltok.c
!IF "$(CFG)" == "expat - Win32 Release"
-# ADD CPP /D VERSION=\"expat_1.95.2\"
+# ADD CPP /D VERSION=\"expat_1.95.7\"
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
-# ADD CPP /D VERSION=\"expat_1.95.2\"
+# ADD CPP /D VERSION=\"expat_1.95.7\"
!ENDIF
@@ -152,12 +152,12 @@ SOURCE=xmltok_impl.c
!IF "$(CFG)" == "expat - Win32 Release"
-# ADD CPP /D VERSION=\"expat_1.95.2\"
+# ADD CPP /D VERSION=\"expat_1.95.7\"
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
# PROP Exclude_From_Build 1
-# ADD CPP /D VERSION=\"expat_1.95.2\"
+# ADD CPP /D VERSION=\"expat_1.95.7\"
!ENDIF
@@ -168,12 +168,12 @@ SOURCE=xmltok_ns.c
!IF "$(CFG)" == "expat - Win32 Release"
-# ADD CPP /D VERSION=\"expat_1.95.2\"
+# ADD CPP /D VERSION=\"expat_1.95.7\"
!ELSEIF "$(CFG)" == "expat - Win32 Debug"
# PROP Exclude_From_Build 1
-# ADD CPP /D VERSION=\"expat_1.95.2\"
+# ADD CPP /D VERSION=\"expat_1.95.7\"
!ENDIF
Propchange: apr/apr-util/branches/1.4.x/xml/expat/lib/expat.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: apr/apr-util/branches/1.4.x/xml/expat/lib/iasciitab.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/lib/iasciitab.h?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/lib/iasciitab.h (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/lib/iasciitab.h Fri Nov 26 14:21:37 2010
@@ -1,6 +1,5 @@
-/*
-Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
-See the file COPYING for copying permission.
+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+ See the file COPYING for copying permission.
*/
/* Like asciitab.h, except that 0xD has code BT_S rather than BT_CR */
Propchange: apr/apr-util/branches/1.4.x/xml/expat/lib/internal.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: apr/apr-util/branches/1.4.x/xml/expat/lib/latin1tab.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/lib/latin1tab.h?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/lib/latin1tab.h (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/lib/latin1tab.h Fri Nov 26 14:21:37 2010
@@ -1,6 +1,5 @@
-/*
-Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
-See the file COPYING for copying permission.
+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+ See the file COPYING for copying permission.
*/
/* 0x80 */ BT_OTHER, BT_OTHER, BT_OTHER, BT_OTHER,
Modified: apr/apr-util/branches/1.4.x/xml/expat/lib/utf8tab.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/lib/utf8tab.h?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/lib/utf8tab.h (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/lib/utf8tab.h Fri Nov 26 14:21:37 2010
@@ -1,6 +1,5 @@
-/*
-Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
-See the file COPYING for copying permission.
+/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
+ See the file COPYING for copying permission.
*/
Modified: apr/apr-util/branches/1.4.x/xml/expat/lib/winconfig.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/lib/winconfig.h?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/lib/winconfig.h (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/lib/winconfig.h Fri Nov 26 14:21:37 2010
@@ -5,8 +5,6 @@
** This is free software. You are permitted to copy, distribute, or modify
** it under the terms of the MIT/X license (contained in the COPYING file
** with this distribution.)
-**
-**
*/
#ifndef WINCONFIG_H
@@ -21,7 +19,12 @@
#define XML_NS 1
#define XML_DTD 1
-#define XML_BYTE_ORDER 12
#define XML_CONTEXT_BYTES 1024
+/* we will assume all Windows platforms are little endian */
+#define BYTEORDER 1234
+
+/* Windows has memmove() available. */
+#define HAVE_MEMMOVE
+
#endif /* ndef WINCONFIG_H */
Modified: apr/apr-util/branches/1.4.x/xml/expat/lib/xml.dsp
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/xml/expat/lib/xml.dsp?rev=1039370&r1=1039369&r2=1039370&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/xml/expat/lib/xml.dsp (original)
+++ apr/apr-util/branches/1.4.x/xml/expat/lib/xml.dsp Fri Nov 26 14:21:37 2010
@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "LibR"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.2\" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -67,7 +67,7 @@ LIB32=link.exe -lib
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.2\" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -90,7 +90,7 @@ LIB32=link.exe -lib
# PROP Intermediate_Dir "x64\LibR"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /FD /c
-# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.2\" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /c
+# ADD CPP /nologo /MD /W3 /Zi /O2 /Oy- /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -114,7 +114,7 @@ LIB32=link.exe -lib
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FD /EHsc /c
-# ADD CPP /nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.2\" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c
+# ADD CPP /nologo /MDd /W3 /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "COMPILED_FROM_DSP" /D "XML_STATIC" /Fo"$(INTDIR)\" /Fd"$(OUTDIR)\xml" /FD /EHsc /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
@@ -171,10 +171,6 @@ SOURCE=.\asciitab.h
# End Source File
# Begin Source File
-SOURCE=.\config.h
-# End Source File
-# Begin Source File
-
SOURCE=.\expat.h
# End Source File
# Begin Source File
@@ -195,113 +191,19 @@ SOURCE=.\utf8tab.h
# End Source File
# Begin Source File
-SOURCE=.\xmlrole.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\xmltok.h
+SOURCE=.\winconfig.h
# End Source File
# Begin Source File
-SOURCE=.\xmltok_impl.h
+SOURCE=.\xmlrole.h
# End Source File
-# End Group
-# Begin Group "Generated Header Files"
-
-# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\expat.h.in
-
-!IF "$(CFG)" == "xml - Win32 Release"
-
-# Begin Custom Build - Creating expat.h from expat.h.in
-InputPath=.\expat.h.in
-
-".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\expat.h.in > .\expat.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
-
-# Begin Custom Build - Creating expat.h from expat.h.in
-InputPath=.\expat.h.in
-
-".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\expat.h.in > .\expat.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "xml - x64 Release"
-
-# Begin Custom Build - Creating expat.h from expat.h.in
-InputPath=.\expat.h.in
-
-".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\expat.h.in > .\expat.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "xml - x64 Debug"
-
-# Begin Custom Build - Creating expat.h from expat.h.in
-InputPath=.\expat.h.in
-
-".\expat.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\expat.h.in > .\expat.h
-
-# End Custom Build
-
-!ENDIF
-
+SOURCE=.\xmltok.h
# End Source File
# Begin Source File
-SOURCE=.\winconfig.h
-
-!IF "$(CFG)" == "xml - Win32 Release"
-
-# Begin Custom Build - Creating config.h from winconfig.h
-InputPath=.\winconfig.h
-
-".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\winconfig.h > .\config.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "xml - Win32 Debug"
-
-# Begin Custom Build - Creating config.h from winconfig.h
-InputPath=.\winconfig.h
-
-".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\winconfig.h > .\config.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "xml - x64 Release"
-
-# Begin Custom Build - Creating config.h from winconfig.h
-InputPath=.\winconfig.h
-
-".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\winconfig.h > .\config.h
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "xml - x64 Debug"
-
-# Begin Custom Build - Creating config.h from winconfig.h
-InputPath=.\winconfig.h
-
-".\config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- type .\winconfig.h > .\config.h
-
-# End Custom Build
-
-!ENDIF
-
+SOURCE=.\xmltok_impl.h
# End Source File
# End Group
# Begin Source File