| Index: branches/wmf/1.17wmf1/includes/parser/Preprocessor_DOM.php |
| — | — | @@ -134,7 +134,8 @@ |
| 135 | 135 | if ( !$result ) { |
| 136 | 136 | // Try running the XML through UtfNormal to get rid of invalid characters |
| 137 | 137 | $xml = UtfNormal::cleanUp( $xml ); |
| 138 | | - $result = $dom->loadXML( $xml ); |
| | 138 | + // 1 << 19 == XML_PARSE_HUGE, needed so newer versions of libxml2 don't barf when the XML is >256 levels deep |
| | 139 | + $result = $dom->loadXML( $xml, 1 << 19 ); |
| 139 | 140 | if ( !$result ) { |
| 140 | 141 | throw new MWException( __METHOD__.' generated invalid XML' ); |
| 141 | 142 | } |
| Property changes on: branches/wmf/1.17wmf1/includes/parser/Preprocessor_DOM.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 142 | 143 | Merged /branches/sqlite/includes/parser/Preprocessor_DOM.php:r58211-58321 |
| 143 | 144 | Merged /trunk/phase3/includes/parser/Preprocessor_DOM.php:r83590,89512-89513,96655 |
| 144 | 145 | Merged /branches/new-installer/phase3/includes/parser/Preprocessor_DOM.php:r43664-66004 |
| 145 | 146 | Merged /branches/wmf-deployment/includes/parser/Preprocessor_DOM.php:r53381,60970 |
| 146 | 147 | Merged /branches/REL1_15/phase3/includes/parser/Preprocessor_DOM.php:r51646 |
| 147 | 148 | Merged /branches/wmf/1.16wmf4/includes/parser/Preprocessor_DOM.php:r67177,69199,76243,77266 |