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

Better fix for previous commit.

Browse source
This commit is contained in:
Thulinma 2012-11-05 12:01:30 +01:00
parent 61945894d4
commit bdcb8b8e9b
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/conn_http.cpp
View file

@ -339,7 +339,7 @@ namespace Connector_HTTP{
conn->setBlocking(false);//do not block on conn.spool() when no data is available conn->setBlocking(false);//do not block on conn.spool() when no data is available
HTTP::Parser Client; HTTP::Parser Client;
while (conn->connected()){ while (conn->connected()){
if (conn->Received().size() || conn->spool()){ if (conn->spool() || conn->Received().size()){
//make sure it ends in a \n //make sure it ends in a \n
if (*(conn->Received().get().rbegin()) != '\n'){ if (*(conn->Received().get().rbegin()) != '\n'){
std::string tmp = conn->Received().get(); std::string tmp = conn->Received().get();
@ -369,9 +369,6 @@ namespace Connector_HTTP{
std::cout << "Completed request (" << conn->getSocket() << ") " << handler << " in " << (Util::getMS() - startms) << " ms" << std::endl; std::cout << "Completed request (" << conn->getSocket() << ") " << handler << " in " << (Util::getMS() - startms) << " ms" << std::endl;
#endif #endif
Client.Clean(); //clean for any possible next requests Client.Clean(); //clean for any possible next requests
}else{
//make sure connections get cleaned up properly when disconnected part-way into a request
conn->spool();
} }
}else{ }else{
usleep(10000);//sleep 10ms usleep(10000);//sleep 10ms