[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_1-76-gec4ba56

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  ec4ba561117523370b425485cddead9a48799c0c (commit)
       via  6d84876ba2f6a545f0722771b3d6d9a13a07ab62 (commit)
      from  722818f7a168c8624e1c87fdc30eaaa857ae89f3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit ec4ba561117523370b425485cddead9a48799c0c
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Feb 14 21:05:10 2010 +0100

    Bump version number.

diff --git a/myserver/version b/myserver/version
index f514a2f..f76f913 100644
--- a/myserver/version
+++ b/myserver/version
@@ -1 +1 @@
-0.9.1
\ No newline at end of file
+0.9.2
\ No newline at end of file



commit 6d84876ba2f6a545f0722771b3d6d9a13a07ab62
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Feb 14 21:04:32 2010 +0100

    Rename `dataOnRead' to `dataAvailable'

diff --git a/myserver/include/base/socket/socket.h 
b/myserver/include/base/socket/socket.h
index b571a40..c65752a 100644
--- a/myserver/include/base/socket/socket.h
+++ b/myserver/include/base/socket/socket.h
@@ -98,7 +98,7 @@ public:
   int getsockname (MYSERVER_SOCKADDR*,int*);
   int setNonBlocking (int);
   bool getNonBlocking () {return isNonBlocking;}
-  virtual int dataOnRead (int sec = 0, int usec = 500);
+  virtual int dataAvailable (int sec = 0, int usec = 500);
 
   u_long getThrottling ();
   void setThrottling (u_long);
diff --git a/myserver/include/base/socket/ssl_socket.h 
b/myserver/include/base/socket/ssl_socket.h
index 72bf6b7..cb8a415 100644
--- a/myserver/include/base/socket/ssl_socket.h
+++ b/myserver/include/base/socket/ssl_socket.h
@@ -54,9 +54,9 @@ public:
   virtual u_long bytesToRead ();
 
 # ifdef __HURD__
-  virtual int dataOnRead (int sec = 1, int usec = 500);
+  virtual int dataAvailable (int sec = 1, int usec = 500);
 # else
-  virtual int dataOnRead (int sec = 0, int usec = 500);
+  virtual int dataAvailable (int sec = 0, int usec = 500);
 # endif
 
   SslSocket ();
diff --git a/myserver/src/base/socket/socket.cpp 
b/myserver/src/base/socket/socket.cpp
index a64207c..70dadc6 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -531,7 +531,7 @@ int Socket::connect (MYSERVER_SOCKADDR* sa, int na)
  */
 int Socket::recv (char* buffer, int len, int flags, u_long timeout)
 {
-  int ret = dataOnRead (timeout / 1000, timeout % 1000);
+  int ret = dataAvailable (timeout / 1000, timeout % 1000);
 
   if (ret < 0)
     return ret;
@@ -650,7 +650,7 @@ Socket* Socket::getServerSocket ()
  *Check if there is data ready to be read.
  *Returns 1 if there is data to read, 0 if not.
  */
-int Socket::dataOnRead (int sec, int usec)
+int Socket::dataAvailable (int sec, int usec)
 {
   struct timeval tv;
   fd_set readfds;
diff --git a/myserver/src/base/socket/ssl_socket.cpp 
b/myserver/src/base/socket/ssl_socket.cpp
index 3c4aba0..4c9231a 100644
--- a/myserver/src/base/socket/ssl_socket.cpp
+++ b/myserver/src/base/socket/ssl_socket.cpp
@@ -306,11 +306,11 @@ u_long SslSocket::bytesToRead ()
 /*!
  *Check if there is data ready to be read.
  */
-int SslSocket::dataOnRead (int sec, int usec)
+int SslSocket::dataAvailable (int sec, int usec)
 {
   if (bytesToRead ())
     return 1;
 
-  return Socket::dataOnRead (sec, usec);
+  return Socket::dataAvailable (sec, usec);
 }
 
diff --git a/myserver/src/protocol/ftp/ftp.cpp 
b/myserver/src/protocol/ftp/ftp.cpp
index 4fb2589..bc31a78 100644
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -537,7 +537,7 @@ void Ftp::pasv ()
   MYSERVER_SOCKADDRIN asockIn;
   socklen_t asockInLen = 0;
   Socket *asock;
-  if (pFtpuserData->m_pDataConnection->socket->dataOnRead (timeoutvalue, 0)
+  if (pFtpuserData->m_pDataConnection->socket->dataAvailable (timeoutvalue, 0)
       == 1)
     {
       asockInLen = sizeof (sockaddr_in);
diff --git a/myserver/tests/memory_socket.h b/myserver/tests/memory_socket.h
index 54bd531..32a818f 100644
--- a/myserver/tests/memory_socket.h
+++ b/myserver/tests/memory_socket.h
@@ -36,7 +36,7 @@ public:
   virtual int recv (char*, int, int) {return 0;}
   virtual u_long bytesToRead () {return 0;}
 
-  virtual int dataOnRead (int sec = 0, int usec = 500){return 0;}
+  virtual int dataAvailable (int sec = 0, int usec = 500){return 0;}
 
   int read (char* buffer, u_long len, u_long *nbr)
   {
diff --git a/myserver/tests/test_socket.cpp b/myserver/tests/test_socket.cpp
index c71ad70..34b15c7 100644
--- a/myserver/tests/test_socket.cpp
+++ b/myserver/tests/test_socket.cpp
@@ -121,7 +121,7 @@ public:
 
     CPPUNIT_ASSERT_EQUAL (Thread::create (&tid, testRecvClient, &arg), 0);
 
-    CPPUNIT_ASSERT (obj->dataOnRead (5));
+    CPPUNIT_ASSERT (obj->dataAvailable (5));
 
     Socket s = obj->accept (&sockIn, &sockInLen);
 

-----------------------------------------------------------------------

Summary of changes:
 myserver/include/base/socket/socket.h     |    2 +-
 myserver/include/base/socket/ssl_socket.h |    4 ++--
 myserver/src/base/socket/socket.cpp       |    4 ++--
 myserver/src/base/socket/ssl_socket.cpp   |    4 ++--
 myserver/src/protocol/ftp/ftp.cpp         |    2 +-
 myserver/tests/memory_socket.h            |    2 +-
 myserver/tests/test_socket.cpp            |    2 +-
 myserver/version                          |    2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GNU MyServer