sock.listen(*addr, 8);
}
+// Avoid emitting sigc::signal destructor in files including server.h
+Server::~Server()
+{
+}
+
unsigned Server::get_port() const
{
const Net::SockAddr &addr = sock.get_local_address();
{
Client &cl = get_client_by_response(resp);
if(cl.async)
- {
- cl.sock->write(resp.str());
- cl.stale = true;
- }
+ send_response(cl, *cl.response);
}
void Server::data_available()
response = new Response(NOT_IMPLEMENTED);
response->add_content("Method not implemented\n");
}
+ else if(cl.request->get_path()[0]!='/')
+ {
+ response = new Response(BAD_REQUEST);
+ response->add_content("Path must be absolute\n");
+ }
}
catch(const exception &e)
{
cl.in_buf.erase(0, len);
}
- bool keepalive = false;
if(cl.request && cl.request->is_complete() && !response)
{
+ cl.keepalive = false;
if(cl.request->has_header("Connection"))
- keepalive = (cl.request->get_header("Connection")=="keep-alive");
+ cl.keepalive = (cl.request->get_header("Connection")=="keep-alive");
response = new Response(NONE);
try
}
if(response)
+ send_response(cl, *response);
+}
+
+void Server::send_response(Client &cl, Response &resp)
+{
+ cl.sock->write(resp.str());
+ cl.async = false;
+ if(cl.keepalive)
{
- cl.sock->write(response->str());
- if(keepalive)
- {
- delete cl.request;
- cl.request = 0;
- delete cl.response;
- cl.response = 0;
- }
- else
- {
- cl.sock->shutdown(IO::M_WRITE);
- cl.stale = true;
- }
+ delete cl.request;
+ cl.request = 0;
+ delete cl.response;
+ cl.response = 0;
+ }
+ else
+ {
+ cl.sock->shutdown(IO::M_WRITE);
+ cl.stale = true;
}
}
sock(s),
request(0),
response(0),
+ keepalive(false),
async(false),
stale(false)
{ }