Ryan's cumulative wxActiveX and media control patch (1427775)

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

diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index b3ee9a5384b41137146792d9cea2e720a40d8554..2f6437e24ae72b02aca2cc5ea6bfc3f3232cb2a8 100644 (file)
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -2,7 +2,7 @@
 // Name:        http.h
 // Purpose:     HTTP protocol
 // Author:      Guilhem Lavaux
 // Name:        http.h
 // Purpose:     HTTP protocol
 // Author:      Guilhem Lavaux

-// Modified by:
+// Modified by: Simo Virokannas (authentication, Dec 2005)

 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux
 // Created:     August 1997
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997, 1998 Guilhem Lavaux


@@ -27,8 +27,9 @@ public:
   wxHTTP();
   ~wxHTTP();
 
   wxHTTP();
   ~wxHTTP();
 

-  bool Connect(const wxString& host, unsigned short port = 0);
-  bool Connect(wxSockAddress& addr, bool wait);
+  virtual bool Connect(const wxString& host, unsigned short port);
+  virtual bool Connect(const wxString& host) { return Connect(host, 0); }
+  virtual 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; }


@@ -40,6 +41,11 @@ public:
 
   void SetProxyMode(bool on);
 
 
   void SetProxyMode(bool on);
 

+  int GetResponse() { return m_http_response; }
+
+  virtual void SetUser(const wxString& user) { m_username = user; }
+  virtual void SetPassword(const wxString& passwd ) { m_password = passwd; }
+

 protected:
   enum wxHTTP_Req
   {
 protected:
   enum wxHTTP_Req
   {


@@ -49,13 +55,17 @@ protected:
   };
 
   typedef wxStringToStringHashMap::iterator wxHeaderIterator;
   };
 
   typedef wxStringToStringHashMap::iterator wxHeaderIterator;

+  typedef wxStringToStringHashMap::const_iterator wxHeaderConstIterator;

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

+  wxString GenerateAuthString(const wxString& user, const wxString& pass) const;
+

   // find the header in m_headers
   // find the header in m_headers

-  wxHeaderIterator FindHeader(const wxString& header) const;
+  wxHeaderIterator FindHeader(const wxString& header);
+  wxHeaderConstIterator FindHeader(const wxString& header) const;

 
   // deletes the header value strings
   void ClearHeaders();
 
   // deletes the header value strings
   void ClearHeaders();


@@ -66,6 +76,9 @@ protected:
        m_proxy_mode;
   wxSockAddress *m_addr;
   wxString m_post_buf;
        m_proxy_mode;
   wxSockAddress *m_addr;
   wxString m_post_buf;

+  int m_http_response;
+  wxString m_username;
+  wxString m_password;

 
   DECLARE_DYNAMIC_CLASS(wxHTTP)
   DECLARE_PROTOCOL(wxHTTP)
 
   DECLARE_DYNAMIC_CLASS(wxHTTP)
   DECLARE_PROTOCOL(wxHTTP)