hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed deadlock if buffer disconnects before sending metadata to connectors.

Browse source
This commit is contained in:
Thulinma 2013-04-12 16:41:11 +02:00
parent e23a835c26
commit 10f1803857
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/connectors/conn_http_dynamic.cpp
View file

@ -183,7 +183,7 @@ namespace Connector_HTTP {
} }
ss.setBlocking(false); ss.setBlocking(false);
//make sure metadata is received //make sure metadata is received
while ( !Strm.metadata){ while ( !Strm.metadata && ss.connected()){
if (ss.spool()){ if (ss.spool()){
while (Strm.parsePacket(ss.Received())){ while (Strm.parsePacket(ss.Received())){
//do nothing //do nothing

2
src/connectors/conn_http_live.cpp
View file

@ -127,7 +127,7 @@ namespace Connector_HTTP {
} }
ss.setBlocking(false); ss.setBlocking(false);
//make sure metadata is received //make sure metadata is received
while ( !Strm.metadata){ while ( !Strm.metadata && ss.connected()){
if (ss.spool()){ if (ss.spool()){
while (Strm.parsePacket(ss.Received())){ while (Strm.parsePacket(ss.Received())){
//do nothing //do nothing

2
src/connectors/conn_http_smooth.cpp
View file

@ -182,7 +182,7 @@ namespace Connector_HTTP {
} }
ss.setBlocking(false); ss.setBlocking(false);
//Do nothing until metadata has been received. //Do nothing until metadata has been received.
while ( !Strm.metadata){ while ( !Strm.metadata && ss.connected()){
if (ss.spool()){ if (ss.spool()){
while (Strm.parsePacket(ss.Received())){ while (Strm.parsePacket(ss.Received())){
//do nothing //do nothing