Commit472a4ad

committed

Merge pull request#327 from mepahoo/0.10-devel-integration

fixed read timeout in chucked content response for sync keep-alive client

2 parents2e5b039 +bf64ef9 commit472a4adCopy full SHA for 472a4ad

File tree

+12

-9

lines changed

+12

-9

lines changed

Lines changed: 12 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -168,15 +168,18 @@ struct sync_connection_base_impl {`
`168`	`168`	`}else {`
`169`	`169`	`bool stopping_inner =false;`
`170`	`170`	`do {`
`171`		`- std::size_t chunk_bytes_read =`
`172`		`-read(socket_,`
`173`		`- response_buffer,`
`174`		`-boost::asio::transfer_at_least(chunk_size),`
`175`		`- error);`
`176`		`-if (chunk_bytes_read ==0) {`
`177`		`-if (error != boost::asio::error::eof)`
`178`		`-throwboost::system::system_error(error);`
`179`		`- stopping_inner =true;`
	`171`	`+if (response_buffer.size() < (chunk_size+2)){`
	`172`	`+ std::size_t bytes_to_read = (chunk_size+2) - response_buffer.size();`
	`173`	`+ std::size_t chunk_bytes_read =`
	`174`	`+read(socket_,`
	`175`	`+ response_buffer,`
	`176`	`+boost::asio::transfer_at_least(bytes_to_read),`
	`177`	`+ error);`
	`178`	`+if (chunk_bytes_read ==0) {`
	`179`	`+if (error != boost::asio::error::eof)`
	`180`	`+throwboost::system::system_error(error);`
	`181`	`+ stopping_inner =true;`
	`182`	`+ }`
`180`	`183`	`}`
`181`	`184`
`182`	`185`	`std::istreambuf_iterator<char> eos;`

Comments

(0)