summaryrefslogtreecommitdiff
path: root/tests/test_tools/simpletest/socket.php
diff options
context:
space:
mode:
authorwei <>2006-07-07 23:18:19 +0000
committerwei <>2006-07-07 23:18:19 +0000
commitb2e97539e7af7712b04dd5c2610a454d09aa0333 (patch)
treed09ae76ddc7f349a39b74b0cb1f40c8b678a352e /tests/test_tools/simpletest/socket.php
parentfce10eed76455b7e0419f13affb4f29e73ef0375 (diff)
Update simpletest
Diffstat (limited to 'tests/test_tools/simpletest/socket.php')
-rw-r--r--tests/test_tools/simpletest/socket.php28
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/test_tools/simpletest/socket.php b/tests/test_tools/simpletest/socket.php
index 4c3c592d..b627a169 100644
--- a/tests/test_tools/simpletest/socket.php
+++ b/tests/test_tools/simpletest/socket.php
@@ -3,13 +3,13 @@
* base include file for SimpleTest
* @package SimpleTest
* @subpackage MockObjects
- * @version $Id: socket.php,v 1.23 2004/09/30 16:46:31 lastcraft Exp $
+ * @version $Id: socket.php,v 1.26 2005/08/29 00:57:48 lastcraft Exp $
*/
/**#@+
* include SimpleTest files
*/
- require_once(dirname(__FILE__) . '/options.php');
+ require_once(dirname(__FILE__) . '/compatibility.php');
/**#@-*/
/**
@@ -73,25 +73,26 @@
*/
class SimpleSocket extends SimpleStickyError {
protected $_handle;
- protected $_is_open;
- protected $_sent;
+ protected $_is_open = false;
+ protected $_sent = '';
+ public $lock_size;
/**
* Opens a socket for reading and writing.
- * @param string $host Hostname to send request to.
- * @param integer $port Port on remote machine to open.
- * @param integer $timeout Connection timeout in seconds.
+ * @param string $host Hostname to send request to.
+ * @param integer $port Port on remote machine to open.
+ * @param integer $timeout Connection timeout in seconds.
+ * @param integer $block_size Size of chunk to read.
* @access public
*/
- function SimpleSocket($host, $port, $timeout) {
+ function SimpleSocket($host, $port, $timeout, $block_size = 255) {
$this->SimpleStickyError();
- $this->_is_open = false;
- $this->_sent = '';
if (! ($this->_handle = $this->_openSocket($host, $port, $error_number, $error, $timeout))) {
$this->_setError("Cannot open [$host:$port] with [$error] within [$timeout] seconds");
return;
}
$this->_is_open = true;
+ $this->_block_size = $block_size;
SimpleTestCompatibility::setTimeout($this->_handle, $timeout);
}
@@ -122,16 +123,15 @@
* Reads data from the socket. The error suppresion
* is a workaround for PHP4 always throwing a warning
* with a secure socket.
- * @param integer $block_size Size of chunk to read.
- * @return integer Incoming bytes. False
+ * @return integer/boolean Incoming bytes. False
* on error.
* @access public
*/
- function read($block_size = 255) {
+ function read() {
if ($this->isError() || ! $this->isOpen()) {
return false;
}
- $raw = @fread($this->_handle, $block_size);
+ $raw = @fread($this->_handle, $this->_block_size);
if ($raw === false) {
$this->_setError('Cannot read from socket');
$this->close();