Skip to content
Snippets Groups Projects
Commit 555c4dcc authored by Jaime Perez Crespo's avatar Jaime Perez Crespo
Browse files

Deprecate SimpleSAML_Utilities::disanleXMLEntityLoader(). Since we are...

Deprecate SimpleSAML_Utilities::disanleXMLEntityLoader(). Since we are requiring PHP 5.3, we can call libxml_disable_entity_loader() directly.
parent 824f3a55
No related branches found
No related tags found
No related merge requests found
...@@ -1624,6 +1624,7 @@ class SimpleSAML_Utilities { ...@@ -1624,6 +1624,7 @@ class SimpleSAML_Utilities {
* Disable the loading of external entities in XML documents to prevent local and * Disable the loading of external entities in XML documents to prevent local and
* remote file inclusion attacks. This is in most cases already disabled by default * remote file inclusion attacks. This is in most cases already disabled by default
* in system libraries, but to be safe we explicitly disable it also. * in system libraries, but to be safe we explicitly disable it also.
* @deprecated This function will be removed in SSP 2.0. Please use libxml_disable_entity_loader() instead.
*/ */
public static function disableXMLEntityLoader() { public static function disableXMLEntityLoader() {
/* Function only present in PHP >= 5.2.11 while we support 5.2+ */ /* Function only present in PHP >= 5.2.11 while we support 5.2+ */
......
...@@ -108,4 +108,4 @@ if (!file_exists($configdir . '/config.php')) { ...@@ -108,4 +108,4 @@ if (!file_exists($configdir . '/config.php')) {
/* Set the timezone. */ /* Set the timezone. */
SimpleSAML_Utilities::initTimezone(); SimpleSAML_Utilities::initTimezone();
/* Disable XML external entity loading explicitly. */ /* Disable XML external entity loading explicitly. */
SimpleSAML_Utilities::disableXMLEntityLoader(); libxml_disable_entity_loader();
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment