Fix a number of mingw compile errors.

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

diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index 5aeea291bea7dd176eadb3cc3cac1418257483ec..8d3308b7f7de61a2ba10360d10dd3027605fd470 100644 (file)
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -1,51 +1,94 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        http.h
+// Name:        wx/protocol/http.h

 // Purpose:     HTTP protocol
 // Author:      Guilhem Lavaux
 // 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

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_HTTP_H
 #define _WX_HTTP_H
 
 /////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_HTTP_H
 #define _WX_HTTP_H
 

-#include "wx/list.h"
+#include "wx/defs.h"
+
+#if wxUSE_PROTOCOL_HTTP
+
+#include "wx/hashmap.h"

 #include "wx/protocol/protocol.h"
 
 #include "wx/protocol/protocol.h"
 

-class WXDLLEXPORT wxHTTP : public wxProtocol {
-  DECLARE_DYNAMIC_CLASS(wxHTTP)
-  DECLARE_PROTOCOL(wxHTTP)
-protected:
-  wxProtocolError m_perr;
-  wxList m_headers;
-  bool m_read, m_proxy_mode;
-  wxSockAddress *m_addr;
+class WXDLLIMPEXP_NET wxHTTP : public wxProtocol
+{

 public:
 public:

-  wxHTTP();
-  ~wxHTTP();
+    wxHTTP();
+    virtual ~wxHTTP();
+
+    virtual bool Connect(const wxString& host, unsigned short port);
+    virtual bool Connect(const wxString& host) { return Connect(host, 0); }
+    virtual bool Connect(const wxSockAddress& addr, bool wait);
+    bool Abort();

 
 

-  bool Connect(const wxString& host);
-  bool Connect(wxSockAddress& addr, bool wait);
-  bool Abort();
-  wxInputStream *GetInputStream(const wxString& path);
-  inline wxProtocolError GetError() { return m_perr; }
-  wxString GetContentType();
+    wxInputStream *GetInputStream(const wxString& path);

 
 

-  void SetHeader(const wxString& header, const wxString& h_data);
-  wxString GetHeader(const wxString& header);
+    wxString GetContentType() const;
+    wxString GetHeader(const wxString& header) const;
+    int GetResponse() const { return m_http_response; }

 
 

-  void SetProxyMode(bool on);
+    void SetHeader(const wxString& header, const wxString& h_data);
+    void SetPostBuffer(const wxString& post_buf);
+    void SetProxyMode(bool on);
+
+    /* Cookies */
+    wxString GetCookie(const wxString& cookie) const;
+    bool HasCookies() const { return m_cookies.size() > 0; }

 
 protected:
 
 protected:

-  typedef enum {
-    wxHTTP_GET,
-    wxHTTP_HEAD
-  } wxHTTP_Req;
-  bool BuildRequest(const wxString& path, wxHTTP_Req req);
-  void SendHeaders();
-  bool ParseHeaders();
+    enum wxHTTP_Req
+    {
+        wxHTTP_GET,
+        wxHTTP_POST,
+        wxHTTP_HEAD
+    };
+
+    typedef wxStringToStringHashMap::iterator wxHeaderIterator;
+    typedef wxStringToStringHashMap::const_iterator wxHeaderConstIterator;
+    typedef wxStringToStringHashMap::iterator wxCookieIterator;
+    typedef wxStringToStringHashMap::const_iterator wxCookieConstIterator;
+
+    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
+    wxHeaderIterator FindHeader(const wxString& header);
+    wxHeaderConstIterator FindHeader(const wxString& header) const;
+    wxCookieIterator FindCookie(const wxString& cookie);
+    wxCookieConstIterator FindCookie(const wxString& cookie) const;
+
+    // deletes the header value strings
+    void ClearHeaders();
+    void ClearCookies();
+
+    // internal variables:
+
+    wxStringToStringHashMap m_cookies;
+
+    wxStringToStringHashMap m_headers;
+    bool m_read,
+         m_proxy_mode;
+    wxSockAddress *m_addr;
+    wxString m_post_buf;
+    int m_http_response;
+
+    DECLARE_DYNAMIC_CLASS(wxHTTP)
+    DECLARE_PROTOCOL(wxHTTP)
+    wxDECLARE_NO_COPY_CLASS(wxHTTP);

 };
 
 };
 

-#endif
+#endif // wxUSE_PROTOCOL_HTTP
+
+#endif // _WX_HTTP_H
+