Muehlenhoff has submitted this change and it was merged.

Change subject: Support scaling of huge SVGs
......................................................................


Support scaling of huge SVGs

Passing the unlimited flag to librsvg bypasses some size limits in librsvg.
Since we have additional mitigations against huge resource consumption in
place and various legitimate SVGs which run into that limit use the
flag when shelling out to rsvg-convert.

Bug: T111815
Change-Id: I729a0eeab907220a847244d33a93f1348e92f0cf
---
M wmf-config/CommonSettings.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Dpatrick: Looks good to me, approved
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 1320995..dc8d8a7 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -534,7 +534,7 @@
 $wgSVGConverters['rsvg-broken'] = '$path/rsvg-convert -w $width -h $height -o 
$output < $input';
 if ( defined( 'HHVM_VERSION' ) ) {
        # Newer librsvg supports a sane security model by default and doesn't 
need our security patch
-       $wgSVGConverters['rsvg-secure'] = '$path/rsvg-convert -w $width -h 
$height -o $output $input';
+       $wgSVGConverters['rsvg-secure'] = '$path/rsvg-convert -u -w $width -h 
$height -o $output $input';
 } else {
        # This converter will only work when rsvg has a suitable security patch
        $wgSVGConverters['rsvg-secure'] = '$path/rsvg-convert 
--no-external-files -w $width -h $height -o $output $input';

-- 
To view, visit https://gerrit.wikimedia.org/r/303548
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I729a0eeab907220a847244d33a93f1348e92f0cf
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: Dpatrick <dpatr...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: MarcoAurelio <strig...@gmail.com>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to