using namespace std;
-#include <iostream>
-
namespace Msp {
namespace Http {
Client::Client():
sock(0),
event_disp(0),
+ user_agent("libmsphttp/0.1"),
request(0),
response(0)
{ }
{
if(event_disp && sock)
event_disp->remove(*sock);
- event_disp=ed;
+ event_disp = ed;
if(event_disp && sock)
event_disp->add(*sock);
}
if(request)
throw InvalidState("Already processing a request");
- RefPtr<Net::SockAddr> addr=Net::resolve(r.get_header("host")+":"+r.get_header("x-port"));
+ string host = r.get_header("Host");
+ if(host.find(':')==string::npos)
+ host += ":80";
+ RefPtr<Net::SockAddr> addr = Net::resolve(host);
delete sock;
- sock=new Net::StreamSocket(addr->get_family());
+ sock = new Net::StreamSocket(addr->get_family());
sock->set_block(false);
sock->signal_data_available.connect(sigc::mem_fun(this, &Client::data_available));
sock->connect(*addr);
- request=new Request(r);
+ request = new Request(r);
+ if(!user_agent.empty())
+ request->set_header("User-Agent", user_agent);
delete response;
- response=0;
+ response = 0;
in_buf.clear();
}
if(!request)
return;
- while(IO::PollEvent ev=IO::poll(*sock, sock->get_events(), Time::zero))
+ while(IO::PollEvent ev = IO::poll(*sock, sock->get_events(), Time::zero))
sock->event(ev);
- if(response && response->get_complete())
+ if(response && response->is_complete())
{
signal_response_complete.emit(*response);
delete sock;
- sock=0;
+ sock = 0;
delete request;
- request=0;
+ request = 0;
}
}
void Client::wait_response()
{
- while(!response || !response->get_complete())
+ while(request && (!response || !response->is_complete()))
tick();
}
void Client::abort()
{
delete sock;
- sock=0;
+ sock = 0;
delete request;
- request=0;
+ request = 0;
}
void Client::connect_finished(int err)
sock->close();
delete request;
- request=0;
+ request = 0;
}
else
sock->write(request->str());
void Client::data_available()
{
char rbuf[4096];
- unsigned len=sock->read(rbuf, sizeof(rbuf));
+ unsigned len = sock->read(rbuf, sizeof(rbuf));
in_buf.append(rbuf, len);
if(!response)
{
if(in_buf.find("\r\n\r\n")!=string::npos || in_buf.find("\n\n")!=string::npos)
{
- response=new Response(Response::parse(in_buf));
+ response = new Response(Response::parse(in_buf));
response->set_user_data(request->get_user_data());
- in_buf=string();
+ in_buf = string();
}
}
else
{
- len=response->parse_content(in_buf);
+ len = response->parse_content(in_buf);
in_buf.erase(0, len);
}
- if(response && response->get_complete())
+ if(response && response->is_complete())
{
signal_response_complete.emit(*response);
sock->close();
delete request;
- request=0;
+ request = 0;
}
}