← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to WebCore/platform/MIMETypeRegistry.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2010-10-13 13:39:02 UTC
  • mfrom: (1.6.1 upstream) (4.4.9 maverick)
  • Revision ID: james.westby@ubuntu.com-20101013133902-ytzn2sqa7y41hosl
Tags: 1.2.5-0ubuntu0.10.04.1
https://launchpad.net/bugs/660075
* SECURITY UPDATE: Rebuilt new stable release 1.2.5 for lucid to fix
  multiple security issues. (LP: #660075)
   - CVE-2010-1386, CVE-2010-1392, CVE-2010-1405, CVE-2010-1407
   - CVE-2010-1412, CVE-2010-1416, CVE-2010-1417, CVE-2010-1418
   - CVE-2010-1419, CVE-2010-1421, CVE-2010-1422, CVE-2010-1501
   - CVE-2010-1664, CVE-2010-1665, CVE-2010-1758, CVE-2010-1759
   - CVE-2010-1760, CVE-2010-1761, CVE-2010-1762, CVE-2010-1767
   - CVE-2010-1770, CVE-2010-1771, CVE-2010-1772, CVE-2010-1773
   - CVE-2010-1774, CVE-2010-1780, CVE-2010-1781, CVE-2010-1782
   - CVE-2010-1783, CVE-2010-1784, CVE-2010-1785, CVE-2010-1786
   - CVE-2010-1787, CVE-2010-1788, CVE-2010-1790, CVE-2010-1792
   - CVE-2010-1793, CVE-2010-1807, CVE-2010-1812, CVE-2010-1814
   - CVE-2010-1815, CVE-2010-2264, CVE-2010-2647, CVE-2010-2648
   - CVE-2010-3113, CVE-2010-3114, CVE-2010-3115, CVE-2010-3116
   - CVE-2010-3248, CVE-2010-3257, CVE-2010-3259
* debian/patches/ubuntu-gir-version.patch: removed for lucid
* debian/control: add gir-repository-dev back to build-depends for lucid

Show diffs side-by-side

added added

removed removed

Lines of Context:
WebCore/platform/MIMETypeRegistry.cpp
205
205
#endif
206
206
        "application/rss+xml",
207
207
        "application/atom+xml",
 
208
        "application/json",
208
209
#if ENABLE(SVG)
209
210
        "image/svg+xml",
210
211
#endif
212
213
        "application/x-ftp-directory",
213
214
#endif
214
215
        "multipart/x-mixed-replace"
 
216
        // Note: ADDING a new type here will probably render it as HTML. This can
 
217
        // result in cross-site scripting.
215
218
    };
 
219
    COMPILE_ASSERT(sizeof(types) / sizeof(types[0]) <= 16,
 
220
                   nonimage_mime_types_must_be_less_than_or_equal_to_16);
 
221
 
216
222
    for (size_t i = 0; i < sizeof(types)/sizeof(types[0]); ++i)
217
223
        supportedNonImageMIMETypes->add(types[i]);
218
224