Commit6b8b5ae

Benoît Burnichon

committed

Verify edge case where no last-modified header is available

1 parent9171f8e commit6b8b5aeCopy full SHA for 6b8b5ae

File tree

+33

-1

lines changed

+33

-1

lines changed

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public function prepare(Request $request)`
`217`	`217`	`$this->maxlen =0;`
`218`	`218`	`}elseif ($request->headers->has('Range')) {`
`219`	`219`	`// Process the range headers.`
`220`		`-if (!$request->headers->has('If-Range') \|\|$this->getEtag() ==$request->headers->get('If-Range') \|\|$this->getLastModified()->format('D, d M Y H:i:s').' GMT' ==$request->headers->get('If-Range')) {`
	`220`	`+if (!$request->headers->has('If-Range') \|\|$this->hasValidIfRangeHeader($request->headers->get('If-Range'))) {`
`221`	`221`	`$range =$request->headers->get('Range');`
`222`	`222`	`$fileSize =$this->file->getSize();`
`223`	`223`
`@@ -250,6 +250,19 @@ public function prepare(Request $request)`
`250`	`250`	`return$this;`
`251`	`251`	`}`
`252`	`252`
	`253`	`+privatefunctionhasValidIfRangeHeader($header)`
	`254`	`+ {`
	`255`	`+if ($this->getEtag() ==$header) {`
	`256`	`+returntrue;`
	`257`	`+ }`
	`258`	`+`
	`259`	`+if (null ===$lastModified =$this->getLastModified()) {`
	`260`	`+returnfalse;`
	`261`	`+ }`
	`262`	`+`
	`263`	`+return$lastModified->format('D, d M Y H:i:s') .' GMT' ==$header;`
	`264`	`+ }`
	`265`	`+`
`253`	`266`	`/**`
`254`	`267`	`* Sends the file.`
`255`	`268`	`*/`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,25 @@ public function provideRanges()`
`122`	`122`	`);`
`123`	`123`	`}`
`124`	`124`
	`125`	`+publicfunctiontestRangeRequestsWithoutLastModifiedDate()`
	`126`	`+ {`
	`127`	`+// prevent auto last modified`
	`128`	`+$response = BinaryFileResponse::create(__DIR__.'/File/Fixtures/test.gif',200,array('Content-Type' =>'application/octet-stream'),true,null,false,false);`
	`129`	`+`
	`130`	`+// prepare a request for a range of the testing file`
	`131`	`+$request = Request::create('/');`
	`132`	`+$request->headers->set('If-Range',date('D, d M Y H:i:s') .' GMT');`
	`133`	`+$request->headers->set('Range','bytes=1-4');`
	`134`	`+`
	`135`	`+$this->expectOutputString(file_get_contents(__DIR__.'/File/Fixtures/test.gif'));`
	`136`	`+$response =clone$response;`
	`137`	`+$response->prepare($request);`
	`138`	`+$response->sendContent();`
	`139`	`+`
	`140`	`+$this->assertEquals(200,$response->getStatusCode());`
	`141`	`+$this->assertNull($response->headers->get('Content-Range'));`
	`142`	`+ }`
	`143`	`+`
`125`	`144`	`/**`
`126`	`145`	`* @dataProvider provideFullFileRanges`
`127`	`146`	`*/`

Comments

(0)