https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112382
Revision: 112382
Author: aaron
Date: 2012-02-25 01:44:13 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
MFT r112381
Modified Paths:
--------------
branches/wmf/1.19wmf1/includes/StreamFile.php
branches/wmf/1.19wmf1/includes/filerepo/backend/FileBackend.php
Property Changed:
----------------
branches/wmf/1.19wmf1/
branches/wmf/1.19wmf1/includes/
Property changes on: branches/wmf/1.19wmf1
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169,112172-112173,112179,112184,112259,112290,112378
+ /branches/JSTesting:100352-107913
/branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/branches/wmf/1.18wmf1:97508,111667
/trunk/phase3:111002,111029,111034,111062,111067,111076,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111802-111803,111827,111965-111967,112021,112034,112037,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112100,112128,112132-112133,112141,112152,112169,112172-112173,112179,112184,112259,112290,112378,112381
Property changes on: branches/wmf/1.19wmf1/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112378
+ /branches/JSTesting/includes:100352-107913
/branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf/1.18wmf1/includes:97508,111667
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:111029,111034,111067,111085,111128,111144,111251,111397,111571,111574,111597,111658,111673,111695,111697,111750,111827,111965-111967,112021,112045-112046,112049,112061-112063,112065-112066,112070-112071,112079,112128,112132-112133,112152,112184,112259,112290,112378,112381
Modified: branches/wmf/1.19wmf1/includes/StreamFile.php
===================================================================
--- branches/wmf/1.19wmf1/includes/StreamFile.php 2012-02-25 01:43:20 UTC
(rev 112381)
+++ branches/wmf/1.19wmf1/includes/StreamFile.php 2012-02-25 01:44:13 UTC
(rev 112382)
@@ -29,7 +29,9 @@
if ( $res == self::NOT_MODIFIED ) {
$ok = true; // use client cache
} elseif ( $res == self::READY_STREAM ) {
+ wfProfileIn( __METHOD__ . '-send' );
$ok = readfile( $fname );
+ wfProfileOut( __METHOD__ . '-send' );
} else {
$ok = false; // failed
}
Modified: branches/wmf/1.19wmf1/includes/filerepo/backend/FileBackend.php
===================================================================
--- branches/wmf/1.19wmf1/includes/filerepo/backend/FileBackend.php
2012-02-25 01:43:20 UTC (rev 112381)
+++ branches/wmf/1.19wmf1/includes/filerepo/backend/FileBackend.php
2012-02-25 01:44:13 UTC (rev 112382)
@@ -1246,7 +1246,9 @@
if ( $res == StreamFile::NOT_MODIFIED ) {
// do nothing; client cache is up to date
} elseif ( $res == StreamFile::READY_STREAM ) {
+ wfProfileIn( __METHOD__ . '-send' );
$status = $this->doStreamFile( $params );
+ wfProfileOut( __METHOD__ . '-send' );
} else {
$status->fatal( 'backend-fail-stream', $params['src'] );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
