[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Wed May 17 05:31:49 2006 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewcvs.cgi/php-src/ChangeLog?r1=1.2347r2=1.2348diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2347 php-src/ChangeLog:1.2348 --- php-src/ChangeLog:1.2347Tue May 16 05:31:47 2006 +++ php-src/ChangeLog Wed May 17 05:31:49 2006 @@ -1,3 +1,77 @@ +2006-05-16 Marcus Boerger [EMAIL PROTECTED] + +* run-tests.php: + - '_' is valid in test blocks + +2006-05-16 Antony Dovgal [EMAIL PROTECTED] + +* (PHP_5_1) + tests/basic/021.phpt + tests/basic/021.phpt: + fix test + +2006-05-16 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/standard/php_fopen_wrapper.c: + MFB: Make filters without a resource throw E_RECOVERABLE_ERROR rather then + E_ERROR + +* (PHP_5_2) + ext/standard/php_fopen_wrapper.c: + Make filters without a resource throw E_RECOVERABLE_ERROR rather then + E_ERROR + +2006-05-16 Antony Dovgal [EMAIL PROTECTED] + +* ext/standard/tests/file/mkdir-001.phpt + ext/standard/tests/file/mkdir-002.phpt + ext/standard/tests/file/mkdir-003.phpt + ext/standard/tests/file/mkdir-004.phpt + ext/standard/tests/file/mkdir-005.phpt: + new mkdir tests + +* ext/standard/tests/file/mkdir-001.phpt + ext/standard/tests/file/mkdir-001.phpt + ext/standard/tests/file/mkdir-002.phpt + ext/standard/tests/file/mkdir-002.phpt + ext/standard/tests/file/mkdir-003.phpt + ext/standard/tests/file/mkdir-003.phpt + ext/standard/tests/file/mkdir-004.phpt + ext/standard/tests/file/mkdir-004.phpt + ext/standard/tests/file/mkdir-005.phpt + ext/standard/tests/file/mkdir-005.phpt: + + file mkdir-001.phpt was initially added on branch PHP_5_2. + +* main/streams/plain_wrapper.c: + MFB: fix #37395 (recursive mkdir() fails to create nonexistent directories + in root dir) + +* (PHP_5_2) + NEWS + main/streams/plain_wrapper.c: + fix #37395 (recursive mkdir() fails to create nonexistent directories in + root dir) + +2006-05-16 Marcus Boerger [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + - MFH Fixed Bug #37457 (Crash when an exception is thrown in accept() + method of FilterIterator) + +2006-05-16 Ilia Alshanetsky [EMAIL PROTECTED] + +* main/main.c: + MFB: Disable realpath cache when open_basedir or safe_mode are enabled on a + per-request basis. + +* (PHP_5_2) + NEWS + main/main.c: + Disable realpath cache when open_basedir or safe_mode are enabled on a + per-request basis. + 2006-05-15 Dmitry Stogov [EMAIL PROTECTED] * (PHP_5_2)
[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c /ext/spl/tests bug37457.phpt
helly Tue May 16 08:19:56 2006 UTC
Added files:
/php-src/ext/spl/tests bug37457.phpt
Modified files:
/php-src/ext/splspl_iterators.c
Log:
- Fixed Bug #37457 (Crash when an exception is thrown in accept() method of
FilterIterator)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.126r2=1.127diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.126
php-src/ext/spl/spl_iterators.c:1.127
--- php-src/ext/spl/spl_iterators.c:1.126 Fri May 12 09:42:19 2006
+++ php-src/ext/spl/spl_iterators.c Tue May 16 08:19:56 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.126 2006/05/12 09:42:19 tony2001 Exp $ */
+/* $Id: spl_iterators.c,v 1.127 2006/05/16 08:19:56 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1184,7 +1184,9 @@
}
zval_ptr_dtor(retval);
}
-
+ if (EG(exception)) {
+ return;
+ }
intern-inner.iterator-funcs-move_forward(intern-inner.iterator TSRMLS_CC);
}
spl_dual_it_free(intern TSRMLS_CC);
@@ -1664,11 +1666,14 @@
zend_call_method_with_0_params(intern-inner.zobject,
intern-inner.ce, NULL, haschildren, retval);
if (zend_is_true(retval)) {
zend_call_method_with_0_params(intern-inner.zobject, intern-inner.ce, NULL,
getchildren, zchildren);
- if (EG(exception) intern-u.caching.flags
CIT_CATCH_GET_CHILD) {
- zend_clear_exception(TSRMLS_C);
+ if (EG(exception)) {
if (zchildren) {
zval_ptr_dtor(zchildren);
}
+ if (intern-u.caching.flags
CIT_CATCH_GET_CHILD) {
+ zend_clear_exception(TSRMLS_C);
+ }
+ return;
} else {
INIT_PZVAL(zflags);
ZVAL_LONG(zflags,
intern-u.caching.flags CIT_PUBLIC);
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/tests/bug37457.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/bug37457.phpt
+++ php-src/ext/spl/tests/bug37457.phpt
--TEST--
Bug #37457 (Crash when an exception is thrown in accept() method of
FilterIterator)
--FILE--
?php
class Collection implements Iterator
{
protected $array, $valid = false;
public function __construct(array $a)
{
echo __METHOD__ . \n;
$this-array = $a;
}
public function current()
{
echo __METHOD__ . \n;
return current($this-array);
}
public function key()
{
echo __METHOD__ . \n;
return key($this-array);
}
public function next()
{
echo __METHOD__ . \n;
$this-valid = (false !== next($this-array));
}
public function valid()
{
echo __METHOD__ . \n;
return $this-valid;
}
public function rewind()
{
echo __METHOD__ . \n;
$this-valid = (false !== reset($this-array));
}
}
class TestFilter extends FilterIterator
{
public function accept()
{
echo __METHOD__ . \n;
throw new Exception(Failure in Accept);
}
}
$test = new TestFilter(new Collection(array(0)));
try
{
foreach ($test as $item)
{
echo $item;
}
}
catch (Exception $e)
{
var_dump($e-getMessage());
}
?
===DONE===
--EXPECTF--
Collection::__construct
Collection::rewind
Collection::valid
Collection::current
Collection::key
TestFilter::accept
string(17) Failure in Accept
===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_2) / NEWS /ext/spl spl_iterators.c /ext/spl/tests bug37457.phpt
helly Tue May 16 08:21:08 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/spl/tests bug37457.phpt
Modified files:
/php-srcNEWS
/php-src/ext/splspl_iterators.c
Log:
- MFH Fixed Bug #37457 (Crash when an exception is thrown in accept() method
of FilterIterator)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.27r2=1.2027.2.547.2.28diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.27 php-src/NEWS:1.2027.2.547.2.28
--- php-src/NEWS:1.2027.2.547.2.27 Tue May 16 00:39:32 2006
+++ php-src/NEWSTue May 16 08:21:07 2006
@@ -38,6 +38,8 @@
- Added pg_field_table() function. (Edin)
- Added implementation of curl_multi_info_read(). (Brian)
- Added RFC2397 (data: stream) support. (Marcus)
+- Fixed Bug #37457 (Crash when an exception is thrown in accept() method of
+ FilterIterator). (Marcus)
- Fixed bug #37416 (iterator_to_array() hides exceptions thrown in rewind()
method). (Tony)
- Fixed bug #37413 (Rejected versions of flex that don't work). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.4r2=1.73.2.30.2.5diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.4
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.5
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.4 Fri May 12 09:42:56 2006
+++ php-src/ext/spl/spl_iterators.c Tue May 16 08:21:07 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.4 2006/05/12 09:42:56 tony2001 Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.5 2006/05/16 08:21:07 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1173,7 +1173,9 @@
}
zval_ptr_dtor(retval);
}
-
+ if (EG(exception)) {
+ return;
+ }
intern-inner.iterator-funcs-move_forward(intern-inner.iterator TSRMLS_CC);
}
spl_dual_it_free(intern TSRMLS_CC);
@@ -1653,11 +1655,14 @@
zend_call_method_with_0_params(intern-inner.zobject,
intern-inner.ce, NULL, haschildren, retval);
if (zend_is_true(retval)) {
zend_call_method_with_0_params(intern-inner.zobject, intern-inner.ce, NULL,
getchildren, zchildren);
- if (EG(exception) intern-u.caching.flags
CIT_CATCH_GET_CHILD) {
- zend_clear_exception(TSRMLS_C);
+ if (EG(exception)) {
if (zchildren) {
zval_ptr_dtor(zchildren);
}
+ if (intern-u.caching.flags
CIT_CATCH_GET_CHILD) {
+ zend_clear_exception(TSRMLS_C);
+ }
+ return;
} else {
INIT_PZVAL(zflags);
ZVAL_LONG(zflags,
intern-u.caching.flags CIT_PUBLIC);
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/tests/bug37457.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/bug37457.phpt
+++ php-src/ext/spl/tests/bug37457.phpt
--TEST--
Bug #37457 (Crash when an exception is thrown in accept() method of
FilterIterator)
--FILE--
?php
class Collection implements Iterator
{
protected $array, $valid = false;
public function __construct(array $a)
{
echo __METHOD__ . \n;
$this-array = $a;
}
public function current()
{
echo __METHOD__ . \n;
return current($this-array);
}
public function key()
{
echo __METHOD__ . \n;
return key($this-array);
}
public function next()
{
echo __METHOD__ . \n;
$this-valid = (false !== next($this-array));
}
public function valid()
{
echo __METHOD__ . \n;
return $this-valid;
}
public function rewind()
{
echo __METHOD__ . \n;
$this-valid = (false !== reset($this-array));
}
}
class TestFilter extends FilterIterator
{
public function accept()
{
echo __METHOD__ . \n;
throw new Exception(Failure in Accept);
}
}
$test = new TestFilter(new Collection(array(0)));
try
{
foreach ($test as $item)
{
echo $item;
}
}
catch (Exception $e)
{
var_dump($e-getMessage());
}
?
===DONE===
--EXPECTF--
Collection::__construct
Collection::rewind
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main/streams plain_wrapper.c
tony2001Tue May 16 13:05:02 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/main/streams plain_wrapper.c
Log:
fix #37395 (recursive mkdir() fails to create nonexistent directories in root
dir)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.28r2=1.2027.2.547.2.29diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.28 php-src/NEWS:1.2027.2.547.2.29
--- php-src/NEWS:1.2027.2.547.2.28 Tue May 16 08:21:07 2006
+++ php-src/NEWSTue May 16 13:05:02 2006
@@ -38,7 +38,9 @@
- Added pg_field_table() function. (Edin)
- Added implementation of curl_multi_info_read(). (Brian)
- Added RFC2397 (data: stream) support. (Marcus)
-- Fixed Bug #37457 (Crash when an exception is thrown in accept() method of
+- Fixed bug #37395 (recursive mkdir() fails to create nonexistent directories
+ in root dir). (Tony)
+- Fixed bug #37457 (Crash when an exception is thrown in accept() method of
FilterIterator). (Marcus)
- Fixed bug #37416 (iterator_to_array() hides exceptions thrown in rewind()
method). (Tony)
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6r2=1.52.2.6.2.1diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.1
--- php-src/main/streams/plain_wrapper.c:1.52.2.6 Tue Jan 17 02:32:09 2006
+++ php-src/main/streams/plain_wrapper.cTue May 16 13:05:02 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6 2006/01/17 02:32:09 iliaa Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.1 2006/05/16 13:05:02 tony2001 Exp $ */
#include php.h
#include php_globals.h
@@ -1100,7 +1100,7 @@
}
else {
/* find a top level directory we need to create */
- while ( (p = strrchr(buf + offset, DEFAULT_SLASH)) ||
(p = strrchr(buf, DEFAULT_SLASH)) ) {
+ while ( (p = strrchr(buf + offset, DEFAULT_SLASH)) || (
offset !=1 (p = strrchr(buf, DEFAULT_SLASH))) ) {
*p = '\0';
if (VCWD_STAT(buf, sb) == 0) {
*p = DEFAULT_SLASH;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main/streams plain_wrapper.c
tony2001Tue May 16 13:05:23 2006 UTC
Modified files:
/php-src/main/streams plain_wrapper.c
Log:
MFB: fix #37395 (recursive mkdir() fails to create nonexistent directories in
root dir)
http://cvs.php.net/viewcvs.cgi/php-src/main/streams/plain_wrapper.c?r1=1.64r2=1.65diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.64
php-src/main/streams/plain_wrapper.c:1.65
--- php-src/main/streams/plain_wrapper.c:1.64 Wed Mar 8 14:41:45 2006
+++ php-src/main/streams/plain_wrapper.cTue May 16 13:05:23 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: plain_wrapper.c,v 1.64 2006/03/08 14:41:45 iliaa Exp $ */
+/* $Id: plain_wrapper.c,v 1.65 2006/05/16 13:05:23 tony2001 Exp $ */
#include php.h
#include php_globals.h
@@ -1081,7 +1081,7 @@
}
else {
/* find a top level directory we need to create */
- while ( (p = strrchr(buf + offset, DEFAULT_SLASH)) ||
(p = strrchr(buf, DEFAULT_SLASH)) ) {
+ while ( (p = strrchr(buf + offset, DEFAULT_SLASH)) ||
(offset != 1 (p = strrchr(buf, DEFAULT_SLASH))) ) {
*p = '\0';
if (VCWD_STAT(buf, sb) == 0) {
*p = DEFAULT_SLASH;
--
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/file mkdir-001.phpt mkdir-002.phpt mkdir-003.phpt mkdir-004.phpt mkdir-005.phpt
tony2001Tue May 16 13:06:06 2006 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filemkdir-001.phpt mkdir-002.phpt mkdir-003.phpt mkdir-004.phpt mkdir-005.phpt Log: new mkdir tests http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/mkdir-001.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/mkdir-001.phpt +++ php-src/ext/standard/tests/file/mkdir-001.phpt http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/mkdir-002.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/mkdir-002.phpt +++ php-src/ext/standard/tests/file/mkdir-002.phpt http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/mkdir-003.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/mkdir-003.phpt +++ php-src/ext/standard/tests/file/mkdir-003.phpt http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/mkdir-004.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/mkdir-004.phpt +++ php-src/ext/standard/tests/file/mkdir-004.phpt http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/mkdir-005.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/file/mkdir-005.phpt +++ php-src/ext/standard/tests/file/mkdir-005.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/file mkdir-001.phpt mkdir-002.phpt mkdir-003.phpt mkdir-004.phpt mkdir-005.phpt
tony2001Tue May 16 13:07:07 2006 UTC
Modified files:
/php-src/ext/standard/tests/filemkdir-001.phpt mkdir-002.phpt
mkdir-003.phpt mkdir-004.phpt
mkdir-005.phpt
Log:
new mkdir tests
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/mkdir-001.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/mkdir-001.phpt
diff -u /dev/null php-src/ext/standard/tests/file/mkdir-001.phpt:1.2
--- /dev/null Tue May 16 13:07:07 2006
+++ php-src/ext/standard/tests/file/mkdir-001.phpt Tue May 16 13:07:07 2006
@@ -0,0 +1,36 @@
+--TEST--
+mkdir() tests
+--FILE--
+?php
+
+var_dump(mkdir(testdir));
+var_dump(mkdir(testdir/subdir));
+var_dump(rmdir(testdir/subdir));
+var_dump(rmdir(testdir));
+
+var_dump(mkdir(./testdir));
+var_dump(mkdir(./testdir/subdir));
+var_dump(rmdir(./testdir/subdir));
+var_dump(rmdir(./testdir));
+
+var_dump(mkdir(dirname(__FILE__)./testdir));
+var_dump(mkdir(dirname(__FILE__)./testdir/subdir));
+var_dump(rmdir(dirname(__FILE__)./testdir/subdir));
+var_dump(rmdir(dirname(__FILE__)./testdir));
+
+echo Done\n;
+?
+--EXPECTF--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Done
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/mkdir-002.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/mkdir-002.phpt
diff -u /dev/null php-src/ext/standard/tests/file/mkdir-002.phpt:1.2
--- /dev/null Tue May 16 13:07:07 2006
+++ php-src/ext/standard/tests/file/mkdir-002.phpt Tue May 16 13:07:07 2006
@@ -0,0 +1,49 @@
+--TEST--
+mkdir(dir, 0777) tests
+--FILE--
+?php
+
+var_dump(mkdir(testdir, 0777));
+var_dump(mkdir(testdir/subdir, 0777));
+var_dump(`ls -l testdir`);
+var_dump(rmdir(testdir/subdir));
+var_dump(rmdir(testdir));
+
+var_dump(mkdir(./testdir, 0777));
+var_dump(mkdir(./testdir/subdir, 0777));
+var_dump(`ls -l ./testdir`);
+var_dump(rmdir(./testdir/subdir));
+var_dump(rmdir(./testdir));
+
+var_dump(mkdir(dirname(__FILE__)./testdir, 0777));
+var_dump(mkdir(dirname(__FILE__)./testdir/subdir, 0777));
+$dirname = dirname(__FILE__)./testdir;
+var_dump(`ls -l $dirname`);
+var_dump(rmdir(dirname(__FILE__)./testdir/subdir));
+var_dump(rmdir(dirname(__FILE__)./testdir));
+
+echo Done\n;
+?
+--EXPECTF--
+bool(true)
+bool(true)
+string(%d) %s
+d%s subdir
+
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+string(%d) %s
+d%s subdir
+
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+string(%d) %s
+d%s subdir
+
+bool(true)
+bool(true)
+Done
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/mkdir-003.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/mkdir-003.phpt
diff -u /dev/null php-src/ext/standard/tests/file/mkdir-003.phpt:1.2
--- /dev/null Tue May 16 13:07:07 2006
+++ php-src/ext/standard/tests/file/mkdir-003.phpt Tue May 16 13:07:07 2006
@@ -0,0 +1,30 @@
+--TEST--
+recursive mkdir() tests
+--FILE--
+?php
+
+var_dump(mkdir(testdir/subdir, 0777, true));
+var_dump(rmdir(testdir/subdir));
+var_dump(rmdir(testdir));
+
+var_dump(mkdir(./testdir/subdir, 0777, true));
+var_dump(rmdir(./testdir/subdir));
+var_dump(rmdir(./testdir));
+
+var_dump(mkdir(dirname(__FILE__)./testdir/subdir, 0777, true));
+var_dump(rmdir(dirname(__FILE__)./testdir/subdir));
+var_dump(rmdir(dirname(__FILE__)./testdir));
+
+echo Done\n;
+?
+--EXPECTF--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+Done
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/mkdir-004.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/mkdir-004.phpt
diff -u /dev/null php-src/ext/standard/tests/file/mkdir-004.phpt:1.2
--- /dev/null Tue May 16 13:07:07 2006
+++ php-src/ext/standard/tests/file/mkdir-004.phpt Tue May 16 13:07:07 2006
@@ -0,0 +1,24 @@
+--TEST--
+recursive mkdir() tests
+--SKIPIF--
+?
+chdir(/);
+if ([EMAIL PROTECTED](testtmpskipifdir)) {
+ die(skip for root only);
+}
+rmdir(testtmpskipifdir);
+?
+--FILE--
+?php
+
+var_dump(mkdir(/testdir/subdir, 0777, true));
+var_dump(rmdir(/testdir/subdir));
+var_dump(rmdir(/testdir));
+
+echo Done\n;
+?
+--EXPECTF--
+bool(true)
+bool(true)
+bool(true)
+Done
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/tests/file/mkdir-005.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/mkdir-005.phpt
diff -u /dev/null php-src/ext/standard/tests/file/mkdir-005.phpt:1.2
--- /dev/null Tue May 16 13:07:07 2006
+++ php-src/ext/standard/tests/file/mkdir-005.phpt Tue May 16 13:07:07 2006
@@ -0,0 +1,25 @@
+--TEST--
+recursive mkdir() tests
+--SKIPIF--
+?
+chdir(/);
+if ([EMAIL PROTECTED](testtmpskipifdir)) {
+ die(skip for root only);
+}
+rmdir(testtmpskipifdir);
+?
+--FILE--
+?php
+
+chdir(/);
+var_dump(mkdir(./testdir/subdir, 0777, true));
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard php_fopen_wrapper.c
iliaa Tue May 16 14:11:52 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard php_fopen_wrapper.c
Log:
Make filters without a resource throw E_RECOVERABLE_ERROR rather then
E_ERROR
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/php_fopen_wrapper.c?r1=1.45.2.4r2=1.45.2.4.2.1diff_format=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4
php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4.2.1
--- php-src/ext/standard/php_fopen_wrapper.c:1.45.2.4 Mon May 1 16:02:07 2006
+++ php-src/ext/standard/php_fopen_wrapper.cTue May 16 14:11:52 2006
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.45.2.4 2006/05/01 16:02:07 helly Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.45.2.4.2.1 2006/05/16 14:11:52 iliaa Exp $ */
#include stdio.h
#include stdlib.h
@@ -207,7 +207,7 @@
pathdup = estrndup(path + 6, strlen(path + 6));
p = strstr(pathdup, /resource=);
if (!p) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, No URL
resource specified.);
+ php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR,
No URL resource specified.);
efree(pathdup);
return NULL;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard php_fopen_wrapper.c
iliaa Tue May 16 14:12:52 2006 UTC
Modified files:
/php-src/ext/standard php_fopen_wrapper.c
Log:
MFB: Make filters without a resource throw E_RECOVERABLE_ERROR rather then
E_ERROR
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/php_fopen_wrapper.c?r1=1.53r2=1.54diff_format=u
Index: php-src/ext/standard/php_fopen_wrapper.c
diff -u php-src/ext/standard/php_fopen_wrapper.c:1.53
php-src/ext/standard/php_fopen_wrapper.c:1.54
--- php-src/ext/standard/php_fopen_wrapper.c:1.53 Mon May 1 15:59:56 2006
+++ php-src/ext/standard/php_fopen_wrapper.cTue May 16 14:12:52 2006
@@ -17,7 +17,7 @@
| Hartmut Holzgraefe [EMAIL PROTECTED] |
+--+
*/
-/* $Id: php_fopen_wrapper.c,v 1.53 2006/05/01 15:59:56 helly Exp $ */
+/* $Id: php_fopen_wrapper.c,v 1.54 2006/05/16 14:12:52 iliaa Exp $ */
#include stdio.h
#include stdlib.h
@@ -171,7 +171,7 @@
path += 11;
max_memory = strtol(path, NULL, 10);
if (max_memory 0) {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, Max
memory must be = 0);
+ php_error_docref(NULL TSRMLS_CC,
E_RECOVERABLE_ERROR, Max memory must be = 0);
return NULL;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_1) /tests/basic 021.phpt
tony2001Tue May 16 22:59:20 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/tests/basic021.phpt
Log:
fix test
http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/021.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/tests/basic/021.phpt
diff -u php-src/tests/basic/021.phpt:1.1.2.1
php-src/tests/basic/021.phpt:1.1.2.2
--- php-src/tests/basic/021.phpt:1.1.2.1Wed May 3 21:35:26 2006
+++ php-src/tests/basic/021.phptTue May 16 22:59:20 2006
@@ -1,7 +1,7 @@
--TEST--
Bug #37276 (problems witch $_POST array)
--SKIPIF--
-?php if (php_sapi_name()=='cli') echo 'skip'; ?
+?php if (php_sapi_name()=='cli') die('skip'); ?
--POST_RAW--
Content-Type: multipart/form-data;
boundary=---20896060251896012921717172737
-20896060251896012921717172737
--
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) /tests/basic 021.phpt
tony2001Tue May 16 22:59:32 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/tests/basic021.phpt
Log:
fix test
http://cvs.php.net/viewcvs.cgi/php-src/tests/basic/021.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u
Index: php-src/tests/basic/021.phpt
diff -u php-src/tests/basic/021.phpt:1.1.2.1
php-src/tests/basic/021.phpt:1.1.2.1.2.1
--- php-src/tests/basic/021.phpt:1.1.2.1Wed May 3 21:35:26 2006
+++ php-src/tests/basic/021.phptTue May 16 22:59:32 2006
@@ -1,7 +1,7 @@
--TEST--
Bug #37276 (problems witch $_POST array)
--SKIPIF--
-?php if (php_sapi_name()=='cli') echo 'skip'; ?
+?php if (php_sapi_name()=='cli') die('skip'); ?
--POST_RAW--
Content-Type: multipart/form-data;
boundary=---20896060251896012921717172737
-20896060251896012921717172737
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
helly Tue May 16 23:04:52 2006 UTC
Modified files:
/php-srcrun-tests.php
Log:
- '_' is valid in test blocks
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.287r2=1.288diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.287 php-src/run-tests.php:1.288
--- php-src/run-tests.php:1.287 Sat May 13 14:01:19 2006
+++ php-src/run-tests.php Tue May 16 23:04:52 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.287 2006/05/13 14:01:19 helly Exp $ */
+/* $Id: run-tests.php,v 1.288 2006/05/16 23:04:52 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -399,7 +399,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.287 $'.\n;
+ echo '$Revision: 1.288 $'.\n;
exit(1);
default:
echo Illegal switch specified!\n;
@@ -989,7 +989,7 @@
$line = fgets($fp);
// Match the beginning of a section.
- if (preg_match('/^--([A-Z]+)--/', $line, $r)) {
+ if (preg_match('/^--([_A-Z]+)--/', $line, $r)) {
$section = $r[1];
$section_text[$section] = '';
$secfile = $section == 'FILE' || $section == 'FILEEOF';
--
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) / run-tests.php
helly Tue May 16 23:05:49 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcrun-tests.php
Log:
- MFH '_' is valid in test blocks
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.37.2.2r2=1.226.2.37.2.3diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.2
php-src/run-tests.php:1.226.2.37.2.3
--- php-src/run-tests.php:1.226.2.37.2.2Sat May 13 14:01:58 2006
+++ php-src/run-tests.php Tue May 16 23:05:49 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.2 2006/05/13 14:01:58 helly Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.3 2006/05/16 23:05:49 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -397,7 +397,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.2 $'.\n;
+ echo '$Revision: 1.226.2.37.2.3 $'.\n;
exit(1);
default:
echo Illegal switch '$switch'
specified!\n;
@@ -972,7 +972,7 @@
$line = fgets($fp);
// Match the beginning of a section.
- if (preg_match('/^--([A-Z]+)--/', $line, $r)) {
+ if (preg_match('/^--([_A-Z]+)--/', $line, $r)) {
$section = $r[1];
$section_text[$section] = '';
$secfile = $section == 'FILE' || $section == 'FILEEOF';
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c
helly Wed May 17 00:07:05 2006 UTC
Modified files:
/php-src/ext/simplexml simplexml.c
Log:
- Proto fix/add
http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.206r2=1.207diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.206
php-src/ext/simplexml/simplexml.c:1.207
--- php-src/ext/simplexml/simplexml.c:1.206 Fri Apr 14 15:15:21 2006
+++ php-src/ext/simplexml/simplexml.c Wed May 17 00:07:05 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.206 2006/04/14 15:15:21 helly Exp $ */
+/* $Id: simplexml.c,v 1.207 2006/05/17 00:07:05 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1055,7 +1055,7 @@
}
/* }}} */
-/* {{{ array SimpleXMLElement::xpath(string path)
+/* {{{ proto array SimpleXMLElement::xpath(string path)
Runs XPath query on the XML data */
SXE_METHOD(xpath)
{
@@ -1142,6 +1142,8 @@
xmlXPathFreeObject(retval);
}
+/* {{{ proto bool SimpleXMLElement::registerXPathNamespace(string prefix,
string ns)
+ Creates a prefix/ns context for the next XPath query */
SXE_METHOD(registerXPathNamespace)
{
php_sxe_object*sxe;
@@ -2277,7 +2279,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.206 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.207 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
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/simplexml simplexml.c
helly Wed May 17 00:07:28 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/simplexml simplexml.c
Log:
- MFH Proto fix/add
http://cvs.php.net/viewcvs.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.2r2=1.151.2.22.2.3diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.2
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.3
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.2Wed May 10 19:39:46 2006
+++ php-src/ext/simplexml/simplexml.c Wed May 17 00:07:28 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.2 2006/05/10 19:39:46 helly Exp $ */
+/* $Id: simplexml.c,v 1.151.2.22.2.3 2006/05/17 00:07:28 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1049,7 +1049,7 @@
}
/* }}} */
-/* {{{ array SimpleXMLElement::xpath(string path)
+/* {{{ proto array SimpleXMLElement::xpath(string path)
Runs XPath query on the XML data */
SXE_METHOD(xpath)
{
@@ -1136,6 +1136,8 @@
xmlXPathFreeObject(retval);
}
+/* {{{ proto bool SimpleXMLElement::registerXPathNamespace(string prefix,
string ns)
+ Creates a prefix/ns context for the next XPath query */
SXE_METHOD(registerXPathNamespace)
{
php_sxe_object*sxe;
@@ -2264,7 +2266,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, Simplexml support, enabled);
- php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.2 $);
+ php_info_print_table_row(2, Revision, $Revision: 1.151.2.22.2.3 $);
php_info_print_table_row(2, Schema support,
#ifdef LIBXML_SCHEMAS_ENABLED
enabled);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
