[PHP-CVS] cvs: php-src /ext/sqlite3 sqlite3.c
scottmacSat Jan 24 12:16:59 2009 UTC
Modified files:
/php-src/ext/sqlite3sqlite3.c
Log:
Add blobOpen method for reading SQlite3 blobs via streams.
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.31r2=1.32diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.31 php-src/ext/sqlite3/sqlite3.c:1.32
--- php-src/ext/sqlite3/sqlite3.c:1.31 Tue Jan 20 09:57:25 2009
+++ php-src/ext/sqlite3/sqlite3.c Sat Jan 24 12:16:57 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.31 2009/01/20 09:57:25 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.32 2009/01/24 12:16:57 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -794,7 +794,7 @@
}
/* }}} */
-/* {{{ proto bool SQLite3::createFunction(string name, mixed callback [, int
argcount]))
+/* {{{ proto bool SQLite3::createFunction(string name, mixed callback [, int
argcount])
Allows registration of a PHP function as a SQLite UDF that can be called
within SQL statements. */
PHP_METHOD(sqlite3, createFunction)
{
@@ -847,7 +847,7 @@
}
/* }}} */
-/* {{{ proto bool SQLite3::createAggregate(string name, mixed step, mixed
final [, int argcount]))
+/* {{{ proto bool SQLite3::createAggregate(string name, mixed step, mixed
final [, int argcount])
Allows registration of a PHP function for use as an aggregate. */
PHP_METHOD(sqlite3, createAggregate)
{
@@ -912,6 +912,184 @@
}
/* }}} */
+typedef struct {
+ sqlite3_blob *blob;
+ size_t position;
+ size_t size;
+} php_stream_sqlite3_data;
+
+static size_t php_sqlite3_stream_write(php_stream *stream, const char *buf,
size_t count TSRMLS_DC)
+{
+ php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *)
stream-abstract;
+
+ return 0;
+}
+
+static size_t php_sqlite3_stream_read(php_stream *stream, char *buf, size_t
count TSRMLS_DC)
+{
+ php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *)
stream-abstract;
+
+ if (sqlite3_stream-position + count = sqlite3_stream-size) {
+ count = sqlite3_stream-size - sqlite3_stream-position;
+ stream-eof = 1;
+ }
+ if (count) {
+ if (sqlite3_blob_read(sqlite3_stream-blob, buf, count,
sqlite3_stream-position) != SQLITE_OK) {
+ return 0;
+ }
+ sqlite3_stream-position += count;
+ }
+ return count;
+}
+
+static int php_sqlite3_stream_close(php_stream *stream, int close_handle
TSRMLS_DC)
+{
+ php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *)
stream-abstract;
+
+ if (sqlite3_blob_close(sqlite3_stream-blob) != SQLITE_OK) {
+ /* Error occured, but it still closed */
+ }
+
+ efree(sqlite3_stream);
+
+ return 0;
+}
+
+static int php_sqlite3_stream_flush(php_stream *stream TSRMLS_DC)
+{
+ /* do nothing */
+ return 0;
+}
+
+/* {{{ */
+static int php_sqlite3_stream_seek(php_stream *stream, off_t offset, int
whence, off_t *newoffs TSRMLS_DC)
+{
+ php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *)
stream-abstract;
+
+ switch(whence) {
+ case SEEK_CUR:
+ if (offset 0) {
+ if (sqlite3_stream-position
(size_t)(-offset)) {
+ sqlite3_stream-position = 0;
+ *newoffs = -1;
+ return -1;
+ } else {
+ sqlite3_stream-position =
sqlite3_stream-position + offset;
+ *newoffs = sqlite3_stream-position;
+ stream-eof = 0;
+ return 0;
+ }
+ } else {
+ if (sqlite3_stream-position + (size_t)(offset)
sqlite3_stream-size) {
+ sqlite3_stream-position =
sqlite3_stream-size;
+ *newoffs = -1;
+ return -1;
+ } else {
+ sqlite3_stream-position =
sqlite3_stream-position + offset;
+ *newoffs = sqlite3_stream-position;
+ stream-eof = 0;
+ return 0;
+ }
+ }
+ case SEEK_SET:
+ if (sqlite3_stream-size (size_t)(offset)) {
+ sqlite3_stream-position = sqlite3_stream-size;
+ *newoffs = -1;
+
[PHP-CVS] cvs: php-src /ext/sqlite3/tests sqlite3_30_blobopen.phpt
scottmacSat Jan 24 12:17:31 2009 UTC
Added files:
/php-src/ext/sqlite3/tests sqlite3_30_blobopen.phpt
Log:
Forgot test for the last commit
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/tests/sqlite3_30_blobopen.phpt?view=markuprev=1.1
Index: php-src/ext/sqlite3/tests/sqlite3_30_blobopen.phpt
+++ php-src/ext/sqlite3/tests/sqlite3_30_blobopen.phpt
--TEST--
SQLite3::blobOpen stream test
--SKIPIF--
?php require_once(dirname(__FILE__) . '/skipif.inc'); ?
--FILE--
?php
require_once(dirname(__FILE__) . '/new_db.inc');
require_once(dirname(__FILE__) . '/stream_test.inc');
define('TIMENOW', time());
echo Creating Table\n;
var_dump($db-exec('CREATE TABLE test (id STRING, data BLOB)'));
echo PREPARING insert\n;
$insert_stmt = $db-prepare(INSERT INTO test (id, data) VALUES (?, ?));
echo BINDING Parameter\n;
var_dump($insert_stmt-bindValue(1, 'a', SQLITE3_TEXT));
var_dump($insert_stmt-bindValue(2, 'TEST TEST', SQLITE3_BLOB));
$insert_stmt-execute();
echo Closing statement\n;
var_dump($insert_stmt-close());
$stream = $db-openBlob('test', 'data', 1);
var_dump($stream);
echo Stream Contents\n;
var_dump(stream_get_contents($stream));
echo Closing Stream\n;
var_dump(fclose($stream));
echo Closing database\n;
var_dump($db-close());
echo Done\n;
?
--EXPECTF--
Creating Table
bool(true)
PREPARING insert
BINDING Parameter
bool(true)
bool(true)
Closing statement
bool(true)
resource(%d) of type (stream)
Stream Contents
string(9) TEST TEST
Closing Stream
bool(true)
Closing database
bool(true)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 sqlite3.c /ext/sqlite3/tests sqlite3_30_blobopen.phpt
scottmacSat Jan 24 12:17:48 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/sqlite3/tests sqlite3_30_blobopen.phpt
Modified files:
/php-src/ext/sqlite3sqlite3.c
Log:
MFH Add blobOpen method for reading binary blobs via streams.
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.28r2=1.1.2.29diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.28
php-src/ext/sqlite3/sqlite3.c:1.1.2.29
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.28 Tue Jan 20 09:57:34 2009
+++ php-src/ext/sqlite3/sqlite3.c Sat Jan 24 12:17:47 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.1.2.28 2009/01/20 09:57:34 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.29 2009/01/24 12:17:47 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -769,7 +769,7 @@
}
/* }}} */
-/* {{{ proto bool SQLite3::createFunction(string name, mixed callback [, int
argcount]))
+/* {{{ proto bool SQLite3::createFunction(string name, mixed callback [, int
argcount])
Allows registration of a PHP function as a SQLite UDF that can be called
within SQL statements. */
PHP_METHOD(sqlite3, createFunction)
{
@@ -821,7 +821,7 @@
}
/* }}} */
-/* {{{ proto bool SQLite3::createAggregate(string name, mixed step, mixed
final [, int argcount]))
+/* {{{ proto bool SQLite3::createAggregate(string name, mixed step, mixed
final [, int argcount])
Allows registration of a PHP function for use as an aggregate. */
PHP_METHOD(sqlite3, createAggregate)
{
@@ -885,6 +885,184 @@
}
/* }}} */
+typedef struct {
+ sqlite3_blob *blob;
+ size_t position;
+ size_t size;
+} php_stream_sqlite3_data;
+
+static size_t php_sqlite3_stream_write(php_stream *stream, const char *buf,
size_t count TSRMLS_DC)
+{
+ php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *)
stream-abstract;
+
+ return 0;
+}
+
+static size_t php_sqlite3_stream_read(php_stream *stream, char *buf, size_t
count TSRMLS_DC)
+{
+ php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *)
stream-abstract;
+
+ if (sqlite3_stream-position + count = sqlite3_stream-size) {
+ count = sqlite3_stream-size - sqlite3_stream-position;
+ stream-eof = 1;
+ }
+ if (count) {
+ if (sqlite3_blob_read(sqlite3_stream-blob, buf, count,
sqlite3_stream-position) != SQLITE_OK) {
+ return 0;
+ }
+ sqlite3_stream-position += count;
+ }
+ return count;
+}
+
+static int php_sqlite3_stream_close(php_stream *stream, int close_handle
TSRMLS_DC)
+{
+ php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *)
stream-abstract;
+
+ if (sqlite3_blob_close(sqlite3_stream-blob) != SQLITE_OK) {
+ /* Error occured, but it still closed */
+ }
+
+ efree(sqlite3_stream);
+
+ return 0;
+}
+
+static int php_sqlite3_stream_flush(php_stream *stream TSRMLS_DC)
+{
+ /* do nothing */
+ return 0;
+}
+
+/* {{{ */
+static int php_sqlite3_stream_seek(php_stream *stream, off_t offset, int
whence, off_t *newoffs TSRMLS_DC)
+{
+ php_stream_sqlite3_data *sqlite3_stream = (php_stream_sqlite3_data *)
stream-abstract;
+
+ switch(whence) {
+ case SEEK_CUR:
+ if (offset 0) {
+ if (sqlite3_stream-position
(size_t)(-offset)) {
+ sqlite3_stream-position = 0;
+ *newoffs = -1;
+ return -1;
+ } else {
+ sqlite3_stream-position =
sqlite3_stream-position + offset;
+ *newoffs = sqlite3_stream-position;
+ stream-eof = 0;
+ return 0;
+ }
+ } else {
+ if (sqlite3_stream-position + (size_t)(offset)
sqlite3_stream-size) {
+ sqlite3_stream-position =
sqlite3_stream-size;
+ *newoffs = -1;
+ return -1;
+ } else {
+ sqlite3_stream-position =
sqlite3_stream-position + offset;
+ *newoffs = sqlite3_stream-position;
+ stream-eof = 0;
+ return 0;
+ }
+ }
+ case SEEK_SET:
+ if (sqlite3_stream-size (size_t)(offset)) {
+
[PHP-CVS] cvs: php-src(PHP_5_3) / NEWS
scottmacSat Jan 24 12:19:23 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.472r2=1.2027.2.547.2.965.2.473diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.472 php-src/NEWS:1.2027.2.547.2.965.2.473 --- php-src/NEWS:1.2027.2.547.2.965.2.472 Fri Jan 23 15:49:45 2009 +++ php-src/NEWSSat Jan 24 12:19:21 2009 @@ -41,6 +41,7 @@ - Added depth parameter to json_decode() to lower the nesting depth from the maximum if required. (Scott) - Added ICU support to SQLite3 when using the bundled version. (Scott) +- Added SQLite3::openBlob() to read a blob value as a stream. (Scott) - Added pixelation support in imagefilter(). (Takeshi Abe, Kalle) - Added SplObjectStorage::addAll/removeAll. (Etienne) - Added Windows support for stream_socket_pair(). (Kalle) @@ -51,8 +52,8 @@ - Fixed bug #47165 (Possible memory corruption when passing return value by reference). (Dmitry) -- Fixed bug #47145 + #47159 (Always free failed SQLite statements). (Scott) -- Fixed bug #47141 (Unable to fetch error messages from SQLite +- Fixed bug #47145 + #47159 (Always free failed SQLite3 statements). (Scott) +- Fixed bug #47141 (Unable to fetch error messages from SQLite3 when the database can't be opened). (Scott) - Fixed bug #47087 (Second parameter of mssql_fetch_array()). (Felipe) - Fixed bug #47050 (mysqli_poll() modifies improper variables). (Johannes) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sockets php_sockets.h
bjori Sat Jan 24 12:42:20 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/socketsphp_sockets.h Log: Fix build http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/php_sockets.h?r1=1.36.2.1.2.4.2.5r2=1.36.2.1.2.4.2.6diff_format=u Index: php-src/ext/sockets/php_sockets.h diff -u php-src/ext/sockets/php_sockets.h:1.36.2.1.2.4.2.5 php-src/ext/sockets/php_sockets.h:1.36.2.1.2.4.2.6 --- php-src/ext/sockets/php_sockets.h:1.36.2.1.2.4.2.5 Fri Jan 23 15:49:48 2009 +++ php-src/ext/sockets/php_sockets.h Sat Jan 24 12:42:19 2009 @@ -22,7 +22,7 @@ #ifndef PHP_SOCKETS_H #define PHP_SOCKETS_H -/* $Id: php_sockets.h,v 1.36.2.1.2.4.2.5 2009/01/23 15:49:48 kalle Exp $ */ +/* $Id: php_sockets.h,v 1.36.2.1.2.4.2.6 2009/01/24 12:42:19 bjori Exp $ */ #if HAVE_SOCKETS @@ -43,7 +43,7 @@ PHP_FUNCTION(socket_select); PHP_FUNCTION(socket_create_listen); -#ifdef PHP_WIN32 +#ifdef HAVE_SOCKETPAIR PHP_FUNCTION(socket_create_pair); #endif PHP_FUNCTION(socket_accept); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/general_functions get_extension_funcs_basic.phpt get_extension_funcs_error.phpt get_extension_funcs_variation.phpt getrusage_basic.phpt getrusage_er
wharmby Sat Jan 24 12:47:25 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/general_functions get_extension_funcs_basic.phpt get_extension_funcs_error.phpt getrusage_error.phpt get_extension_funcs_variation.phpt getrusage_variation1.phpt getrusage_basic.phpt Log: New get_extension_funcs() and getrusage() tests. Tested on Windows, Linux and Linux 64 bit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt +++ php-src/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/get_extension_funcs_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/get_extension_funcs_error.phpt +++ php-src/ext/standard/tests/general_functions/get_extension_funcs_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getrusage_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/getrusage_error.phpt +++ php-src/ext/standard/tests/general_functions/getrusage_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt +++ php-src/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getrusage_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/getrusage_variation1.phpt +++ php-src/ext/standard/tests/general_functions/getrusage_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getrusage_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/getrusage_basic.phpt +++ php-src/ext/standard/tests/general_functions/getrusage_basic.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/general_functions get_extension_funcs_basic.phpt get_extension_funcs_error.phpt get_extension_funcs_variation.phpt getrusage_basic.phpt getrusage_er
wharmby Sat Jan 24 12:47:28 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/general_functions getrusage_variation1.phpt get_extension_funcs_variation.phpt get_extension_funcs_error.phpt get_extension_funcs_basic.phpt getrusage_error.phpt getrusage_basic.phpt Log: New get_extension_funcs() and getrusage() tests. Tested on Windows, Linux and Linux 64 bit http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getrusage_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/getrusage_variation1.phpt +++ php-src/ext/standard/tests/general_functions/getrusage_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt +++ php-src/ext/standard/tests/general_functions/get_extension_funcs_variation.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/get_extension_funcs_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/get_extension_funcs_error.phpt +++ php-src/ext/standard/tests/general_functions/get_extension_funcs_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt +++ php-src/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getrusage_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/getrusage_error.phpt +++ php-src/ext/standard/tests/general_functions/getrusage_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getrusage_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/general_functions/getrusage_basic.phpt +++ php-src/ext/standard/tests/general_functions/getrusage_basic.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/general_functions get_extension_funcs_basic.phpt get_extension_funcs_error.phpt get_extension_funcs_variation.phpt getrusage_basic.phpt getrusage_error.phpt
wharmby Sat Jan 24 12:47:36 2009 UTC
Modified files:
/php-src/ext/standard/tests/general_functions getrusage_basic.phpt
get_extension_funcs_basic.phpt
getrusage_variation1.phpt
getrusage_error.phpt
get_extension_funcs_variation.phpt
get_extension_funcs_error.phpt
Log:
New get_extension_funcs() and getrusage() tests. Tested on Windows, Linux and
Linux 64 bit
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getrusage_basic.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/general_functions/getrusage_basic.phpt
diff -u /dev/null
php-src/ext/standard/tests/general_functions/getrusage_basic.phpt:1.2
--- /dev/null Sat Jan 24 12:47:36 2009
+++ php-src/ext/standard/tests/general_functions/getrusage_basic.phpt Sat Jan
24 12:47:36 2009
@@ -0,0 +1,33 @@
+--TEST--
+Test getrusage() function: basic test
+--SKIPIF--
+?php
+if( substr(PHP_OS, 0, 3) == WIN )
+ die(skip.. Do not run on Windows);
+?
+--FILE--
+?php
+/* Prototype : array getrusage ([ int $who ] )
+ * Description: Gets the current resource usages
+ * Source code: ext/standard/microtime.c
+ * Alias to functions:
+ */
+
+echo Simple testcase for getrusage() function\n;
+
+$dat = getrusage();
+
+if (!is_array($dat)) {
+ echo TEST FAILED : getrusage shoudl return an array\n;
+}
+
+// echo the fields which are common to all platforms
+echo User time used (seconds) . $dat[ru_utime.tv_sec] . \n;
+echo User time used (microseconds) . $dat[ru_utime.tv_usec] . \n;
+?
+===DONE===
+--EXPECTF--
+Simple testcase for getrusage() function
+User time used (seconds) %d
+User time used (microseconds) %d
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt?r1=1.1r2=1.2diff_format=u
Index:
php-src/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt
diff -u /dev/null
php-src/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt:1.2
--- /dev/null Sat Jan 24 12:47:36 2009
+++ php-src/ext/standard/tests/general_functions/get_extension_funcs_basic.phpt
Sat Jan 24 12:47:36 2009
@@ -0,0 +1,23 @@
+--TEST--
+Test get_extension_funcs() function: basic test
+--FILE--
+?php
+/* Prototype : array get_extension_funcs ( string $module_name )
+ * Description: Returns an array with the names of the functions of a module.
+ * Source code: Zend/zend_builtin_functions.c
+ * Alias to functions:
+ */
+
+echo Simple testcase for get_extension_funcs() function\n;
+
+$result = get_extension_funcs(standard);
+var_dump(gettype($result));
+var_dump(in_array(cos, $result));
+
+?
+===DONE===
+--EXPECTF--
+Simple testcase for get_extension_funcs() function
+unicode(5) array
+bool(true)
+===DONE===
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/getrusage_variation1.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/general_functions/getrusage_variation1.phpt
diff -u /dev/null
php-src/ext/standard/tests/general_functions/getrusage_variation1.phpt:1.2
--- /dev/null Sat Jan 24 12:47:36 2009
+++ php-src/ext/standard/tests/general_functions/getrusage_variation1.phpt
Sat Jan 24 12:47:36 2009
@@ -0,0 +1,142 @@
+--TEST--
+Test getrusage() function : usage variation - diff data types as $who arg
+--SKIPIF--
+?php
+if( substr(PHP_OS, 0, 3) == WIN )
+ die(skip.. Do not run on Windows);
+?
+--FILE--
+?php
+/* Prototype : array getrusage ([ int $who ] )
+ * Description: Gets the current resource usages
+ * Source code: ext/standard/microtime.c
+ * Alias to functions:
+ */
+
+
+/*
+ * Pass different data types as $who argument to test behaviour of getrusage()
+ */
+
+echo *** Testing getrusage() : usage variations ***\n;
+
+//get an unset variable
+$unset_var = 10;
+unset ($unset_var);
+
+
+// unexpected values to be passed to $stream_id argument
+$inputs = array(
+
+ // int data
+/*1*/ 0,
+ 1,
+ 12345,
+ -2345,
+
+ // float data
+/*5*/ 10.5,
+ -10.5,
+ 12.3456789000e10,
+ 12.3456789000E-10,
+ .5,
+
+ // null data
+/*10*/ NULL,
+ null,
+
+ // boolean data
+/*12*/ true,
+ false,
+ TRUE,
+ FALSE,
+
+ // string data
+/*16*/ 0,
+ '1',
+ 1232456,
+ 1.23E4,
+
+ // undefined data
+/*20*/ @$undefined_var,
+
+ // unset data
+/*21*/ @$unset_var,
+);
+
+// loop through each element of $inputs to check the behavior of getrusage()
+$iterator = 1;
+foreach($inputs as $input) {
+ echo \n-- Iteration $iterator --\n;
+ $res = getrusage($input);
+ echo User time used (microseconds) . $res[ru_utime.tv_usec] . \n;
+ $iterator++;
+}
+?
+===DONE===
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/output .cvsignore
tony2001Sat Jan 24 13:01:08 2009 UTC Added files: (Branch: PHP_5_2) /php-src/tests/output .cvsignore Log: add missing .cvsignore http://cvs.php.net/viewvc.cgi/php-src/tests/output/.cvsignore?view=markuprev=1.1 Index: php-src/tests/output/.cvsignore +++ php-src/tests/output/.cvsignore *.php *.log *.diff *.exp *.out *~ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sockets sockets.c
tony2001Sat Jan 24 13:06:22 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/socketssockets.c Log: fix build http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.14.2.14r2=1.171.2.9.2.14.2.15diff_format=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.14 php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.15 --- php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.14 Fri Jan 23 15:49:48 2009 +++ php-src/ext/sockets/sockets.c Sat Jan 24 13:06:21 2009 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: sockets.c,v 1.171.2.9.2.14.2.14 2009/01/23 15:49:48 kalle Exp $ */ +/* $Id: sockets.c,v 1.171.2.9.2.14.2.15 2009/01/24 13:06:21 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -51,7 +51,6 @@ # define set_errno(a) WSASetLastError(a) # define close(a) closesocket(a) #else -# include php_sockets.h # include sys/types.h # include sys/socket.h # include netdb.h @@ -67,6 +66,7 @@ # include sys/uio.h # define IS_INVALID_SOCKET(a) (a-bsd_socket 0) # define set_errno(a) (errno = a) +# include php_sockets.h #endif ZEND_DECLARE_MODULE_GLOBALS(sockets) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/sqlite3 sqlite3.c
tony2001Sat Jan 24 13:08:05 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/sqlite3sqlite3.c
Log:
fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.1.2.29r2=1.1.2.30diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.1.2.29
php-src/ext/sqlite3/sqlite3.c:1.1.2.30
--- php-src/ext/sqlite3/sqlite3.c:1.1.2.29 Sat Jan 24 12:17:47 2009
+++ php-src/ext/sqlite3/sqlite3.c Sat Jan 24 13:08:04 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.1.2.29 2009/01/24 12:17:47 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.1.2.30 2009/01/24 13:08:04 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1053,7 +1053,7 @@
sqlite3_stream-position = 0;
sqlite3_stream-size = sqlite3_blob_bytes(blob);
- stream = php_stream_alloc_rel(php_stream_sqlite3_ops, sqlite3_stream,
0, rb);
+ stream = php_stream_alloc(php_stream_sqlite3_ops, sqlite3_stream, 0,
rb);
if (stream) {
php_stream_to_zval(stream, return_value);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sqlite3 sqlite3.c
tony2001Sat Jan 24 13:08:37 2009 UTC
Modified files:
/php-src/ext/sqlite3sqlite3.c
Log:
fix build
http://cvs.php.net/viewvc.cgi/php-src/ext/sqlite3/sqlite3.c?r1=1.32r2=1.33diff_format=u
Index: php-src/ext/sqlite3/sqlite3.c
diff -u php-src/ext/sqlite3/sqlite3.c:1.32 php-src/ext/sqlite3/sqlite3.c:1.33
--- php-src/ext/sqlite3/sqlite3.c:1.32 Sat Jan 24 12:16:57 2009
+++ php-src/ext/sqlite3/sqlite3.c Sat Jan 24 13:08:35 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: sqlite3.c,v 1.32 2009/01/24 12:16:57 scottmac Exp $ */
+/* $Id: sqlite3.c,v 1.33 2009/01/24 13:08:35 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1080,7 +1080,7 @@
sqlite3_stream-position = 0;
sqlite3_stream-size = sqlite3_blob_bytes(blob);
- stream = php_stream_alloc_rel(php_stream_sqlite3_ops, sqlite3_stream,
0, rb);
+ stream = php_stream_alloc(php_stream_sqlite3_ops, sqlite3_stream, 0,
rb);
if (stream) {
php_stream_to_zval(stream, return_value);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sockets sockets.c
tony2001Sat Jan 24 13:09:15 2009 UTC Modified files: /php-src/ext/socketssockets.c Log: fix build http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.208r2=1.209diff_format=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.208 php-src/ext/sockets/sockets.c:1.209 --- php-src/ext/sockets/sockets.c:1.208 Fri Jan 23 15:48:55 2009 +++ php-src/ext/sockets/sockets.c Sat Jan 24 13:09:13 2009 @@ -19,7 +19,7 @@ +--+ */ -/* $Id: sockets.c,v 1.208 2009/01/23 15:48:55 kalle Exp $ */ +/* $Id: sockets.c,v 1.209 2009/01/24 13:09:13 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include config.h @@ -51,7 +51,6 @@ # define set_errno(a) WSASetLastError(a) # define close(a) closesocket(a) #else -# include php_sockets.h # include sys/types.h # include sys/socket.h # include netdb.h @@ -67,6 +66,7 @@ # include sys/uio.h # define IS_INVALID_SOCKET(a) (a-bsd_socket 0) # define set_errno(a) (errno = a) +# include php_sockets.h #endif ZEND_DECLARE_MODULE_GLOBALS(sockets) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/network socket_get_status_basic.phpt
tony2001Sat Jan 24 22:01:27 2009 UTC
Modified files:
/php-src/ext/standard/tests/network socket_get_status_basic.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/socket_get_status_basic.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/standard/tests/network/socket_get_status_basic.phpt
diff -u php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.2
php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.3
--- php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.2 Fri Jan
23 15:34:22 2009
+++ php-src/ext/standard/tests/network/socket_get_status_basic.phpt Sat Jan
24 22:01:24 2009
@@ -11,7 +11,7 @@
--EXPECT--
array(8) {
[ustream_type]=
- unicode(10) tcp_socket
+ unicode(%d) tcp_socket%s
[umode]=
unicode(2) r+
[uunread_bytes]=
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/network socket_get_status_basic.phpt
tony2001Sat Jan 24 22:02:15 2009 UTC
Modified files:
/php-src/ext/standard/tests/network socket_get_status_basic.phpt
Log:
expect - expectf
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/socket_get_status_basic.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/network/socket_get_status_basic.phpt
diff -u php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.3
php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.4
--- php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.3 Sat Jan
24 22:01:24 2009
+++ php-src/ext/standard/tests/network/socket_get_status_basic.phpt Sat Jan
24 22:02:13 2009
@@ -8,7 +8,7 @@
fclose($tcp_socket);
?
---EXPECT--
+--EXPECTF--
array(8) {
[ustream_type]=
unicode(%d) tcp_socket%s
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/network socket_get_status_basic.phpt
tony2001Sat Jan 24 22:02:38 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/network socket_get_status_basic.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/socket_get_status_basic.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/standard/tests/network/socket_get_status_basic.phpt
diff -u php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.1.2.1
php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.1.2.2
--- php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.1.2.1
Fri Jan 23 15:34:19 2009
+++ php-src/ext/standard/tests/network/socket_get_status_basic.phpt Sat Jan
24 22:02:36 2009
@@ -8,10 +8,10 @@
fclose($tcp_socket);
?
---EXPECT--
+--EXPECTF--
array(7) {
[stream_type]=
- string(10) tcp_socket
+ string(%d) tcp_socket%s
[mode]=
string(2) r+
[unread_bytes]=
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/network socket_get_status_basic.phpt
tony2001Sat Jan 24 22:03:07 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/network socket_get_status_basic.phpt
Log:
fix test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/socket_get_status_basic.phpt?r1=1.2.2.2r2=1.2.2.3diff_format=u
Index: php-src/ext/standard/tests/network/socket_get_status_basic.phpt
diff -u php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.2.2.2
php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.2.2.3
--- php-src/ext/standard/tests/network/socket_get_status_basic.phpt:1.2.2.2
Fri Jan 23 15:34:24 2009
+++ php-src/ext/standard/tests/network/socket_get_status_basic.phpt Sat Jan
24 22:03:06 2009
@@ -8,10 +8,10 @@
fclose($tcp_socket);
?
---EXPECT--
+--EXPECTF--
array(7) {
[stream_type]=
- string(10) tcp_socket
+ string(%d) tcp_socket%s
[mode]=
string(2) r+
[unread_bytes]=
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
