SendHeaders(data.length(), response, empty);
this->Write(data);
+ this->FlushWriteBuffer();
}
void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders)
if (request_type.empty() || uri.empty() || http_version.empty())
{
SendHTTPError(400);
- Instance->SE->WantWrite(this);
+ SetWrite();
return;
}
if ((fieldsep == std::string::npos) || (fieldsep == 0) || (fieldsep == cheader.length() - 1))
{
SendHTTPError(400);
- Instance->SE->WantWrite(this);
+ SetWrite();
return;
}
if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
{
SendHTTPError(505);
- Instance->SE->WantWrite(this);
+ SetWrite();
return;
}
HTTPHeaders empty;
SendHeaders(index->ContentSize(), 200, empty);
this->Write(index->Contents());
- Instance->SE->WantWrite(this);
+ this->FlushWriteBuffer();
+ SetWrite();
}
else
{
claimed = false;
HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP(),postdata);
- Event e((char*)&httpr, (Module*)HttpModule, "httpd_url");
- e.Send(this->Instance);
+ Event acl((char*)&httpr, (Module*)HttpModule, "httpd_acl");
+ acl.Send(this->Instance);
if (!claimed)
{
- SendHTTPError(404);
- Instance->SE->WantWrite(this);
+ Event e((char*)&httpr, (Module*)HttpModule, "httpd_url");
+ e.Send(this->Instance);
+ if (!claimed)
+ {
+ SendHTTPError(404);
+ SetWrite();
+ }
}
}
}
bool OnWriteReady()
{
+ Instance->Logs->Log("m_httpd",DEBUG,"OnWriteReady()");
return false;
}
{
SendHeaders(n->str().length(), response, *hheaders);
this->Write(n->str());
+ this->FlushWriteBuffer();
+ SetWrite();
+ }
+
+ void SetWrite()
+ {
+ Instance->Logs->Log("m_httpd",DEBUG,"SetWrite()");
+ this->WaitingForWriteEvent = true;
Instance->SE->WantWrite(this);
}
};