This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.
symfony/src/Symfony/Component/Routing/Loader
Fabien Potencier a6bc12c9c1 Merge branch '2.0'
* 2.0:
  updated VERSION for 2.0.17
  updated CHANGELOG for 2.0.17
  updated vendors for 2.0.17
  fixed XML decoding attack vector through external entities
  prevents injection of malicious doc types
  disabled network access when loading XML documents
  refined previous commit
  prevents injection of malicious doc types
  standardized the way we handle XML errors
  Redirects are now absolute

Conflicts:
	CHANGELOG-2.0.md
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
	src/Symfony/Component/DomCrawler/Crawler.php
	src/Symfony/Component/HttpKernel/Kernel.php
	tests/Symfony/Tests/Component/DependencyInjection/Loader/XmlFileLoaderTest.php
	tests/Symfony/Tests/Component/Routing/Loader/XmlFileLoaderTest.php
	tests/Symfony/Tests/Component/Serializer/Encoder/XmlEncoderTest.php
	tests/Symfony/Tests/Component/Translation/Loader/XliffFileLoaderTest.php
	tests/Symfony/Tests/Component/Validator/Mapping/Loader/XmlFileLoaderTest.php
	vendors.php
2012-08-28 09:54:42 +02:00
..
schema/routing [Routing] Added the possibility to define options for imported resources 2012-04-04 03:36:42 +02:00
AnnotationClassLoader.php merged branch Tobion/phpdoc (PR #4539) 2012-06-12 19:54:37 +02:00
AnnotationDirectoryLoader.php [Routing] fix phpDoc 2012-06-10 21:30:17 +02:00
AnnotationFileLoader.php [Routing] fix phpDoc 2012-06-10 21:30:17 +02:00
ClosureLoader.php [Routing] fix phpDoc 2012-06-10 21:30:17 +02:00
PhpFileLoader.php [Routing] fix phpDoc 2012-06-10 21:30:17 +02:00
XmlFileLoader.php Merge branch '2.0' 2012-08-28 09:54:42 +02:00
YamlFileLoader.php [Routing] fix phpDoc 2012-06-10 21:30:17 +02:00