added more files (unchanged) from wxUniv branch

[wxWidgets.git] / include / wx / protocol / http.h

diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index 97282b566540c2989e9eb127936b4c87400858fb..5aeea291bea7dd176eadb3cc3cac1418257483ec 100644 (file)
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -20,14 +20,14 @@ class WXDLLEXPORT wxHTTP : public wxProtocol {
 protected:
   wxProtocolError m_perr;
   wxList m_headers;
 protected:
   wxProtocolError m_perr;
   wxList m_headers;

-  bool m_read;
+  bool m_read, m_proxy_mode;

   wxSockAddress *m_addr;
 public:
   wxHTTP();
   ~wxHTTP();
 
   bool Connect(const wxString& host);
   wxSockAddress *m_addr;
 public:
   wxHTTP();
   ~wxHTTP();
 
   bool Connect(const wxString& host);

-  bool Connect(wxSockAddress& addr);
+  bool Connect(wxSockAddress& addr, bool wait);

   bool Abort();
   wxInputStream *GetInputStream(const wxString& path);
   inline wxProtocolError GetError() { return m_perr; }
   bool Abort();
   wxInputStream *GetInputStream(const wxString& path);
   inline wxProtocolError GetError() { return m_perr; }


@@ -36,9 +36,12 @@ public:
   void SetHeader(const wxString& header, const wxString& h_data);
   wxString GetHeader(const wxString& header);
 
   void SetHeader(const wxString& header, const wxString& h_data);
   wxString GetHeader(const wxString& header);
 

+  void SetProxyMode(bool on);
+

 protected:
   typedef enum {
 protected:
   typedef enum {

-    wxHTTP_GET
+    wxHTTP_GET,
+    wxHTTP_HEAD

   } wxHTTP_Req;
   bool BuildRequest(const wxString& path, wxHTTP_Req req);
   void SendHeaders();
   } wxHTTP_Req;
   bool BuildRequest(const wxString& path, wxHTTP_Req req);
   void SendHeaders();