| Index: branches/wmf/1.19wmf1/includes/filerepo/backend/FileBackend.php |
| — | — | @@ -1246,7 +1246,9 @@ |
| 1247 | 1247 | if ( $res == StreamFile::NOT_MODIFIED ) { |
| 1248 | 1248 | // do nothing; client cache is up to date |
| 1249 | 1249 | } elseif ( $res == StreamFile::READY_STREAM ) { |
| | 1250 | + wfProfileIn( __METHOD__ . '-send' ); |
| 1250 | 1251 | $status = $this->doStreamFile( $params ); |
| | 1252 | + wfProfileOut( __METHOD__ . '-send' ); |
| 1251 | 1253 | } else { |
| 1252 | 1254 | $status->fatal( 'backend-fail-stream', $params['src'] ); |
| 1253 | 1255 | } |
| Index: branches/wmf/1.19wmf1/includes/StreamFile.php |
| — | — | @@ -29,7 +29,9 @@ |
| 30 | 30 | if ( $res == self::NOT_MODIFIED ) { |
| 31 | 31 | $ok = true; // use client cache |
| 32 | 32 | } elseif ( $res == self::READY_STREAM ) { |
| | 33 | + wfProfileIn( __METHOD__ . '-send' ); |
| 33 | 34 | $ok = readfile( $fname ); |
| | 35 | + wfProfileOut( __METHOD__ . '-send' ); |
| 34 | 36 | } else { |
| 35 | 37 | $ok = false; // failed |
| 36 | 38 | } |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 37 | 39 | Merged /trunk/phase3/includes:r112381 |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 38 | 40 | Merged /trunk/phase3:r112381 |