clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-26 20:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2

Browse Source
This commit is contained in:
Dmitry Stogov 2014-03-04 12:29:09 +04:00
commit 7bc5d0b1f4
4 changed files with 56 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/exec.c
View File

@ -192,6 +192,7 @@ static void php_exec_ex(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
if (!ret_array) {
ret = php_exec(mode, cmd, NULL, return_value TSRMLS_CC);
} else {
ret_array = Z_REFVAL_P(ret_array);
if (Z_TYPE_P(ret_array) != IS_ARRAY) {
zval_dtor(ret_array);
array_init(ret_array);
@ -199,6 +200,7 @@ static void php_exec_ex(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
ret = php_exec(2, cmd, ret_array, return_value TSRMLS_CC);
}
if (ret_code) {
ret_code = Z_REFVAL_P(ret_code);
zval_dtor(ret_code);
ZVAL_LONG(ret_code, ret);
}

5
ext/standard/file.c
View File

@ -556,7 +556,7 @@ PHP_FUNCTION(file_get_contents)
if ((contents = php_stream_copy_to_mem(stream, maxlen, 0)) != NULL) {
RETVAL_STR(contents);
} else {
RETVAL_FALSE;
RETVAL_STR(STR_EMPTY_ALLOC());
}
php_stream_close(stream);
@ -825,6 +825,9 @@ PHP_FUNCTION(tempnam)
close(fd);
//??? RETVAL_STRING(opened_path, 0);
RETVAL_STRING(opened_path);
//??? temporary fixed the memory leak, I've tried to make opened_path a zend_string
//but too too many places need to be changed.... let's keep it simple for now
efree(opened_path);
}
STR_RELEASE(p);
}

96
ext/standard/tests/file/007_basic.phpt
View File

@ -98,10 +98,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'wb' --
@ -111,10 +111,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'wt' --
@ -124,10 +124,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'w+' --
@ -137,10 +137,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'w+b' --
@ -150,10 +150,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'w+t' --
@ -163,10 +163,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'r' --
@ -176,10 +176,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'rb' --
@ -189,10 +189,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'rt' --
@ -202,10 +202,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'r+' --
@ -215,10 +215,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'r+b' --
@ -228,10 +228,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'r+t' --
@ -241,10 +241,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'a' --
@ -254,10 +254,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'ab' --
@ -267,10 +267,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'at' --
@ -280,10 +280,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'a+' --
@ -293,10 +293,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'a+t' --
@ -306,10 +306,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'a+b' --
@ -319,10 +319,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
-- Iteration with mode 'x' --
@ -332,10 +332,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
resource(%d) of type (Unknown)
@ -346,10 +346,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
resource(%d) of type (Unknown)
@ -360,10 +360,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
resource(%d) of type (Unknown)
@ -374,10 +374,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
resource(%d) of type (Unknown)
@ -388,10 +388,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
resource(%d) of type (Unknown)
@ -402,10 +402,10 @@ bool(false)
bool(true)
resource(%d) of type (Unknown)
Warning: ftell(): %d is not a valid stream resource in %s on line %d
Warning: ftell(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
resource(%d) of type (Unknown)

4
ext/standard/tests/file/007_error.phpt
View File

@ -76,7 +76,7 @@ bool(false)
Warning: fopen() expects at least 2 parameters, 0 given in %s on line %d
bool(false)
Warning: fclose(): %d is not a valid stream resource in %s on line %d
Warning: fclose(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: fclose() expects parameter 1 to be resource, string given in %s on line %d
@ -85,7 +85,7 @@ bool(false)
Warning: fclose() expects exactly 1 parameter, 0 given in %s on line %d
bool(false)
Warning: feof(): %d is not a valid stream resource in %s on line %d
Warning: feof(): supplied resource is not a valid stream resource in %s on line %d
bool(false)
Warning: feof() expects parameter 1 to be resource, string given in %s on line %d