Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Guilhem Lavaux
1999-02-27 21:01:05 +00:00
parent 839b865d08
commit 375abe3dac
9 changed files with 66 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/common/socket.cpp
View File

@@ -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 (!nbytes || (m_lcount && !(m_flags & WAITALL)) )
if (!nbytes || (count && !(m_flags & WAITALL)) ) {
m_lcount = count;
return *this;
}
m_lcount = 0;
WantBuffer(buffer, nbytes, EVT_READ);
@@ -681,6 +683,20 @@ bool wxSocketBase::WaitForLost(long seconds, long microseconds)
// --------- 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,
@@ -708,6 +724,15 @@ static void wx_socket_read(gpointer client, gint fd,
{
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;
}
@@ -1119,7 +1144,10 @@ void wxSocketBase::CreatePushbackAfter(const char *buffer, size_t size)
{
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);