jani Wed Oct 31 13:22:45 2007 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/file bug43137.phpt
Modified files:
/php-src/ext/openssl openssl.c
/php-src/ext/standard filestat.c php_filestat.h
/php-src/ext/standard/tests/file 005_basic.phpt 005_error.phpt
/php-src/main/streams plain_wrapper.c
Log:
MFH: - Fixed bug #43137 (rmdir() and rename() do not clear statcache)
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.2&r2=1.98.2.5.2.41.2.3&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.2
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.3
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.2 Thu Sep 27 18:00:42 2007
+++ php-src/ext/openssl/openssl.c Wed Oct 31 13:22:44 2007
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.2 2007/09/27 18:00:42 dmitry Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.3 2007/10/31 13:22:44 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -48,6 +48,9 @@
#include <openssl/ssl.h>
#include <openssl/pkcs12.h>
+/* Common */
+#include <time.h>
+
#define DEFAULT_KEY_LENGTH 512
#define MIN_KEY_LENGTH 384
@@ -1233,7 +1236,7 @@
}
/* }}} */
-/* {{{ proto int openssl_x509_checkpurpose(mixed x509cert, int purpose, array
cainfo [, string untrustedfile])
+/* {{{ proto mixed openssl_x509_checkpurpose(mixed x509cert, int purpose,
array cainfo [, string untrustedfile])
Checks the CERT to see if it can be used for the purpose in purpose. cainfo
holds information about trusted CAs */
PHP_FUNCTION(openssl_x509_checkpurpose)
{
@@ -1244,10 +1247,9 @@
STACK_OF(X509) * untrustedchain = NULL;
long purpose;
char * untrusted = NULL;
- int untrusted_len;
+ int untrusted_len, ret;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Zl|a!s", &zcert,
&purpose, &zcainfo, &untrusted, &untrusted_len)
- == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Zl|a!s", &zcert,
&purpose, &zcainfo, &untrusted, &untrusted_len) == FAILURE) {
return;
}
@@ -1268,7 +1270,13 @@
if (cert == NULL) {
goto clean_exit;
}
- RETVAL_LONG(check_cert(cainfo, cert, untrustedchain, purpose));
+
+ ret = check_cert(cainfo, cert, untrustedchain, purpose);
+ if (ret != 0 && ret != 1) {
+ RETVAL_LONG(ret);
+ } else {
+ RETVAL_BOOL(ret);
+ }
clean_exit:
if (certresource == 1 && cert) {
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/filestat.c?r1=1.136.2.8.2.14&r2=1.136.2.8.2.14.2.1&diff_format=u
Index: php-src/ext/standard/filestat.c
diff -u php-src/ext/standard/filestat.c:1.136.2.8.2.14
php-src/ext/standard/filestat.c:1.136.2.8.2.14.2.1
--- php-src/ext/standard/filestat.c:1.136.2.8.2.14 Fri Sep 21 14:05:18 2007
+++ php-src/ext/standard/filestat.c Wed Oct 31 13:22:44 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filestat.c,v 1.136.2.8.2.14 2007/09/21 14:05:18 tony2001 Exp $ */
+/* $Id: filestat.c,v 1.136.2.8.2.14.2.1 2007/10/31 13:22:44 jani Exp $ */
#include "php.h"
#include "safe_mode.h"
@@ -698,14 +698,10 @@
/* }}} */
#endif
-/* {{{ proto void clearstatcache(void)
- Clear file stat cache */
-PHP_FUNCTION(clearstatcache)
+/* {{{ php_clear_stat_cache()
+*/
+PHPAPI void php_clear_stat_cache(TSRMLS_D)
{
- if (ZEND_NUM_ARGS()) {
- WRONG_PARAM_COUNT;
- }
-
if (BG(CurrentStatFile)) {
efree(BG(CurrentStatFile));
BG(CurrentStatFile) = NULL;
@@ -718,6 +714,17 @@
}
/* }}} */
+/* {{{ proto void clearstatcache(void)
+ Clear file stat cache */
+PHP_FUNCTION(clearstatcache)
+{
+ if (ZEND_NUM_ARGS()) {
+ WRONG_PARAM_COUNT;
+ }
+ php_clear_stat_cache(TSRMLS_C);
+}
+/* }}} */
+
#define IS_LINK_OPERATION(__t) ((__t) == FS_TYPE || (__t) == FS_IS_LINK ||
(__t) == FS_LSTAT)
#define IS_EXISTS_CHECK(__t) ((__t) == FS_EXISTS || (__t) == FS_IS_W || (__t)
== FS_IS_R || (__t) == FS_IS_X || (__t) == FS_IS_FILE || (__t) == FS_IS_DIR ||
(__t) == FS_IS_LINK)
#define IS_ABLE_CHECK(__t) ((__t) == FS_IS_R || (__t) == FS_IS_W || (__t) ==
FS_IS_X)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_filestat.h?r1=1.24.2.4.2.1.2.1&r2=1.24.2.4.2.1.2.2&diff_format=u
Index: php-src/ext/standard/php_filestat.h
diff -u php-src/ext/standard/php_filestat.h:1.24.2.4.2.1.2.1
php-src/ext/standard/php_filestat.h:1.24.2.4.2.1.2.2
--- php-src/ext/standard/php_filestat.h:1.24.2.4.2.1.2.1 Sun Oct 7
05:22:07 2007
+++ php-src/ext/standard/php_filestat.h Wed Oct 31 13:22:44 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_filestat.h,v 1.24.2.4.2.1.2.1 2007/10/07 05:22:07 davidw Exp $ */
+/* $Id: php_filestat.h,v 1.24.2.4.2.1.2.2 2007/10/31 13:22:44 jani Exp $ */
#ifndef PHP_FILESTAT_H
#define PHP_FILESTAT_H
@@ -87,6 +87,7 @@
typedef int php_stat_len;
#endif
+PHPAPI void php_clear_stat_cache(TSRMLS_D);
PHPAPI void php_stat(const char *filename, php_stat_len filename_length, int
type, zval *return_value TSRMLS_DC);
/* Switches for various filestat functions: */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/005_basic.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/005_basic.phpt
diff -u php-src/ext/standard/tests/file/005_basic.phpt:1.1.2.1
php-src/ext/standard/tests/file/005_basic.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/file/005_basic.phpt:1.1.2.1 Mon Jun 11
16:14:59 2007
+++ php-src/ext/standard/tests/file/005_basic.phpt Wed Oct 31 13:22:45 2007
@@ -1,5 +1,5 @@
--TEST--
-Test fileatime(),filemtime(),filectime() & touch() functions : basic
functionality
+Test fileatime(), filemtime(), filectime() & touch() functions : basic
functionality
--FILE--
<?php
/*
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/005_error.phpt?r1=1.1.2.1&r2=1.1.2.1.2.1&diff_format=u
Index: php-src/ext/standard/tests/file/005_error.phpt
diff -u php-src/ext/standard/tests/file/005_error.phpt:1.1.2.1
php-src/ext/standard/tests/file/005_error.phpt:1.1.2.1.2.1
--- php-src/ext/standard/tests/file/005_error.phpt:1.1.2.1 Mon Jun 11
16:14:59 2007
+++ php-src/ext/standard/tests/file/005_error.phpt Wed Oct 31 13:22:45 2007
@@ -1,5 +1,5 @@
--TEST--
-Test fileatime(), filemtime(), filectime() & touch() functions: error
conditions
+Test fileatime(), filemtime(), filectime() & touch() functions : error
conditions
--FILE--
<?php
/*
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.23&r2=1.52.2.6.2.23.2.1&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23.2.1
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.23 Wed Jul 25 16:34:05 2007
+++ php-src/main/streams/plain_wrapper.c Wed Oct 31 13:22:45 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.23 2007/07/25 16:34:05 dmitry Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.23.2.1 2007/10/31 13:22:45 jani Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -24,6 +24,7 @@
#include "php_open_temporary_file.h"
#include "ext/standard/file.h"
#include "ext/standard/flock_compat.h"
+#include "ext/standard/php_filestat.h"
#include <stddef.h>
#include <fcntl.h>
#if HAVE_SYS_WAIT_H
@@ -1032,12 +1033,10 @@
}
return 0;
}
+
/* Clear stat cache */
- ZVAL_STRINGL(&funcname, "clearstatcache", sizeof("clearstatcache")-1,
0);
- call_user_function_ex(CG(function_table), NULL, &funcname, &retval, 0,
NULL, 0, NULL TSRMLS_CC);
- if (retval) {
- zval_ptr_dtor(&retval);
- }
+ php_clear_stat_cache(TSRMLS_C);
+
return 1;
}
@@ -1107,6 +1106,9 @@
return 0;
}
+ /* Clear stat cache */
+ php_clear_stat_cache(TSRMLS_C);
+
return 1;
}
@@ -1151,7 +1153,7 @@
}
else {
/* find a top level directory we need to create */
- while ( (p = strrchr(buf + offset, DEFAULT_SLASH)) || (
offset !=1 && (p = strrchr(buf, DEFAULT_SLASH))) ) {
+ while ( (p = strrchr(buf + offset, DEFAULT_SLASH)) ||
(offset != 1 && (p = strrchr(buf, DEFAULT_SLASH))) ) {
int n = 0;
*p = '\0';
@@ -1218,6 +1220,9 @@
return 0;
}
+ /* Clear stat cache */
+ php_clear_stat_cache(TSRMLS_C);
+
return 1;
}
@@ -1412,9 +1417,6 @@
}
/* }}} */
-
-
-
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug43137.phpt?view=markup&rev=1.1
Index: php-src/ext/standard/tests/file/bug43137.phpt
+++ php-src/ext/standard/tests/file/bug43137.phpt
--TEST--
Bug #43137 (rmdir() and rename() do not clear statcache)
--FILE--
<?php
$toname = "TO_" . md5(microtime());
$dirname = "FROM_" . md5(microtime());
mkdir($dirname);
var_dump(is_dir($dirname)); // Expected: true
rename($dirname, $toname);
var_dump(is_dir($dirname)); // Expected: false
var_dump(is_dir($toname)); // Expected: true
rmdir($toname);
var_dump(is_dir($toname)); // Expected: false
?>
--EXPECT--
bool(true)
bool(false)
bool(true)
bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
