diff  srclib/apr-util/xml/apr_xml.c.bac   srclib/apr-util/xml/apr_xml.c -u
--- srclib/apr-util/xml/apr_xml.c.bac   2007-07-10 21:37:47.000000000 +0900
+++ srclib/apr-util/xml/apr_xml.c       2007-07-12 22:36:46.000000000 +0900
@@ -547,7 +547,7 @@
        if (c == '<' || c == '>')
            extra += 3;         /* &lt; or &gt; */
        else if (c == '&')
-           extra += 4;         /* &amp; */
+           extra += 2;         /* %26;  */
        else if (quotes && c == '"')
            extra += 5;         /* &quot; */
     }
@@ -571,11 +571,9 @@
            *qscan++ = ';';
        }
        else if (c == '&') {
-           *qscan++ = '&';
-           *qscan++ = 'a';
-           *qscan++ = 'm';
-           *qscan++ = 'p';
-           *qscan++ = ';';
+           *qscan++ = '%';
+           *qscan++ = '2';
+           *qscan++ = '6';
        }
        else if (quotes && c == '"') {
            *qscan++ = '&';