* wxSocket fixes: FTP, HTTP works really now. GTK fixes to prevent infinite loop.

* wxSocket stream fix: they can be encapsulated by now
* Doc update: wxURL::GetPath

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1818 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/url.tex b/docs/latex/wx/url.tex
index 5b9963ce1f08a2e9e459813c110a687c54425433..fd05953aade22e47e01b3559c6f2862188387ed3 100644 (file)
--- a/docs/latex/wx/url.tex
+++ b/docs/latex/wx/url.tex
@@ -62,6 +62,15 @@ Returns the name of the protocol which will be used to get the URL.
 
 Returns a reference to the protocol which will be used to get the URL.
 
 
 Returns a reference to the protocol which will be used to get the URL.
 

+%
+% GetPath
+%
+\membersection{wxURL::GetPath}
+
+\func{wxString}{GetPath}{\void}
+
+Returns the path of the file to fetch. This path was encoded in the URL.
+

 %
 % GetError
 %
 %
 % GetError
 %

diff --git a/include/wx/sckstrm.h b/include/wx/sckstrm.h
index 0f05c8c3f7b369d1cdbb9cc4e79480dfa9633d14..57484b17fcd4ff15bc0c98c23d69f69a75ae5847 100644 (file)
--- a/include/wx/sckstrm.h
+++ b/include/wx/sckstrm.h
@@ -32,6 +32,8 @@ class WXDLLEXPORT wxSocketOutputStream : public wxOutputStream
 
  protected:
   wxSocketBase *m_o_socket;
 
  protected:
   wxSocketBase *m_o_socket;

+
+  size_t OnSysWrite(const void *buffer, size_t bufsize);

 };
 
 class WXDLLEXPORT wxSocketInputStream : public wxInputStream
 };
 
 class WXDLLEXPORT wxSocketInputStream : public wxInputStream


@@ -48,6 +50,8 @@ class WXDLLEXPORT wxSocketInputStream : public wxInputStream
 
  protected:
   wxSocketBase *m_i_socket;
 
  protected:
   wxSocketBase *m_i_socket;

+
+  size_t OnSysRead(void *buffer, size_t bufsize);

 };
 
 class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,
 };
 
 class WXDLLEXPORT wxSocketStream : public wxSocketInputStream,

