diff --git a/uppsrc/Core/Http.cpp b/uppsrc/Core/Http.cpp
index 417b16425..4c553cbec 100644
--- a/uppsrc/Core/Http.cpp
+++ b/uppsrc/Core/Http.cpp
@@ -346,12 +346,12 @@ void HttpRequest::StartRequest()
 		data << Nvl(path, "/");
 	data << " HTTP/1.1\r\n";
 	if(std_headers) {
-		data << "URL: " << url << "\r\n"
+		data// << "URL: " << url << "\r\n"
 		     << "Host: " << host_port << "\r\n"
 		     << "Connection: close\r\n"
 		     << "Accept: " << Nvl(accept, "*/*") << "\r\n"
 		     << "Accept-Encoding: gzip\r\n"
-		     << "Agent: " << Nvl(agent, "Ultimate++ HTTP client") << "\r\n";
+		     << "User-Agent: " << Nvl(agent, "Ultimate++ HTTP client") << "\r\n";
 		if(postdata.GetCount())
 			data << "Content-Length: " << postdata.GetCount() << "\r\n";
 		if(ctype.GetCount())
@@ -431,10 +431,6 @@ void HttpRequest::ReadingChunkHeader()
 String HttpRequest::GetRedirectUrl()
 {
 	String redirect_url = TrimLeft(header["location"]);
-	int q = redirect_url.Find('?');
-	int p = path.Find('?');
-	if(p >= 0 && q < 0)
-		redirect_url.Cat(path.Mid(p));
 	if(redirect_url.StartsWith("http://") || redirect_url.StartsWith("https://"))
 		return redirect_url;
 	String h = (ssl ? "https://" : "http://") + host;
diff --git a/uppsrc/Core/Web.h b/uppsrc/Core/Web.h
index c30ccf7ec..1c968cae2 100644
--- a/uppsrc/Core/Web.h
+++ b/uppsrc/Core/Web.h
@@ -1,376 +1,376 @@
-String        FormatIP(dword _ip);
-
-String        UrlEncode(const String& s);
-String        UrlEncode(const String& s, const char *specials);
-String        UrlDecode(const char *b, const char *e);
-inline String UrlDecode(const String& s)          { return UrlDecode(s.Begin(), s.End() ); }
-
-String        Base64Encode(const char *b, const char *e);
-inline String Base64Encode(const String& data)    { return Base64Encode(data.Begin(), data.End()); }
-String        Base64Decode(const char *b, const char *e);
-inline String Base64Decode(const String& data)    { return Base64Decode(data.Begin(), data.End()); }
-
-class IpAddrInfo {
-	enum { COUNT = 32 };
-	struct Entry {
-		const char *host;
-		const char *port;
-		int         status;
-		addrinfo   *addr;
-	};
-	static Entry     pool[COUNT];
-	
-	enum {
-		EMPTY = 0, WORKING, CANCELED, RESOLVED, FAILED
-	};
-
-	String host, port;
-	Entry *entry;
-	Entry  exe[1];
-
-	static void EnterPool();
-	static void LeavePool();
-	static rawthread_t rawthread__ Thread(void *ptr);
-
-	void Start();
-
-public:
-	void      Start(const String& host, int port);
-	bool      InProgress();
-	bool      Execute(const String& host, int port);
-	addrinfo *GetResult();
-	void      Clear();
-
-	IpAddrInfo();
-	~IpAddrInfo()           { Clear(); }
-};
-
-enum { WAIT_READ = 1, WAIT_WRITE = 2, WAIT_EXCEPTION = 4, WAIT_ALL = 7 };
-
-class TcpSocket {
-	enum { BUFFERSIZE = 512 };
-	enum { NONE, CONNECT, ACCEPT };
-	SOCKET                  socket;
-	int                     mode;
-	char                    buffer[BUFFERSIZE];
-	char                   *ptr;
-	char                   *end;
-	bool                    is_eof;
-	bool                    is_error;
-	bool                    is_abort;
-	bool                    ipv6;
-
-	int                     timeout;
-	int                     waitstep;
-	int                     done;
-
-	int                     errorcode;
-	String                  errordesc;
-	
-	struct SSL {
-		virtual bool Start() = 0;
-		virtual bool Wait(dword flags) = 0;
-		virtual int  Send(const void *buffer, int maxlen) = 0;
-		virtual int  Recv(void *buffer, int maxlen) = 0;
-		virtual void Close() = 0;
-		
-		virtual ~SSL() {}
-	};
-	
-	One<SSL>                ssl;
-	
-	struct SSLImp;
-	friend struct SSLImp;
-
-	static SSL *(*CreateSSL)(TcpSocket& socket);
-	static SSL *CreateSSLImp(TcpSocket& socket);
-
-	friend void InitCreateSSL();
-
-	bool                    RawWait(dword flags);
-	SOCKET                  AcceptRaw(dword *ipaddr, int timeout_msec);
-	bool                    Open(int family, int type, int protocol);
-	int                     RawRecv(void *buffer, int maxlen);
-	int                     Recv(void *buffer, int maxlen);
-	int                     RawSend(const void *buffer, int maxlen);
-	int                     Send(const void *buffer, int maxlen);
-	bool                    RawConnect(addrinfo *info);
-	void                    RawClose();
-
-	void                    ReadBuffer();
-	int                     Get_();
-	int                     Peek_();
-
-	void                    Reset();
-
-	void                    SetSockError(const char *context, int code, const char *errdesc);
-	void                    SetSockError(const char *context, const char *errdesc);
-	void                    SetSockError(const char *context);
-
-	static int              GetErrorCode();
-	static bool             WouldBlock();
-
-public:
-	Callback        WhenWait;
-
-	static String   GetHostName();
-	
-	int             GetDone() const                          { return done; }
-
-	static void     Init();
-
-	bool            IsOpen() const                           { return socket != INVALID_SOCKET; }
-	bool            IsEof() const                            { return is_eof && ptr == end; }
-
-	bool            IsError() const                          { return is_error; }
-	void            ClearError()                             { is_error = false; errorcode = 0; errordesc.Clear(); }
-	int             GetError() const                         { return errorcode; }
-	String          GetErrorDesc() const                     { return errordesc; }
-
-	void            Abort()                                  { is_abort = true; }
-	bool            IsAbort() const                          { return is_abort; }
-	void            ClearAbort()                             { is_abort = false; }
-	
-	SOCKET          GetSOCKET() const                        { return socket; }
-	String          GetPeerAddr() const;
-
-	void            Attach(SOCKET socket);
-	bool            Connect(const char *host, int port);
-	bool            Connect(IpAddrInfo& info);
-	bool            Listen(int port, int listen_count, bool ipv6 = false, bool reuse = true);
-	bool            Accept(TcpSocket& listen_socket);
-	void            Close();
-	void            Shutdown();
-
-	void            NoDelay();
-	void            Linger(int msecs);
-	void            NoLinger()                               { Linger(Null); }
-	void            Reuse(bool reuse = true);
-	
-	bool            Wait(dword events);
-	bool            WaitRead()                               { return Wait(WAIT_READ); }
-	bool            WaitWrite()                              { return Wait(WAIT_WRITE); }
-
-	int             Peek()                                   { return ptr < end ? *ptr : Peek_(); }
-	int             Term()                                   { return Peek(); }
-	int             Get()                                    { return ptr < end ? *ptr++ : Get_(); }
-	int             Get(void *buffer, int len);
-	String          Get(int len);
-	int             GetAll(void *buffer, int len)            { return Get(buffer, len) == len; }
-	String          GetAll(int len)                          { String s = Get(len); return s.GetCount() == len ? s : String::GetVoid(); }
-	String          GetLine(int maxlen = 2000000);
-
-	int             Put(const char *s, int len);
-	int             Put(const String& s)                     { return Put(s.Begin(), s.GetLength()); }
-	bool            PutAll(const char *s, int len)           { return Put(s, len) == len; }
-	bool            PutAll(const String& s)                  { return Put(s) == s.GetCount(); }
-	
-	bool            StartSSL();
-	bool            IsSSL() const                            { return ssl; }
-
-	TcpSocket&      Timeout(int ms)                          { timeout = ms; return *this; }
-	int             GetTimeout() const                       { return timeout; }
-	TcpSocket&      Blocking()                               { return Timeout(Null); }
-
-	TcpSocket();
-	~TcpSocket()                                             { Close(); }
-};
-
-class SocketWaitEvent {
-	Vector< Tuple2<int, dword> > socket;
-	fd_set read[1], write[1], exception[1];
-
-public:
-	void  Clear()                                            { socket.Clear(); }
-	void  Add(SOCKET s, dword events = WAIT_ALL)             { socket.Add(MakeTuple((int)s, events)); }
-	void  Add(TcpSocket& s, dword events = WAIT_ALL)         { Add(s.GetSOCKET(), events); }
-	int   Wait(int timeout);
-	dword Get(int i) const;
-	dword operator[](int i) const                            { return Get(i); }
-	
-	SocketWaitEvent();
-};
-
-struct HttpHeader {
-	String                    first_line;
-	VectorMap<String, String> fields;
-	
-	String operator[](const char *id)                        { return fields.Get(id, Null); }
-
-	bool   Response(String& protocol, int& code, String& reason);
-	bool   Request(String& method, String& uri, String& version);
-
-	void   Clear();
-	bool   Parse(const String& hdrs);
-};
-
-class HttpRequest : public TcpSocket {
-	int          phase;
-	String       data;
-	int          count;
-
-	HttpHeader   header;
-
-	String       error;
-	String       body;
-
-	enum {
-		DEFAULT_HTTP_PORT        = 80,
-		DEFAULT_HTTPS_PORT       = 443
-	};
-
-	enum {
-		METHOD_GET,
-		METHOD_POST,
-		METHOD_HEAD,
-		METHOD_PUT,
-	};
-
-	int          max_header_size;
-	int          max_content_size;
-	int          max_redirects;
-	int          max_retries;
-	int          timeout;
-
-	String       host;
-	int          port;
-	String       proxy_host;
-	int          proxy_port;
-	String       proxy_username;
-	String       proxy_password;
-	String       path;
-	bool         ssl;
-
-	int          method;
-	String       accept;
-	String       agent;
-	bool         force_digest;
-	bool         is_post;
-	bool         std_headers;
-	bool         hasurlvar;
-	String       contenttype;
-	String       username;
-	String       password;
-	String       digest;
-	String       request_headers;
-	String       postdata;
-
-	String       protocol;
-	int          status_code;
-	String       reason_phrase;
-	
-	int          start_time;
-	int          retry_count;
-	int          redirect_count;
-	
-	int          chunk;
-
-	IpAddrInfo   addrinfo;
-	int          bodylen;
-	bool         gzip;	
-	Zlib         z;
-
-	void         Init();
-
-	void         StartPhase(int s);
-	void         Start();
-	void         Dns();
-	void         StartRequest();
-	bool         SendingData();
-	bool         ReadingHeader();
-	void         StartBody();
-	bool         ReadingBody();
-	void         ReadingChunkHeader();
-	void         Finish();
-
-	void         CopyCookies();
-
-	void         HttpError(const char *s);
-	void         ContentOut(const void *ptr, dword size);
-	void         Out(const void *ptr, dword size);
-
-	String       CalculateDigest(const String& authenticate) const;
-
-public:
-	Callback2<const void *, dword> WhenContent;
-
-	HttpRequest&  MaxHeaderSize(int m)                   { max_header_size = m; return *this; }
-	HttpRequest&  MaxContentSize(int m)                  { max_content_size = m; return *this; }
-	HttpRequest&  MaxRedirect(int n)                     { max_redirects = n; return *this; }
-	HttpRequest&  MaxRetries(int n)                      { max_retries = n; return *this; }
-	HttpRequest&  RequestTimeout(int ms)                 { timeout = ms; return *this; }
-	HttpRequest&  ChunkSize(int n)                       { chunk = n; return *this; }
-
-	HttpRequest&  Method(int m)                          { method = m; return *this; }
-	HttpRequest&  GET()                                  { return Method(METHOD_GET); }
-	HttpRequest&  POST()                                 { return Method(METHOD_POST); }
-	HttpRequest&  HEAD()                                 { return Method(METHOD_HEAD); }
-	HttpRequest&  PUT()                                  { return Method(METHOD_PUT); }
-
-	HttpRequest&  Host(const String& h)                  { host = h; return *this; }
-	HttpRequest&  Port(int p)                            { port = p; return *this; }
-	HttpRequest&  SSL(bool b = true)                     { ssl = b; return *this; }
-	HttpRequest&  Path(const String& p)                  { path = p; return *this; }
-	HttpRequest&  User(const String& u, const String& p) { username = u; password = p; return *this; }
-	HttpRequest&  Digest()                               { force_digest = true; return *this; }
-	HttpRequest&  Digest(const String& d)                { digest = d; return *this; }
-	HttpRequest&  Url(const char *url);
-	HttpRequest&  UrlVar(const char *id, const String& data);
-	HttpRequest&  operator()(const char *id, const String& data) { return UrlVar(id, data); }
-	HttpRequest&  PostData(const String& pd)              { postdata = pd; return *this; }
-	HttpRequest&  PostUData(const String& pd)             { return PostData(UrlEncode(pd)); }
-	HttpRequest&  Post(const String& data)                { POST(); return PostData(data); }
-	HttpRequest&  Post(const char *id, const String& data);
-
-	HttpRequest&  Headers(const String& h)                { request_headers = h; return *this; }
-	HttpRequest&  ClearHeaders()                          { return Headers(Null); }
-	HttpRequest&  AddHeaders(const String& h)             { request_headers.Cat(h); return *this; }
-	HttpRequest&  Header(const char *id, const String& data);
-	HttpRequest&  Cookie(const String& cookie)            { return Header("Cookie", cookie); }
-
-	HttpRequest&  StdHeaders(bool sh)                     { std_headers = sh; return *this; }
-	HttpRequest&  NoStdHeaders()                          { return StdHeaders(false); }
-	HttpRequest&  Accept(const String& a)                 { accept = a; return *this; }
-	HttpRequest&  Agent(const String& a)                  { agent = a; return *this; }
-	HttpRequest&  ContentType(const String& a)            { contenttype = a; return *this; }
-
-	HttpRequest&  Proxy(const String& host, int port)     { proxy_host = host; proxy_port = port; return *this; }
-	HttpRequest&  Proxy(const char *url);
-	HttpRequest&  ProxyAuth(const String& u, const String& p) {  proxy_username = u; proxy_password = p; return *this; }
-
-	bool         IsSocketError() const                    { return TcpSocket::IsError(); }
-	bool         IsHttpError() const                      { return !IsNull(error) ; }
-	bool         IsError() const                          { return IsSocketError() || IsHttpError(); }
-	String       GetErrorDesc() const                     { return IsSocketError() ? TcpSocket::GetErrorDesc() : error; }
-	void         ClearError()                             { TcpSocket::ClearError(); error.Clear(); }
-
-	String       GetHeader(const char *s)                 { return header[s]; }
-	String       operator[](const char *s)                { return GetHeader(s); }
-	String       GetRedirectUrl();
-	int          GetContentLength();
-	int          GetStatusCode() const                    { return status_code; }
-	String       GetReasonPhrase() const                  { return reason_phrase; }
-
-	String       GetContent() const                       { return body; }
-	String       operator~() const                        { return GetContent(); }
-	operator     String() const                           { return GetContent(); }
-	void         ClearContent()                           { body.Clear(); }
-
-	enum Phase {
-		START, DNS, REQUEST, HEADER, BODY, CHUNK_HEADER, CHUNK_BODY, TRAILER, FINISHED, FAILED
-	};
-
-	bool    Do();
-	int     GetPhase() const                      { return phase; }
-	String  GetPhaseName() const;
-	bool    InProgress() const                    { return phase != FAILED && phase != FINISHED; }
-	bool    IsFailure() const                     { return phase == FAILED; }
-	bool    IsSuccess() const                     { return phase == FINISHED && status_code >= 200 && status_code < 300; }
-
-	String  Execute();
-	
-	HttpRequest();
-	HttpRequest(const char *url);
-	
-	static void  Trace(bool b = true);
-};
+String        FormatIP(dword _ip);
+
+String        UrlEncode(const String& s);
+String        UrlEncode(const String& s, const char *specials);
+String        UrlDecode(const char *b, const char *e);
+inline String UrlDecode(const String& s)          { return UrlDecode(s.Begin(), s.End() ); }
+
+String        Base64Encode(const char *b, const char *e);
+inline String Base64Encode(const String& data)    { return Base64Encode(data.Begin(), data.End()); }
+String        Base64Decode(const char *b, const char *e);
+inline String Base64Decode(const String& data)    { return Base64Decode(data.Begin(), data.End()); }
+
+class IpAddrInfo {
+	enum { COUNT = 32 };
+	struct Entry {
+		const char *host;
+		const char *port;
+		int         status;
+		addrinfo   *addr;
+	};
+	static Entry     pool[COUNT];
+	
+	enum {
+		EMPTY = 0, WORKING, CANCELED, RESOLVED, FAILED
+	};
+
+	String host, port;
+	Entry *entry;
+	Entry  exe[1];
+
+	static void EnterPool();
+	static void LeavePool();
+	static rawthread_t rawthread__ Thread(void *ptr);
+
+	void Start();
+
+public:
+	void      Start(const String& host, int port);
+	bool      InProgress();
+	bool      Execute(const String& host, int port);
+	addrinfo *GetResult();
+	void      Clear();
+
+	IpAddrInfo();
+	~IpAddrInfo()           { Clear(); }
+};
+
+enum { WAIT_READ = 1, WAIT_WRITE = 2, WAIT_EXCEPTION = 4, WAIT_ALL = 7 };
+
+class TcpSocket {
+	enum { BUFFERSIZE = 512 };
+	enum { NONE, CONNECT, ACCEPT };
+	SOCKET                  socket;
+	int                     mode;
+	char                    buffer[BUFFERSIZE];
+	char                   *ptr;
+	char                   *end;
+	bool                    is_eof;
+	bool                    is_error;
+	bool                    is_abort;
+	bool                    ipv6;
+
+	int                     timeout;
+	int                     waitstep;
+	int                     done;
+
+	int                     errorcode;
+	String                  errordesc;
+	
+	struct SSL {
+		virtual bool Start() = 0;
+		virtual bool Wait(dword flags) = 0;
+		virtual int  Send(const void *buffer, int maxlen) = 0;
+		virtual int  Recv(void *buffer, int maxlen) = 0;
+		virtual void Close() = 0;
+		
+		virtual ~SSL() {}
+	};
+	
+	One<SSL>                ssl;
+	
+	struct SSLImp;
+	friend struct SSLImp;
+
+	static SSL *(*CreateSSL)(TcpSocket& socket);
+	static SSL *CreateSSLImp(TcpSocket& socket);
+
+	friend void InitCreateSSL();
+
+	bool                    RawWait(dword flags);
+	SOCKET                  AcceptRaw(dword *ipaddr, int timeout_msec);
+	bool                    Open(int family, int type, int protocol);
+	int                     RawRecv(void *buffer, int maxlen);
+	int                     Recv(void *buffer, int maxlen);
+	int                     RawSend(const void *buffer, int maxlen);
+	int                     Send(const void *buffer, int maxlen);
+	bool                    RawConnect(addrinfo *info);
+	void                    RawClose();
+
+	void                    ReadBuffer();
+	int                     Get_();
+	int                     Peek_();
+
+	void                    Reset();
+
+	void                    SetSockError(const char *context, int code, const char *errdesc);
+	void                    SetSockError(const char *context, const char *errdesc);
+	void                    SetSockError(const char *context);
+
+	static int              GetErrorCode();
+	static bool             WouldBlock();
+
+public:
+	Callback        WhenWait;
+
+	static String   GetHostName();
+	
+	int             GetDone() const                          { return done; }
+
+	static void     Init();
+
+	bool            IsOpen() const                           { return socket != INVALID_SOCKET; }
+	bool            IsEof() const                            { return is_eof && ptr == end; }
+
+	bool            IsError() const                          { return is_error; }
+	void            ClearError()                             { is_error = false; errorcode = 0; errordesc.Clear(); }
+	int             GetError() const                         { return errorcode; }
+	String          GetErrorDesc() const                     { return errordesc; }
+
+	void            Abort()                                  { is_abort = true; }
+	bool            IsAbort() const                          { return is_abort; }
+	void            ClearAbort()                             { is_abort = false; }
+	
+	SOCKET          GetSOCKET() const                        { return socket; }
+	String          GetPeerAddr() const;
+
+	void            Attach(SOCKET socket);
+	bool            Connect(const char *host, int port);
+	bool            Connect(IpAddrInfo& info);
+	bool            Listen(int port, int listen_count, bool ipv6 = false, bool reuse = true);
+	bool            Accept(TcpSocket& listen_socket);
+	void            Close();
+	void            Shutdown();
+
+	void            NoDelay();
+	void            Linger(int msecs);
+	void            NoLinger()                               { Linger(Null); }
+	void            Reuse(bool reuse = true);
+	
+	bool            Wait(dword events);
+	bool            WaitRead()                               { return Wait(WAIT_READ); }
+	bool            WaitWrite()                              { return Wait(WAIT_WRITE); }
+
+	int             Peek()                                   { return ptr < end ? *ptr : Peek_(); }
+	int             Term()                                   { return Peek(); }
+	int             Get()                                    { return ptr < end ? *ptr++ : Get_(); }
+	int             Get(void *buffer, int len);
+	String          Get(int len);
+	int             GetAll(void *buffer, int len)            { return Get(buffer, len) == len; }
+	String          GetAll(int len)                          { String s = Get(len); return s.GetCount() == len ? s : String::GetVoid(); }
+	String          GetLine(int maxlen = 2000000);
+
+	int             Put(const char *s, int len);
+	int             Put(const String& s)                     { return Put(s.Begin(), s.GetLength()); }
+	bool            PutAll(const char *s, int len)           { return Put(s, len) == len; }
+	bool            PutAll(const String& s)                  { return Put(s) == s.GetCount(); }
+	
+	bool            StartSSL();
+	bool            IsSSL() const                            { return ssl; }
+
+	TcpSocket&      Timeout(int ms)                          { timeout = ms; return *this; }
+	int             GetTimeout() const                       { return timeout; }
+	TcpSocket&      Blocking()                               { return Timeout(Null); }
+
+	TcpSocket();
+	~TcpSocket()                                             { Close(); }
+};
+
+class SocketWaitEvent {
+	Vector< Tuple2<int, dword> > socket;
+	fd_set read[1], write[1], exception[1];
+
+public:
+	void  Clear()                                            { socket.Clear(); }
+	void  Add(SOCKET s, dword events = WAIT_ALL)             { socket.Add(MakeTuple((int)s, events)); }
+	void  Add(TcpSocket& s, dword events = WAIT_ALL)         { Add(s.GetSOCKET(), events); }
+	int   Wait(int timeout);
+	dword Get(int i) const;
+	dword operator[](int i) const                            { return Get(i); }
+	
+	SocketWaitEvent();
+};
+
+struct HttpHeader {
+	String                    first_line;
+	VectorMap<String, String> fields;
+	
+	String operator[](const char *id)                        { return fields.Get(id, Null); }
+
+	bool   Response(String& protocol, int& code, String& reason);
+	bool   Request(String& method, String& uri, String& version);
+
+	void   Clear();
+	bool   Parse(const String& hdrs);
+};
+
+class HttpRequest : public TcpSocket {
+	int          phase;
+	String       data;
+	int          count;
+
+	HttpHeader   header;
+
+	String       error;
+	String       body;
+
+	enum {
+		DEFAULT_HTTP_PORT        = 80,
+		DEFAULT_HTTPS_PORT       = 443
+	};
+
+	enum {
+		METHOD_GET,
+		METHOD_POST,
+		METHOD_HEAD,
+		METHOD_PUT,
+	};
+
+	int          max_header_size;
+	int          max_content_size;
+	int          max_redirects;
+	int          max_retries;
+	int          timeout;
+
+	String       host;
+	int          port;
+	String       proxy_host;
+	int          proxy_port;
+	String       proxy_username;
+	String       proxy_password;
+	String       path;
+	bool         ssl;
+
+	int          method;
+	String       accept;
+	String       agent;
+	bool         force_digest;
+	bool         is_post;
+	bool         std_headers;
+	bool         hasurlvar;
+	String       contenttype;
+	String       username;
+	String       password;
+	String       digest;
+	String       request_headers;
+	String       postdata;
+
+	String       protocol;
+	int          status_code;
+	String       reason_phrase;
+	
+	int          start_time;
+	int          retry_count;
+	int          redirect_count;
+	
+	int          chunk;
+
+	IpAddrInfo   addrinfo;
+	int          bodylen;
+	bool         gzip;	
+	Zlib         z;
+
+	void         Init();
+
+	void         StartPhase(int s);
+	void         Start();
+	void         Dns();
+	void         StartRequest();
+	bool         SendingData();
+	bool         ReadingHeader();
+	void         StartBody();
+	bool         ReadingBody();
+	void         ReadingChunkHeader();
+	void         Finish();
+
+	void         CopyCookies();
+
+	void         HttpError(const char *s);
+	void         ContentOut(const void *ptr, dword size);
+	void         Out(const void *ptr, dword size);
+
+	String       CalculateDigest(const String& authenticate) const;
+
+public:
+	Callback2<const void *, dword> WhenContent;
+
+	HttpRequest&  MaxHeaderSize(int m)                   { max_header_size = m; return *this; }
+	HttpRequest&  MaxContentSize(int m)                  { max_content_size = m; return *this; }
+	HttpRequest&  MaxRedirect(int n)                     { max_redirects = n; return *this; }
+	HttpRequest&  MaxRetries(int n)                      { max_retries = n; return *this; }
+	HttpRequest&  RequestTimeout(int ms)                 { timeout = ms; return *this; }
+	HttpRequest&  ChunkSize(int n)                       { chunk = n; return *this; }
+
+	HttpRequest&  Method(int m)                          { method = m; return *this; }
+	HttpRequest&  GET()                                  { return Method(METHOD_GET); }
+	HttpRequest&  POST()                                 { return Method(METHOD_POST); }
+	HttpRequest&  HEAD()                                 { return Method(METHOD_HEAD); }
+	HttpRequest&  PUT()                                  { return Method(METHOD_PUT); }
+
+	HttpRequest&  Host(const String& h)                  { host = h; return *this; }
+	HttpRequest&  Port(int p)                            { port = p; return *this; }
+	HttpRequest&  SSL(bool b = true)                     { ssl = b; return *this; }
+	HttpRequest&  Path(const String& p)                  { path = p; return *this; }
+	HttpRequest&  User(const String& u, const String& p) { username = u; password = p; return *this; }
+	HttpRequest&  Digest()                               { force_digest = true; return *this; }
+	HttpRequest&  Digest(const String& d)                { digest = d; return *this; }
+	HttpRequest&  Url(const char *url);
+	HttpRequest&  UrlVar(const char *id, const String& data);
+	HttpRequest&  operator()(const char *id, const String& data) { return UrlVar(id, data); }
+	HttpRequest&  PostData(const String& pd)              { postdata = pd; return *this; }
+	HttpRequest&  PostUData(const String& pd)             { return PostData(UrlEncode(pd)); }
+	HttpRequest&  Post(const String& data)                { POST(); return PostData(data); }
+	HttpRequest&  Post(const char *id, const String& data);
+
+	HttpRequest&  Headers(const String& h)                { request_headers = h; return *this; }
+	HttpRequest&  ClearHeaders()                          { return Headers(Null); }
+	HttpRequest&  AddHeaders(const String& h)             { request_headers.Cat(h); return *this; }
+	HttpRequest&  Header(const char *id, const String& data);
+	HttpRequest&  Cookie(const String& cookie)            { return Header("Cookie", cookie); }
+
+	HttpRequest&  StdHeaders(bool sh)                     { std_headers = sh; return *this; }
+	HttpRequest&  NoStdHeaders()                          { return StdHeaders(false); }
+	HttpRequest&  Accept(const String& a)                 { accept = a; return *this; }
+	HttpRequest&  UserAgent(const String& a)              { agent = a; return *this; }
+	HttpRequest&  ContentType(const String& a)            { contenttype = a; return *this; }
+
+	HttpRequest&  Proxy(const String& host, int port)     { proxy_host = host; proxy_port = port; return *this; }
+	HttpRequest&  Proxy(const char *url);
+	HttpRequest&  ProxyAuth(const String& u, const String& p) {  proxy_username = u; proxy_password = p; return *this; }
+
+	bool         IsSocketError() const                    { return TcpSocket::IsError(); }
+	bool         IsHttpError() const                      { return !IsNull(error) ; }
+	bool         IsError() const                          { return IsSocketError() || IsHttpError(); }
+	String       GetErrorDesc() const                     { return IsSocketError() ? TcpSocket::GetErrorDesc() : error; }
+	void         ClearError()                             { TcpSocket::ClearError(); error.Clear(); }
+
+	String       GetHeader(const char *s)                 { return header[s]; }
+	String       operator[](const char *s)                { return GetHeader(s); }
+	String       GetRedirectUrl();
+	int          GetContentLength();
+	int          GetStatusCode() const                    { return status_code; }
+	String       GetReasonPhrase() const                  { return reason_phrase; }
+
+	String       GetContent() const                       { return body; }
+	String       operator~() const                        { return GetContent(); }
+	operator     String() const                           { return GetContent(); }
+	void         ClearContent()                           { body.Clear(); }
+
+	enum Phase {
+		START, DNS, REQUEST, HEADER, BODY, CHUNK_HEADER, CHUNK_BODY, TRAILER, FINISHED, FAILED
+	};
+
+	bool    Do();
+	int     GetPhase() const                      { return phase; }
+	String  GetPhaseName() const;
+	bool    InProgress() const                    { return phase != FAILED && phase != FINISHED; }
+	bool    IsFailure() const                     { return phase == FAILED; }
+	bool    IsSuccess() const                     { return phase == FINISHED && status_code >= 200 && status_code < 300; }
+
+	String  Execute();
+	
+	HttpRequest();
+	HttpRequest(const char *url);
+	
+	static void  Trace(bool b = true);
+};