archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix 2 tests, add phar.readonly checks to rmdir/mkdir

Browse source
This commit is contained in:
Greg Beaver 2008-01-22 20:24:52 +00:00
parent 34afc9ae6e
commit 47a60c4f16
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/phar/dirstream.c
View file

@ -406,6 +406,11 @@ int phar_wrapper_mkdir(php_stream_wrapper *wrapper, char *url_from, int mode, in
php_url *resource = NULL;
uint host_len;
if (PHAR_G(readonly)) {
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot create directory \"%s\", write operations disabled", url_from);
return FAILURE;
}
if ((resource = phar_open_url(wrapper, url_from, "w", options TSRMLS_CC)) == NULL) {
return FAILURE;
}
@ -506,6 +511,11 @@ int phar_wrapper_rmdir(php_stream_wrapper *wrapper, char *url, int options, php_
php_url *resource = NULL;
uint host_len;
if (PHAR_G(readonly)) {
php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: cannot rmdir directory \"%s\", write operations disabled", url);
return FAILURE;
}
if ((resource = phar_open_url(wrapper, url, "w", options TSRMLS_CC)) == NULL) {
return FAILURE;
}

4
ext/phar/tests/phar_convert_tar3.phpt
View file

@ -25,7 +25,7 @@ include 'phar_test.inc';
$phar = new Phar($fname);
$phar->convertToTar(Phar::BZ2);
var_dump($phar->isTar());
var_dump($phar->isCompressed() === 0);
var_dump($phar->isCompressed());
copy($fname, $fname2);
$phar = new Phar($fname2);
@ -41,7 +41,7 @@ __HALT_COMPILER();
?>
--EXPECT--
bool(true)
bool(true)
bool(false)
bool(true)
bool(true)
===DONE===

4
ext/phar/tests/tar/phar_convert_phar3.phpt
View file

@ -20,7 +20,7 @@ $phar['a'] = 'hi there';
$phar = new Phar($fname);
$phar->convertToPhar(Phar::BZ2);
var_dump($phar->isPhar());
var_dump($phar->isCompressed() === 0);
var_dump($phar->isCompressed());
copy($fname, $fname2);
$phar = new Phar($fname2);
@ -37,7 +37,7 @@ __HALT_COMPILER();
--EXPECT--
bool(true)
bool(true)
bool(true)
bool(false)
bool(true)
bool(true)
===DONE===