← Back to branch summary

~ubuntu-branches/ubuntu/feisty/apache2/feisty

« back to all changes in this revision

Viewing changes to debian/patches/to-review/015_escape_amp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Barth
  • Date: 2006-12-09 21:05:45 UTC
  • mfrom: (0.6.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20061209210545-h70s0xaqc2v8vqr2
Tags: 2.2.3-3.2
http://bugs.debian.org/396265
* Non-maintainer upload.
* 043_ajp_connection_reuse: Patch from upstream Bugzilla, fixing a critical
  issue with regard to connection reuse in mod_proxy_ajp.
  Closes: #396265

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/to-review/015_escape_amp
1
 
diff -urN build-tree.orig/apache2/srclib/apr-util/xml/apr_xml.c build-tree/apache2/srclib/apr-util/xml/apr_xml.c
2
 
--- build-tree.orig/apache2/srclib/apr-util/xml/apr_xml.c       2002-04-06 09:19:19.000000000 +0900
3
 
+++ build-tree/apache2/srclib/apr-util/xml/apr_xml.c    2002-11-25 15:31:51.000000000 +0900
4
 
@@ -577,7 +577,7 @@
5
 
        if (c == '<' || c == '>')
6
 
            extra += 3;         /* &lt; or &gt; */
7
 
        else if (c == '&')
8
 
-           extra += 4;         /* &amp; */
9
 
+           extra += 2;         /* &amp; */
10
 
        else if (quotes && c == '"')
11
 
            extra += 5;         /* &quot; */
12
 
     }
13
 
@@ -601,11 +601,9 @@
14
 
            *qscan++ = ';';
15
 
        }
16
 
        else if (c == '&') {
17
 
-           *qscan++ = '&';
18
 
-           *qscan++ = 'a';
19
 
-           *qscan++ = 'm';
20
 
-           *qscan++ = 'p';
21
 
-           *qscan++ = ';';
22
 
+           *qscan++ = '%';
23
 
+           *qscan++ = '2';
24
 
+           *qscan++ = '6';
25
 
        }
26
 
        else if (quotes && c == '"') {
27
 
            *qscan++ = '&';