diff --git a/include/wx/socket.h b/include/wx/socket.h
index ebd5a5ecd68aceed4ca4919d360c59eab16d2bb7..174c763734f032924ace0f32eea76492e980c9f3 100644 (file)
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -81,7 +81,10 @@ class WXDLLEXPORT wxSocketBase : public wxEvtHandler
 {
   DECLARE_CLASS(wxSocketBase)
 #ifdef __WXMAC__
 {
   DECLARE_CLASS(wxSocketBase)
 #ifdef __WXMAC__

-friend void wxMacSocketOnRequestProc(void *refcon , short event) ;
+  friend void wxMacSocketOnRequestProc(void *refcon , short event) ;
+#endif
+#if defined(__WXGTK__) && defined(WXSOCK_INTERNAL)
+  friend void wxPrereadSocket(wxSocketBase *sock);

 #endif
 public:
 
 #endif
 public:
 

diff --git a/include/wx/url.h b/include/wx/url.h
index f37d4a9d9097a2a246b28a16ec80d75b2f217ded..aa224f7f3b56fc1bd62f1e7c65d5809349da05d0 100644 (file)
--- a/include/wx/url.h
+++ b/include/wx/url.h
@@ -62,6 +62,7 @@ public:
         { return m_protoinfo->m_protoname; }
   inline wxProtocol& GetProtocol() { return *m_protocol; }
   inline wxURLError GetError() const { return m_error; }
         { return m_protoinfo->m_protoname; }
   inline wxProtocol& GetProtocol() { return *m_protocol; }
   inline wxURLError GetError() const { return m_error; }

+  inline wxString GetPath() const { return m_path; }

 
   wxInputStream *GetInputStream();
 
 
   wxInputStream *GetInputStream();
 

diff --git a/samples/wxsocket/client.cpp b/samples/wxsocket/client.cpp
index e4a57fba5e27b05b23671bf2a59607b37e4ff6da..27051c68a83a12c6ad04aef5055e5c4ce10c474f 100644 (file)
--- a/samples/wxsocket/client.cpp
+++ b/samples/wxsocket/client.cpp
@@ -235,7 +235,7 @@ void MyFrame::OnExecTest1(wxCommandEvent& WXUNUSED(evt))
   wxYield();
   
   /* Init */
   wxYield();
   
   /* Init */

-  buf = copystring("Salut ! Salut ! Salut ! Salut Toto\n");
+  buf = copystring("Hi ! Hi ! Hi !\n");

   buf2 = new char[strlen(buf)+1];
   char c = 0xbe;
   sock->WriteMsg(&c, 1);
   buf2 = new char[strlen(buf)+1];
   char c = 0xbe;
   sock->WriteMsg(&c, 1);

diff --git a/src/common/ftp.cpp b/src/common/ftp.cpp
index d0b2a80211366cb6a46014c6f99d8231fa83a051..3f15d7620f7c5244face2f5b038ee0a56224d0dc 100644 (file)
--- a/src/common/ftp.cpp
+++ b/src/common/ftp.cpp
@@ -253,7 +253,7 @@ public:
 
   wxInputFTPStream(wxFTP *ftp_clt, wxSocketBase *sock)
     : wxSocketInputStream(*sock), m_ftp(ftp_clt) {}
 
   wxInputFTPStream(wxFTP *ftp_clt, wxSocketBase *sock)
     : wxSocketInputStream(*sock), m_ftp(ftp_clt) {}

-  size_t StreamSize() { return m_ftpsize; }
+  size_t StreamSize() const { return m_ftpsize; }

   virtual ~wxInputFTPStream(void)
   { 
      if (LastError() != wxStream_NOERROR)
   virtual ~wxInputFTPStream(void)
   { 
      if (LastError() != wxStream_NOERROR)


@@ -351,7 +351,7 @@ wxInputStream *wxFTP::GetInputStream(const wxString& path)
 
   pos_size = m_lastResult.Index('(');
   if (pos_size != wxNOT_FOUND) {
 
   pos_size = m_lastResult.Index('(');
   if (pos_size != wxNOT_FOUND) {

-    wxString str_size = m_lastResult(pos_size, m_lastResult.Index(')'));
+    wxString str_size = m_lastResult(pos_size+1, m_lastResult.Index(')')-1);

 
     in_stream->m_ftpsize = atoi(WXSTRINGCAST str_size);
   }
 
     in_stream->m_ftpsize = atoi(WXSTRINGCAST str_size);
   }


@@ -401,5 +401,9 @@ wxList *wxFTP::GetList(const wxString& wildcard)
     return NULL;
   }
 
     return NULL;
   }
 

+  sock->SetEventHandler(*GetNextHandler(), m_id);
+  sock->Notify(m_notifyme);
+  sock->SetNotify(m_neededreq);
+

   return file_list;
 }
   return file_list;
 }

diff --git a/src/common/sckstrm.cpp b/src/common/sckstrm.cpp
index 85562ae51c8685232be9d4e38fd91210c3681bc1..8dde4ba92e14fae4afd1506ccd19be7e022e0bb4 100644 (file)
--- a/src/common/sckstrm.cpp
+++ b/src/common/sckstrm.cpp
@@ -45,6 +45,11 @@ wxOutputStream& wxSocketOutputStream::Write(const void *buffer, size_t size)
   return *this;
 }
 
   return *this;
 }
 

+size_t wxSocketOutputStream::OnSysWrite(const void *buffer, size_t size)
+{
+  return m_o_socket->Write((const char *)buffer, size).LastCount();
+}
+

 // ---------------------------------------------------------------------------
 // wxSocketInputStream
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxSocketInputStream
 // ---------------------------------------------------------------------------


@@ -64,6 +69,11 @@ wxInputStream& wxSocketInputStream::Read(void *buffer, size_t size)
   return *this;
 }
 
   return *this;
 }
 

+size_t wxSocketInputStream::OnSysRead(void *buffer, size_t size)
+{
+  return m_i_socket->Read((char *)buffer, size).LastCount();
+}
+

 // ---------------------------------------------------------------------------
 // wxSocketStream
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxSocketStream
 // ---------------------------------------------------------------------------

