Update to Scintilla 1.53

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

diff --git a/include/wx/protocol/http.h b/include/wx/protocol/http.h
index 83cba116b42d4a5b3d383e9b389cd89bfe8335e2..05ab817ac5f02c9e6109fd5ca33f10d336d98cd2 100644 (file)
--- a/include/wx/protocol/http.h
+++ b/include/wx/protocol/http.h
@@ -15,22 +15,18 @@
 
 #if wxUSE_PROTOCOL_HTTP
 
 
 #if wxUSE_PROTOCOL_HTTP
 

-#include "wx/list.h"
+#include "wx/hashmap.h"

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

-class WXDLLEXPORT_BASE 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;
+WX_DECLARE_EXPORTED_STRING_HASH_MAP( wxString, wxStringToStringHashMap );
+
+class WXDLLIMPEXP_BASE wxHTTP : public wxProtocol
+{

 public:
   wxHTTP();
   ~wxHTTP();
 
 public:
   wxHTTP();
   ~wxHTTP();
 

-  bool Connect(const wxString& host);
+  bool Connect(const wxString& host, unsigned short port = 0);

   bool Connect(wxSockAddress& addr, bool wait);
   bool Abort();
   wxInputStream *GetInputStream(const wxString& path);
   bool Connect(wxSockAddress& addr, bool wait);
   bool Abort();
   wxInputStream *GetInputStream(const wxString& path);


@@ -38,23 +34,41 @@ public:
   wxString GetContentType();
 
   void SetHeader(const wxString& header, const wxString& h_data);
   wxString GetContentType();
 
   void SetHeader(const wxString& header, const wxString& h_data);

-  wxString GetHeader(const wxString& header);
+  wxString GetHeader(const wxString& header) const;
+  void SetPostBuffer(const wxString& post_buf);

 
   void SetProxyMode(bool on);
 
 protected:
 
   void SetProxyMode(bool on);
 
 protected:

-  typedef enum {
+  enum wxHTTP_Req
+  {

     wxHTTP_GET,
     wxHTTP_GET,

+    wxHTTP_POST,

     wxHTTP_HEAD
     wxHTTP_HEAD

-  } wxHTTP_Req;
+  };
+
+  typedef wxStringToStringHashMap::iterator wxHeaderIterator;
+

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

+  // find the header in m_headers
+  wxHeaderIterator FindHeader(const wxString& header) const;
+

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

-    DECLARE_NO_COPY_CLASS(wxHTTP)
+  wxProtocolError m_perr;
+  wxStringToStringHashMap m_headers;
+  bool m_read,
+       m_proxy_mode;
+  wxSockAddress *m_addr;
+  wxString m_post_buf;
+
+  DECLARE_DYNAMIC_CLASS(wxHTTP)
+  DECLARE_PROTOCOL(wxHTTP)
+  DECLARE_NO_COPY_CLASS(wxHTTP)

 };
 
 #endif // wxUSE_PROTOCOL_HTTP
 };
 
 #endif // wxUSE_PROTOCOL_HTTP