diff --git a/src/common/socket.cpp b/src/common/socket.cpp
index e9a222b142ad3735b4a7388d97a494f1b4e09cda..2968f4fcd38ee4f3d0b49e37f13ade6f01709610 100644 (file)
--- a/src/common/socket.cpp
+++ b/src/common/socket.cpp
@@ -363,8 +363,10 @@ wxSocketBase& wxSocketBase::Read(char* buffer, size_t nbytes)
 
   // If we have got the whole needed buffer or if we don't want to
   // wait then it returns immediately.
 
   // If we have got the whole needed buffer or if we don't want to
   // wait then it returns immediately.

-  if (!nbytes || (m_lcount && !(m_flags & WAITALL)) )
+  if (!nbytes || (count && !(m_flags & WAITALL)) ) {
+    m_lcount = count;

     return *this;
     return *this;

+  }

 
   m_lcount = 0;
   WantBuffer(buffer, nbytes, EVT_READ);
 
   m_lcount = 0;
   WantBuffer(buffer, nbytes, EVT_READ);


@@ -681,6 +683,20 @@ bool wxSocketBase::WaitForLost(long seconds, long microseconds)
 // --------- wxSocketBase callback management -------------------
 // --------------------------------------------------------------
 
 // --------- wxSocketBase callback management -------------------
 // --------------------------------------------------------------
 

+#ifdef __WXGTK__
+void wxPrereadSocket(wxSocketBase *sock)
+{
+  char tmp_buf[1024];
+  int got = 0;
+
+  do {
+    got = recv(sock->m_fd, tmp_buf, 1024, 0);
+    if (got > 0)
+      sock->CreatePushbackAfter(tmp_buf, got);
+  } while (got > 0);
+}
+#endif
+

 #if defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__)
 #if defined(__WXMOTIF__) || defined(__WXXT__)
 static void wx_socket_read(XtPointer client, int *fid,
 #if defined(__WXMOTIF__) || defined(__WXXT__) || defined(__WXGTK__)
 #if defined(__WXMOTIF__) || defined(__WXXT__)
 static void wx_socket_read(XtPointer client, int *fid,


@@ -708,6 +724,15 @@ static void wx_socket_read(gpointer client, gint fd,
   {
     if (!(sock->NeededReq() & wxSocketBase::REQ_READ))
     {
   {
     if (!(sock->NeededReq() & wxSocketBase::REQ_READ))
     {

+#ifdef __WXGTK__
+      // We can't exit from the GDK main loop because it doesn't accept
+      // destroying input event while we are in a event dispatch.
+      // So we will preread socket and we put the data in the pushback.
+      wxPrereadSocket(sock);
+      // Then we set the socket as BLOCKING
+      int flag = 0;
+      ioctl(fd, FIONBIO, &flag);
+#endif

       return;
     }
 
       return;
     }
 


@@ -1119,7 +1144,10 @@ void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
 {
   char *curr_pos;
 
 {
   char *curr_pos;
 

-  m_unread = (char *) realloc(m_unread, m_unrd_size+size);
+  if (m_unread != NULL)
+    m_unread = (char *) realloc(m_unread, m_unrd_size+size);
+  else
+    m_unread = (char *) malloc(size);

   curr_pos = m_unread + m_unrd_size;
 
   memcpy(curr_pos, buffer, size);
   curr_pos = m_unread + m_unrd_size;
 
   memcpy(curr_pos, buffer, size);

diff --git a/src/common/url.cpp b/src/common/url.cpp
index 6df0b8ff580ab6bd6968a4389dd4cf1c92264a04..8c7ddb27d2dd2775ee970f2c46221db264c75f24 100644 (file)
--- a/src/common/url.cpp
+++ b/src/common/url.cpp
@@ -160,10 +160,9 @@ bool wxURL::PrepHost(wxString& url)
   // Retrieve service number
   pos2 = temp_url.Find(':', TRUE);
   if (pos2 != -1 && pos2 < pos) {
   // Retrieve service number
   pos2 = temp_url.Find(':', TRUE);
   if (pos2 != -1 && pos2 < pos) {

-    m_servname = url(pos2, pos);
+    m_servname = temp_url(pos2+1, pos);

     if (!m_servname.IsNumber())
       return FALSE;
     if (!m_servname.IsNumber())
       return FALSE;

-    pos2 = pos;

     temp_url = temp_url(0, pos2);
   }
 
     temp_url = temp_url(0, pos2);
   }