[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Tue Aug 12 01:32:17 2008 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3135r2=1.3136diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3135 php-src/ChangeLog:1.3136 --- php-src/ChangeLog:1.3135Mon Aug 11 01:32:46 2008 +++ php-src/ChangeLog Tue Aug 12 01:32:16 2008 @@ -1,3 +1,344 @@ +2008-08-11 Arnaud Le Blanc [EMAIL PROTECTED] + +* ext/standard/dir.c + ext/standard/tests/file/chroot_001.phpt + ext/standard/tests/file/chroot_001.phpt + ext/standard/tests/file/chroot_001.phpt: + clear stat cache in chroot() + +2008-08-11 Greg Beaver [EMAIL PROTECTED] + +* ext/phar/tests/zip/corrupt_010.phpt + ext/phar/tests/zip/corrupt_010.phpt + ext/phar/tests/zip/files/corrupt3.php.inc + ext/phar/tests/zip/files/corrupt_zipmaker.php.inc + ext/phar/tests/zip/files/disknumber.zip + ext/phar/tests/zip/files/disknumber.zip + ext/phar/tests/zip/files/extralen_toolong.zip: + + file corrupt_010.phpt was initially added on branch PHP_5_3. + +2008-08-11 Arnaud Le Blanc [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + news + +* (PHP_5_2) + ext/standard/dir.c + ext/standard/dir.c + ext/standard/tests/file/bug45181.phpt + ext/standard/tests/file/bug45181.phpt: + MFH: Fixed #45181 (chdir() should clear relative entries in stat cache) + +* ext/standard/dir.c + ext/standard/tests/file/bug45181.phpt + ext/standard/tests/file/bug45181.phpt + ext/standard/tests/file/bug45181.phpt: + Fixed #45181 (chdir() should clear relative entries in stat cache) + +2008-08-11 Christian Seiler [EMAIL PROTECTED] + +* ext/reflection/php_reflection.c + ext/reflection/tests/closures_003.phpt + ext/reflection/tests/closures_003.phpt + ext/reflection/tests/closures_004.phpt + ext/reflection/tests/closures_004.phpt + ext/reflection/tests/reflectionParameter_invalidMethodInConstructor.phpt + ext/reflection/tests/reflectionParameter_invalidMethodInConstructor.phpt: + - Fixed sefaults (tests added) + +* (PHP_5_2) + ext/reflection/php_reflection.c + ext/reflection/tests/reflectionParameter_invalidMethodInConstructor.phpt + ext/reflection/tests/reflectionParameter_invalidMethodInConstructor.phpt: + - Fixed segmentation fault (test added) + +2008-08-11 Felipe Pena [EMAIL PROTECTED] + +* (PHP_5_3) + ext/intl/intl_convert.c + ext/intl/intl_error.c + ext/intl/php_intl.c + ext/intl/collator/collator.c + ext/intl/collator/collator_attr.c + ext/intl/collator/collator_class.c + ext/intl/collator/collator_compare.c + ext/intl/collator/collator_convert.c + ext/intl/collator/collator_create.c + ext/intl/collator/collator_error.c + ext/intl/collator/collator_locale.c + ext/intl/collator/collator_sort.c + ext/intl/common/common_error.c + ext/intl/dateformat/dateformat.c + ext/intl/dateformat/dateformat_attr.c + ext/intl/dateformat/dateformat_class.c + ext/intl/dateformat/dateformat_format.c + ext/intl/dateformat/dateformat_parse.c + ext/intl/formatter/formatter.c + ext/intl/formatter/formatter_attr.c + ext/intl/formatter/formatter_class.c + ext/intl/formatter/formatter_format.c + ext/intl/formatter/formatter_main.c + ext/intl/formatter/formatter_parse.c + ext/intl/grapheme/grapheme_string.c + ext/intl/msgformat/msgformat.c + ext/intl/msgformat/msgformat_attr.c + ext/intl/msgformat/msgformat_class.c + ext/intl/msgformat/msgformat_format.c + ext/intl/msgformat/msgformat_parse.c + ext/intl/normalizer/normalizer.c + ext/intl/normalizer/normalizer_class.c + ext/intl/normalizer/normalizer_normalize.c: + MFH: + - Added arginfo + - Fixed WS + - Changed C++ comments to C comments + +* ext/intl/intl_convert.c + ext/intl/intl_error.c + ext/intl/php_intl.c + ext/intl/collator/collator.c + ext/intl/collator/collator_attr.c + ext/intl/collator/collator_class.c + ext/intl/collator/collator_compare.c + ext/intl/collator/collator_convert.c + ext/intl/collator/collator_create.c + ext/intl/collator/collator_error.c + ext/intl/collator/collator_locale.c + ext/intl/collator/collator_sort.c + ext/intl/common/common_error.c + ext/intl/dateformat/dateformat.c + ext/intl/dateformat/dateformat_attr.c + ext/intl/dateformat/dateformat_class.c + ext/intl/dateformat/dateformat_format.c + ext/intl/dateformat/dateformat_parse.c + ext/intl/formatter/formatter.c + ext/intl/formatter/formatter_attr.c + ext/intl/formatter/formatter_class.c + ext/intl/formatter/formatter_format.c + ext/intl/formatter/formatter_main.c + ext/intl/formatter/formatter_parse.c +
[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Aug 12 01:32:21 2008 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1357r2=1.1358diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1357 ZendEngine2/ChangeLog:1.1358 --- ZendEngine2/ChangeLog:1.1357Mon Aug 11 01:32:53 2008 +++ ZendEngine2/ChangeLog Tue Aug 12 01:32:21 2008 @@ -1,3 +1,34 @@ +2008-08-11 Marcus Boerger [EMAIL PROTECTED] + +* zend_execute_API.c: + - Fix shutdown order + +* (PHP_5_3) + zend.h + zend_API.c + zend_globals.h: + - MFH Fix memleak with new error handling stack'ing + +* zend.h + zend_API.c + zend_globals.h: + - Fix memleak with new error handling stack'ing + +* (PHP_5_3) + zend_closures.c: + - WS (actually my falut) + +2008-08-11 Dmitry Stogov [EMAIL PROTECTED] + +* zend_closures.c + zend_closures.c + zend_closures.h + zend_closures.h + tests/closure_022.phpt + tests/closure_022.phpt: + - Made closures implementation reflection friendly (Christian) + - Changed E_ERROR(s) into E_RECOVERABLE_ERROR(s) (Marcus) + 2008-08-10 Marcus Boerger [EMAIL PROTECTED] * zend_vm_def.h @@ -25432,7 +25463,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1357 2008/08/11 01:32:53 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1358 2008/08/12 01:32:21 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -27156,7 +27187,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1357 2008/08/11 01:32:53 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1358 2008/08/12 01:32:21 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file copy_variation13.phpt
pajoye Mon Aug 11 11:52:10 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filecopy_variation13.phpt Log: - MFH: make it platform independent (/ vs \) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation13.phpt?r1=1.1.2.2.2.1r2=1.1.2.2.2.2diff_format=u Index: php-src/ext/standard/tests/file/copy_variation13.phpt diff -u php-src/ext/standard/tests/file/copy_variation13.phpt:1.1.2.2.2.1 php-src/ext/standard/tests/file/copy_variation13.phpt:1.1.2.2.2.2 --- php-src/ext/standard/tests/file/copy_variation13.phpt:1.1.2.2.2.1 Mon Nov 5 17:43:19 2007 +++ php-src/ext/standard/tests/file/copy_variation13.phpt Mon Aug 11 11:52:10 2008 @@ -44,7 +44,7 @@ *** Test copy() function: Trying to copy dir to file *** *** Testing copy() in copying dir to file *** -Warning: copy(): The first argument to copy() function cannot be a directory in %s/copy_variation13.php on line %d +Warning: copy(): The first argument to copy() function cannot be a directory in %scopy_variation13.php on line %d bool(false) bool(true) bool(true) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer / ExtensionsFeatures53.wxs ExtensionsFragment.wxs
jmertic Mon Aug 11 12:06:19 2008 UTC Modified files: /win-installer ExtensionsFeatures53.wxs ExtensionsFragment.wxs Log: Add libpq.dll to the installer. Removed references to older oci extensions. http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.3r2=1.4diff_format=u Index: win-installer/ExtensionsFeatures53.wxs diff -u win-installer/ExtensionsFeatures53.wxs:1.3 win-installer/ExtensionsFeatures53.wxs:1.4 --- win-installer/ExtensionsFeatures53.wxs:1.3 Thu Aug 7 17:34:55 2008 +++ win-installer/ExtensionsFeatures53.wxs Mon Aug 11 12:06:19 2008 @@ -247,12 +247,6 @@ Feature AllowAdvertise=no Id=ext_php_operator Title=$(loc.Featureext_php_operatorTitle) Description=$(loc.Featureext_php_operatorDescription) Level=10 ComponentRef Id=php_operator/ /Feature - Feature AllowAdvertise=no Id=ext_php_oracle Title=$(loc.Featureext_php_oracleTitle) Description=$(loc.Featureext_php_oracleDescription) Level=10 - ComponentRef Id=php_oracle/ - /Feature - Feature AllowAdvertise=no Id=ext_php_oci8 Title=$(loc.Featureext_php_oci8Title) Description=$(loc.Featureext_php_oci8Description) Level=10 - ComponentRef Id=php_oci8/ - /Feature Feature AllowAdvertise=no Id=ext_php_oci8_11g Title=$(loc.Featureext_php_oci8_11gTitle) Description=$(loc.Featureext_php_oci8_11gDescription) Level=10 ComponentRef Id=php_oci8_11g/ /Feature @@ -289,9 +283,6 @@ Feature AllowAdvertise=no Id=ext_php_pdo_mysql Title=$(loc.Featureext_php_pdo_mysqlTitle) Description=$(loc.Featureext_php_pdo_mysqlDescription) TypicalDefault=install Level=1 ComponentRef Id=php_pdo_mysql/ /Feature - Feature AllowAdvertise=no Id=ext_php_pdo_oci Title=$(loc.Featureext_php_pdo_ociTitle) Description=$(loc.Featureext_php_pdo_ociDescription) Level=10 - ComponentRef Id=php_pdo_oci/ - /Feature Feature AllowAdvertise=no Id=ext_php_pdo_oci8 Title=$(loc.Featureext_php_pdo_oci8Title) Description=$(loc.Featureext_php_pdo_oci8Description) Level=10 ComponentRef Id=php_pdo_oci8/ /Feature @@ -300,6 +291,7 @@ /Feature Feature AllowAdvertise=no Id=ext_php_pdo_pgsql Title=$(loc.Featureext_php_pdo_pgsqlTitle) Description=$(loc.Featureext_php_pdo_pgsqlDescription) Level=10 ComponentRef Id=php_pdo_pgsql/ +ComponentRef Id=libpqDLL/ /Feature Feature AllowAdvertise=no Id=ext_php_pdo_sqlite Title=$(loc.Featureext_php_pdo_sqliteTitle) Description=$(loc.Featureext_php_pdo_sqliteDescription) TypicalDefault=install Level=1 ComponentRef Id=php_pdo_sqlite/ @@ -323,6 +315,7 @@ /Feature Feature AllowAdvertise=no Id=ext_php_pgsql Title=$(loc.Featureext_php_pgsqlTitle) Description=$(loc.Featureext_php_pgsqlDescription) TypicalDefault=install Level=1 ComponentRef Id=php_pgsql/ +ComponentRef Id=libpqDLL/ /Feature Feature AllowAdvertise=no Id=ext_php_printer Title=$(loc.Featureext_php_printerTitle) Description=$(loc.Featureext_php_printerDescription) Level=10 ComponentRef Id=php_printer/ http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFragment.wxs?r1=1.3r2=1.4diff_format=u Index: win-installer/ExtensionsFragment.wxs diff -u win-installer/ExtensionsFragment.wxs:1.3 win-installer/ExtensionsFragment.wxs:1.4 --- win-installer/ExtensionsFragment.wxs:1.3Mon Aug 4 14:59:30 2008 +++ win-installer/ExtensionsFragment.wxsMon Aug 11 12:06:19 2008 @@ -26,6 +26,9 @@ Component Id=msqlDLL DiskId=1 Guid=C37BB17E-8C9D-4FB6-AD40-100BDDFDADD5 File Id=filemsqlDLL Name=msql.dll Source=Files\msql.dll / /Component + Component Id=libpqDLL DiskId=1 Guid=6C109270-64B0-11DD-AD8B-0800200C9A66 + File Id=filelibpqDLL Name=libpq.dll Source=Files\libpq.dll / + /Component Component Id=ssleay32DLL DiskId=1 Guid=D7E5F122-9764-4165-BDDA-922D60408C2F File Id=filessleay32DLL Name=ssleay32.dll Source=Files\ssleay32.dll /
[PHP-CVS] cvs: win-installer / ExtensionsFeatures53.wxs
jmertic Mon Aug 11 12:18:37 2008 UTC Modified files: /win-installer ExtensionsFeatures53.wxs Log: Remove libmcrypt dependency for 5.3, since it's statically built now. http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.4r2=1.5diff_format=u Index: win-installer/ExtensionsFeatures53.wxs diff -u win-installer/ExtensionsFeatures53.wxs:1.4 win-installer/ExtensionsFeatures53.wxs:1.5 --- win-installer/ExtensionsFeatures53.wxs:1.4 Mon Aug 11 12:06:19 2008 +++ win-installer/ExtensionsFeatures53.wxs Mon Aug 11 12:18:37 2008 @@ -195,7 +195,6 @@ /Feature Feature AllowAdvertise=no Id=ext_php_mcrypt Title=$(loc.Featureext_php_mcryptTitle) Description=$(loc.Featureext_php_mcryptDescription) TypicalDefault=install Level=1 ComponentRef Id=php_mcrypt/ - ComponentRef Id=libmcryptDLL/ /Feature Feature AllowAdvertise=no Id=ext_php_mcve Title=$(loc.Featureext_php_mcveTitle) Description=$(loc.Featureext_php_mcveDescription) Level=10 ComponentRef Id=php_mcve/ -- 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/file copy_variation4.phpt
pajoye Mon Aug 11 12:20:24 2008 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filecopy_variation4.phpt Log: - remove and add again as text not binary 1/2 -- 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/file copy_variation4.phpt
pajoye Mon Aug 11 12:20:42 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filecopy_variation4.phpt Log: - remove and add again as text not binary 2/2 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation4.phpt?r1=1.1.2.2.2.3r2=1.1.2.2.2.4diff_format=u Index: php-src/ext/standard/tests/file/copy_variation4.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mysqli mysqli_nonapi.c
johannesMon Aug 11 12:32:48 2008 UTC
Modified files:
/php-src/ext/mysqli mysqli_nonapi.c
Log:
- Fix #45763 (mysqli::multi_query does not work with mysqlnd)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.85r2=1.86diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.85
php-src/ext/mysqli/mysqli_nonapi.c:1.86
--- php-src/ext/mysqli/mysqli_nonapi.c:1.85 Tue Jul 22 23:43:14 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Mon Aug 11 12:32:47 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_nonapi.c,v 1.85 2008/07/22 23:43:14 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.86 2008/08/11 12:32:47 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -278,11 +278,7 @@
MyG(num_links)++;
-#if !defined(MYSQLI_USE_MYSQLND)
mysql-multi_query = 0;
-#else
- mysql-multi_query = 1;
-#endif
if (!object || !instanceof_function(Z_OBJCE_P(object),
mysqli_link_class_entry TSRMLS_CC)) {
MYSQLI_RETURN_RESOURCE(mysqli_resource,
mysqli_link_class_entry);
--
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) / NEWS /ext/mysqli mysqli_nonapi.c
johannesMon Aug 11 12:33:56 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqli mysqli_nonapi.c
/php-srcNEWS
Log:
MFH: Fix #45763 (mysqli::multi_query does not work with mysqlnd)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.54.2.7.2.5.2.14r2=1.54.2.7.2.5.2.15diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.14
php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.15
--- php-src/ext/mysqli/mysqli_nonapi.c:1.54.2.7.2.5.2.14Tue Jul 22
23:44:23 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Mon Aug 11 12:33:55 2008
@@ -17,7 +17,7 @@
| Ulf Wendel [EMAIL PROTECTED]
|
+--+
- $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.14 2008/07/22 23:44:23 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.54.2.7.2.5.2.15 2008/08/11 12:33:55 johannes Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -271,11 +271,7 @@
MyG(num_links)++;
-#if !defined(MYSQLI_USE_MYSQLND)
mysql-multi_query = 0;
-#else
- mysql-multi_query = 1;
-#endif
if (!object || !instanceof_function(Z_OBJCE_P(object),
mysqli_link_class_entry TSRMLS_CC)) {
MYSQLI_RETURN_RESOURCE(mysqli_resource,
mysqli_link_class_entry);
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.262r2=1.2027.2.547.2.965.2.263diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.262
php-src/NEWS:1.2027.2.547.2.965.2.263
--- php-src/NEWS:1.2027.2.547.2.965.2.262 Sun Aug 10 22:02:05 2008
+++ php-src/NEWSMon Aug 11 12:33:56 2008
@@ -13,6 +13,7 @@
- Fixed a bug causing miscalculations with the last weekday of n month
relative time string. (Derick)
+- Fixed bug #45763 (mysqli::multi_query does not work with mysqlnd). (Johannes)
- Fixed bug #45757 (FreeBSD4.11 build failure: failed include; stdint.h).
(Hannes)
- Fixed bug #45717 (Fileinfo/libmagic build fails, missing err.h and getopt.h).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests closures_001.phpt closures_002.phpt reflectionParameter_export_error2.phpt
helly Mon Aug 11 12:36:01 2008 UTC
Added files:
/php-src/ext/reflection/tests closures_001.phpt closures_002.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
/php-src/ext/reflection/tests
reflectionParameter_export_error2.phpt
Log:
- Closure/Reflection integration (original idea by Christian Seiler)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.310r2=1.311diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.310
php-src/ext/reflection/php_reflection.c:1.311
--- php-src/ext/reflection/php_reflection.c:1.310 Mon Aug 11 00:46:14 2008
+++ php-src/ext/reflection/php_reflection.c Mon Aug 11 12:36:00 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.310 2008/08/11 00:46:14 felipe Exp $ */
+/* $Id: php_reflection.c,v 1.311 2008/08/11 12:36:00 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -187,11 +187,18 @@
zend_function *fptr;
} parameter_reference;
+typedef enum {
+ REF_TYPE_OTHER, /* Must be 0 */
+ REF_TYPE_FUNCTION,
+ REF_TYPE_PARAMETER,
+ REF_TYPE_PROPERTY,
+} reflection_type_t;
+
/* Struct for reflection objects */
typedef struct {
zend_object zo;
void *ptr;
- unsigned int free_ptr:1;
+ reflection_type_t ref_type;
zval *obj;
zend_class_entry *ce;
} reflection_object;
@@ -221,34 +228,45 @@
}
/* }}} */
-static void reflection_free_objects_storage(void *object TSRMLS_DC) /* {{{ */
+static void _free_function(zend_function *fptr TSRMLS_DC) /* {{{ */
{
- reflection_object *intern = (reflection_object *) object;
-
- if (intern-free_ptr intern-ptr) {
- efree(intern-ptr);
- intern-ptr = NULL;
+ if (fptr
+fptr-type != ZEND_USER_FUNCTION
+(fptr-internal_function.fn_flags
ZEND_ACC_CALL_VIA_HANDLER) != 0
+ ) {
+ efree(fptr-internal_function.function_name.v);
+ efree(fptr);
}
- if (intern-obj) {
- zval_ptr_dtor(intern-obj);
- }
- zend_objects_free_object_storage(object TSRMLS_CC);
}
/* }}} */
-static void reflection_objects_clone(void *object, void **object_clone
TSRMLS_DC) /* {{{ */
+static void reflection_free_objects_storage(void *object TSRMLS_DC) /* {{{ */
{
reflection_object *intern = (reflection_object *) object;
- reflection_object **intern_clone = (reflection_object **) object_clone;
+ parameter_reference *reference;
- *intern_clone = emalloc(sizeof(reflection_object));
- zend_object_std_init((*intern_clone)-zo, intern-zo.ce TSRMLS_CC);
- (*intern_clone)-ptr = intern-ptr;
- (*intern_clone)-free_ptr = intern-free_ptr;
- (*intern_clone)-obj = intern-obj;
+ if (intern-ptr) {
+ switch (intern-ref_type) {
+ case REF_TYPE_PARAMETER:
+ reference = (parameter_reference*)intern-ptr;
+ _free_function(reference-fptr TSRMLS_CC);
+ efree(intern-ptr);
+ break;
+ case REF_TYPE_FUNCTION:
+ _free_function(intern-ptr TSRMLS_CC);
+ break;
+ case REF_TYPE_PROPERTY:
+ efree(intern-ptr);
+ break;
+ case REF_TYPE_OTHER:
+ break;
+ }
+ }
+ intern-ptr = NULL;
if (intern-obj) {
- zval_add_ref(intern-obj);
+ zval_ptr_dtor(intern-obj);
}
+ zend_objects_free_object_storage(object TSRMLS_CC);
}
/* }}} */
@@ -258,14 +276,12 @@
zend_object_value retval;
reflection_object *intern;
- intern = emalloc(sizeof(reflection_object));
- intern-ptr = NULL;
- intern-obj = NULL;
- intern-free_ptr = 0;
+ intern = ecalloc(1, sizeof(reflection_object));
+ intern-zo.ce = class_type;
zend_object_std_init(intern-zo, class_type TSRMLS_CC);
zend_hash_copy(intern-zo.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) tmp, sizeof(zval *));
- retval.handle = zend_objects_store_put(intern, NULL,
reflection_free_objects_storage, reflection_objects_clone TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, NULL,
reflection_free_objects_storage, NULL TSRMLS_CC);
retval.handlers = reflection_object_handlers;
return retval;
}
@@ -528,20 +544,34 @@
zstr key;
uint key_len;
ulong num_index;
- uint
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection php_reflection.c /ext/reflection/tests closures_001.phpt closures_002.phpt reflectionParameter_export_error2.phpt
helly Mon Aug 11 12:43:22 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/reflection/tests closures_001.phpt closures_002.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
/php-src/ext/reflection/tests
reflectionParameter_export_error2.phpt
Log:
- MFH Closure/Reflection integration (original idea by Christian Seiler)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.28r2=1.164.2.33.2.45.2.29diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.28
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.29
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.28Mon Aug
11 00:47:45 2008
+++ php-src/ext/reflection/php_reflection.c Mon Aug 11 12:43:21 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.28 2008/08/11 00:47:45 felipe Exp
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.29 2008/08/11 12:43:21 helly Exp
$ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -192,11 +192,18 @@
zend_function *fptr;
} parameter_reference;
+typedef enum {
+ REF_TYPE_OTHER, /* Must be 0 */
+ REF_TYPE_FUNCTION,
+ REF_TYPE_PARAMETER,
+ REF_TYPE_PROPERTY,
+} reflection_type_t;
+
/* Struct for reflection objects */
typedef struct {
zend_object zo;
void *ptr;
- unsigned int free_ptr:1;
+ reflection_type_t ref_type;
zval *obj;
zend_class_entry *ce;
} reflection_object;
@@ -224,33 +231,45 @@
class_entry-interfaces[num_interfaces - 1] = interface_entry;
}
-static void reflection_free_objects_storage(void *object TSRMLS_DC)
+static void _free_function(zend_function *fptr TSRMLS_DC) /* {{{ */
{
- reflection_object *intern = (reflection_object *) object;
-
- if (intern-free_ptr intern-ptr) {
- efree(intern-ptr);
- intern-ptr = NULL;
- }
- if (intern-obj) {
- zval_ptr_dtor(intern-obj);
+ if (fptr
+fptr-type == ZEND_INTERNAL_FUNCTION
+(fptr-internal_function.fn_flags
ZEND_ACC_CALL_VIA_HANDLER) != 0
+ ) {
+ efree(fptr-internal_function.function_name);
+ efree(fptr);
}
- zend_objects_free_object_storage(object TSRMLS_CC);
}
+/* }}} */
-static void reflection_objects_clone(void *object, void **object_clone
TSRMLS_DC)
+static void reflection_free_objects_storage(void *object TSRMLS_DC)
{
reflection_object *intern = (reflection_object *) object;
- reflection_object **intern_clone = (reflection_object **) object_clone;
+ parameter_reference *reference;
- *intern_clone = emalloc(sizeof(reflection_object));
- zend_object_std_init((*intern_clone)-zo, intern-zo.ce TSRMLS_CC);
- (*intern_clone)-ptr = intern-ptr;
- (*intern_clone)-free_ptr = intern-free_ptr;
- (*intern_clone)-obj = intern-obj;
+ if (intern-ptr) {
+ switch (intern-ref_type) {
+ case REF_TYPE_PARAMETER:
+ reference = (parameter_reference*)intern-ptr;
+ _free_function(reference-fptr TSRMLS_CC);
+ efree(intern-ptr);
+ break;
+ case REF_TYPE_FUNCTION:
+ _free_function(intern-ptr TSRMLS_CC);
+ break;
+ case REF_TYPE_PROPERTY:
+ efree(intern-ptr);
+ break;
+ case REF_TYPE_OTHER:
+ break;
+ }
+ }
+ intern-ptr = NULL;
if (intern-obj) {
- zval_add_ref(intern-obj);
+ zval_ptr_dtor(intern-obj);
}
+ zend_objects_free_object_storage(object TSRMLS_CC);
}
static zend_object_value reflection_objects_new(zend_class_entry *class_type
TSRMLS_DC)
@@ -259,16 +278,12 @@
zend_object_value retval;
reflection_object *intern;
- intern = emalloc(sizeof(reflection_object));
+ intern = ecalloc(1, sizeof(reflection_object));
intern-zo.ce = class_type;
- intern-zo.guards = NULL;
- intern-ptr = NULL;
- intern-obj = NULL;
- intern-free_ptr = 0;
zend_object_std_init(intern-zo, class_type TSRMLS_CC);
zend_hash_copy(intern-zo.properties, class_type-default_properties,
(copy_ctor_func_t) zval_add_ref, (void *) tmp, sizeof(zval *));
- retval.handle = zend_objects_store_put(intern, NULL,
reflection_free_objects_storage, reflection_objects_clone TSRMLS_CC);
+ retval.handle = zend_objects_store_put(intern, NULL,
reflection_free_objects_storage, NULL TSRMLS_CC);
retval.handlers =
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/file copy_variation4.phpt
On Mon, Aug 11, 2008 at 2:20 PM, Pierre-Alain Joye [EMAIL PROTECTED] wrote: pajoye Mon Aug 11 12:20:42 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filecopy_variation4.phpt Log: - remove and add again as text not binary 2/2 That failed. If someone knows a way to define this file as text, please raise the hand :) -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
felipe Mon Aug 11 12:45:37 2008 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
- Fix build (ZTS)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.311r2=1.312diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.311
php-src/ext/reflection/php_reflection.c:1.312
--- php-src/ext/reflection/php_reflection.c:1.311 Mon Aug 11 12:36:00 2008
+++ php-src/ext/reflection/php_reflection.c Mon Aug 11 12:45:37 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.311 2008/08/11 12:36:00 helly Exp $ */
+/* $Id: php_reflection.c,v 1.312 2008/08/11 12:45:37 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3369,7 +3369,7 @@
array_init(return_value);
zend_hash_apply_with_arguments(ce-function_table TSRMLS_CC,
(apply_func_args_t) _addmethod_va, 4, ce, return_value, filter, intern-obj);
- if (intern-obj instanceof_function(ce, zend_ce_closure)) {
+ if (intern-obj instanceof_function(ce, zend_ce_closure TSRMLS_CC)) {
zend_function *closure =
zend_get_closure_invoke_method(intern-obj TSRMLS_CC);
if (closure) {
_addmethod(closure, ce, return_value, filter,
intern-obj TSRMLS_CC);
@@ -5377,7 +5377,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.311
2008/08/11 12:36:00 helly Exp $);
+ php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.312
2008/08/11 12:45:37 felipe Exp $);
php_info_print_table_end();
} /* }}} */
--
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/reflection php_reflection.c
felipe Mon Aug 11 12:48:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/reflection php_reflection.c
Log:
- Fix build (ZTS)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.29r2=1.164.2.33.2.45.2.30diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.29
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.30
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.29Mon Aug
11 12:43:21 2008
+++ php-src/ext/reflection/php_reflection.c Mon Aug 11 12:48:22 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.29 2008/08/11 12:43:21 helly Exp
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.30 2008/08/11 12:48:22 felipe Exp
$ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -3274,7 +3274,7 @@
array_init(return_value);
zend_hash_apply_with_arguments(ce-function_table TSRMLS_CC,
(apply_func_args_t) _addmethod_va, 4, ce, return_value, filter, intern-obj);
- if (intern-obj instanceof_function(ce, zend_ce_closure)) {
+ if (intern-obj instanceof_function(ce, zend_ce_closure TSRMLS_CC)) {
zend_function *closure =
zend_get_closure_invoke_method(intern-obj TSRMLS_CC);
if (closure) {
_addmethod(closure, ce, return_value, filter,
intern-obj TSRMLS_CC);
@@ -5207,7 +5207,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Id: php_reflection.c,v
1.164.2.33.2.45.2.29 2008/08/11 12:43:21 helly Exp $);
+ php_info_print_table_row(2, Version, $Id: php_reflection.c,v
1.164.2.33.2.45.2.30 2008/08/11 12:48:22 felipe Exp $);
php_info_print_table_end();
} /* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard file.c /ext/standard/tests/file copy_variation4-win32.phpt copy_variation4.phpt
pajoye Mon Aug 11 13:09:01 2008 UTC
Removed files:
/php-src/ext/standard/tests/filecopy_variation4-win32.phpt
Modified files:
/php-src/ext/standard file.c
/php-src/ext/standard/tests/filecopy_variation4.phpt
Log:
- [DOC] detect if dest is a dir (if the given stream layer supports stat)
and fails
. remove win32 specific test. The errors are not the same
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.522r2=1.523diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.522 php-src/ext/standard/file.c:1.523
--- php-src/ext/standard/file.c:1.522 Wed Jul 23 11:24:34 2008
+++ php-src/ext/standard/file.c Mon Aug 11 13:09:01 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.522 2008/07/23 11:24:34 tony2001 Exp $ */
+/* $Id: file.c,v 1.523 2008/08/11 13:09:01 pajoye Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1892,9 +1892,26 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, The first argument
to copy() function cannot be a directory);
return FAILURE;
}
+
+ switch (php_stream_stat_path_ex(dest, PHP_STREAM_URL_STAT_QUIET,
dest_s, NULL)) {
+ case -1:
+ /* non-statable stream */
+ goto safe_to_copy;
+ break;
+ case 0:
+ break;
+ default: /* failed to stat file, does not exist? */
+ return ret;
+ }
+ if (S_ISDIR(dest_s.sb.st_mode)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, The second
argument to copy() function cannot be a directory);
+ return FAILURE;
+ }
+ /*
if (php_stream_stat_path_ex(dest, PHP_STREAM_URL_STAT_QUIET, dest_s,
NULL) != 0) {
goto safe_to_copy;
}
+*/
if (!src_s.sb.st_ino || !dest_s.sb.st_ino) {
goto no_stat;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation4.phpt?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/standard/tests/file/copy_variation4.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_3) /ext/standard file.c /ext/standard/tests/file copy_variation4-win32.phpt copy_variation4.phpt
pajoye Mon Aug 11 13:11:31 2008 UTC
Removed files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filecopy_variation4-win32.phpt
Modified files:
/php-src/ext/standard file.c
/php-src/ext/standard/tests/filecopy_variation4.phpt
Log:
- [DOC] MFH: detect if dest is a dir (if the given stream layer supports stat)
and fails
. remove win32 specific test. The errors are not the same
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.19r2=1.409.2.6.2.28.2.20diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.19
php-src/ext/standard/file.c:1.409.2.6.2.28.2.20
--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.19 Wed Jul 23 11:25:14 2008
+++ php-src/ext/standard/file.c Mon Aug 11 13:11:30 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.409.2.6.2.28.2.19 2008/07/23 11:25:14 tony2001 Exp $ */
+/* $Id: file.c,v 1.409.2.6.2.28.2.20 2008/08/11 13:11:30 pajoye Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1731,8 +1731,20 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, The first argument
to copy() function cannot be a directory);
return FAILURE;
}
- if (php_stream_stat_path_ex(dest, PHP_STREAM_URL_STAT_QUIET, dest_s,
NULL) != 0) {
- goto safe_to_copy;
+
+ switch (php_stream_stat_path_ex(dest, PHP_STREAM_URL_STAT_QUIET,
dest_s, NULL)) {
+ case -1:
+ /* non-statable stream */
+ goto safe_to_copy;
+ break;
+ case 0:
+ break;
+ default: /* failed to stat file, does not exist? */
+ return ret;
+ }
+ if (S_ISDIR(dest_s.sb.st_mode)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, The second
argument to copy() function cannot be a directory);
+ return FAILURE;
}
if (!src_s.sb.st_ino || !dest_s.sb.st_ino) {
goto no_stat;
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/copy_variation4.phpt?r1=1.1.2.2.2.4r2=1.1.2.2.2.5diff_format=u
Index: php-src/ext/standard/tests/file/copy_variation4.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 file.c
pajoye Mon Aug 11 13:14:02 2008 UTC
Modified files:
/php-src/ext/standard file.c
Log:
- removed commented code
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.523r2=1.524diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.523 php-src/ext/standard/file.c:1.524
--- php-src/ext/standard/file.c:1.523 Mon Aug 11 13:09:01 2008
+++ php-src/ext/standard/file.c Mon Aug 11 13:14:01 2008
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: file.c,v 1.523 2008/08/11 13:09:01 pajoye Exp $ */
+/* $Id: file.c,v 1.524 2008/08/11 13:14:01 pajoye Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1907,11 +1907,6 @@
php_error_docref(NULL TSRMLS_CC, E_WARNING, The second
argument to copy() function cannot be a directory);
return FAILURE;
}
- /*
- if (php_stream_stat_path_ex(dest, PHP_STREAM_URL_STAT_QUIET, dest_s,
NULL) != 0) {
- goto safe_to_copy;
- }
-*/
if (!src_s.sb.st_ino || !dest_s.sb.st_ino) {
goto no_stat;
}
--
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 chgrp.phpt
pajoye Mon Aug 11 13:29:16 2008 UTC Modified files: /php-src/ext/standard/tests/filechgrp.phpt Log: - skip on wndows, chgrp not supported http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chgrp.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/file/chgrp.phpt diff -u php-src/ext/standard/tests/file/chgrp.phpt:1.2 php-src/ext/standard/tests/file/chgrp.phpt:1.3 --- php-src/ext/standard/tests/file/chgrp.phpt:1.2 Mon Nov 19 15:55:48 2007 +++ php-src/ext/standard/tests/file/chgrp.phpt Mon Aug 11 13:29:16 2008 @@ -1,5 +1,10 @@ --TEST-- chgrp() with NULL as group name +--SKIPIF-- +?php +if(substr(PHP_OS, 0, 3) == WIN) + die(skip, not supported on Windows); +? --FILE-- ?php chgrp(sjhgfskhagkfdgskjfhgskfsdgfkdsajf, 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_3) /ext/standard/tests/file chgrp.phpt
pajoye Mon Aug 11 13:30:06 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filechgrp.phpt Log: - MFH: skip on windows, chgrp not supported http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chgrp.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/ext/standard/tests/file/chgrp.phpt diff -u php-src/ext/standard/tests/file/chgrp.phpt:1.1.2.3 php-src/ext/standard/tests/file/chgrp.phpt:1.1.2.4 --- php-src/ext/standard/tests/file/chgrp.phpt:1.1.2.3 Fri Nov 16 14:24:08 2007 +++ php-src/ext/standard/tests/file/chgrp.phpt Mon Aug 11 13:30:06 2008 @@ -1,5 +1,10 @@ --TEST-- chgrp() with NULL as group name +--SKIPIF-- +?php +if(substr(PHP_OS, 0, 3) == WIN) + die(skip, not supported on Windows); +? --FILE-- ?php chgrp(sjhgfskhagkfdgskjfhgskfsdgfkdsajf, NULL); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests 024.phpt pecl/sdo/SCA/Bindings/atom .cvsignore Atom1.0.xsd AtomDas.php Proxy.php RequestTester.php SCA_AtomServer.php SC
felipe Mon Aug 11 13:35:49 2008 UTC
Removed files:
/pecl/sdo/SCA/Bindings/atom AtomDas.php Atom1.0.xsd
ServiceRequestHandler.php
SCA_AtomServer.php RequestTester.php
.cvsignore xml.xsd
SCA_ServiceWrapperAtom.php
xhtml1-strict.xsd Proxy.php
Modified files:
/pecl/sdo/SCA/Bindings/atom binding
/php-src/ext/reflection php_reflection.c
/php-src/ext/reflection/tests 024.phpt
Log:
- Fixed wrong check for dynamic properties
http://cvs.php.net/viewvc.cgi/pecl/sdo/SCA/Bindings/atom/binding?r1=r2=diff_format=u
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.312r2=1.313diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.312
php-src/ext/reflection/php_reflection.c:1.313
--- php-src/ext/reflection/php_reflection.c:1.312 Mon Aug 11 12:45:37 2008
+++ php-src/ext/reflection/php_reflection.c Mon Aug 11 13:35:48 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.312 2008/08/11 12:45:37 felipe Exp $ */
+/* $Id: php_reflection.c,v 1.313 2008/08/11 13:35:48 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -509,9 +509,8 @@
ulong index;
if ((prop_type =
zend_hash_get_current_key_ex(properties, prop_name, prop_name_size, index,
0, pos)) == (UG(unicode)?HASH_KEY_IS_UNICODE:HASH_KEY_IS_STRING)) {
- if (prop_name_size
(UG(unicode)?prop_name.u[0]:prop_name.s[0])) {
- /* skip all private and protected
properties */
- if
(zend_u_hash_exists(ce-properties_info, prop_type, prop_name,
prop_name_size)) {
+ if (prop_name_size
(UG(unicode)?prop_name.u[0]:prop_name.s[0])) { /* skip all private and
protected properties */
+ if
(!zend_u_hash_exists(ce-properties_info, prop_type, prop_name,
prop_name_size)) {
count++;
_property_string(dyn, NULL,
prop_name, sub_indent.string TSRMLS_CC);
}
@@ -5377,7 +5376,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.312
2008/08/11 12:45:37 felipe Exp $);
+ php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.313
2008/08/11 13:35:48 felipe Exp $);
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/024.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/reflection/tests/024.phpt
diff -u php-src/ext/reflection/tests/024.phpt:1.2
php-src/ext/reflection/tests/024.phpt:1.3
--- php-src/ext/reflection/tests/024.phpt:1.2 Thu Apr 12 12:43:54 2007
+++ php-src/ext/reflection/tests/024.phpt Mon Aug 11 13:35:49 2008
@@ -9,7 +9,12 @@
protected $p2 = 2;
public$p3 = 3;
}
-$obj = new ReflectionObject(new C1());
+
+$x = new C1();
+$x-z = 4;
+$x-p3 = 5;
+
+$obj = new ReflectionObject($x);
echo $obj;
?
--EXPECTF--
@@ -32,7 +37,7 @@
}
- Dynamic properties [1] {
-Property [ dynamic public $p3 ]
+Property [ dynamic public $z ]
}
- Methods [0] {
--
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/reflection/tests 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt 015.phpt 016.phpt 017.phpt 018.phpt 019.phpt 020.phpt 021.phpt 022.phpt 023.phpt 024.phpt 025.phpt
felipe Mon Aug 11 14:00:03 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/reflection/tests 010.phpt 011.phpt 012.phpt 013.phpt
014.phpt 015.phpt 016.phpt 017.phpt
018.phpt 019.phpt 020.phpt 021.phpt
022.phpt 023.phpt 024.phpt 025.phpt
Log:
- MFH: New tests
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/010.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/010.phpt
+++ php-src/ext/reflection/tests/010.phpt
--TEST--
ReflectionMethod::__toString() tests (overriden method)
--FILE--
?php
class Foo {
function func() {
}
}
class Bar extends Foo {
function func() {
}
}
$m = new ReflectionMethod(Bar::func);
echo $m;
?
--EXPECTF--
Method [ user, overwrites Foo, prototype Foo public method func ] {
@@ %s010.php 7 - 8
}
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/011.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/011.phpt
+++ php-src/ext/reflection/tests/011.phpt
--TEST--
ReflectionExtension::getClasses()
--FILE--
?php
$ext = new ReflectionExtension(reflection);
$classes = $ext-getClasses();
echo $classes[ReflectionException]-getName();
?
--EXPECT--
ReflectionException
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/012.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/012.phpt
+++ php-src/ext/reflection/tests/012.phpt
--TEST--
ReflectionClass::getDefaultProperties()
--FILE--
?php
class Foo {
public $test = ok;
}
$class = new ReflectionClass(Foo);
$props = $class-getDefaultProperties();
echo $props[test];
?
--EXPECT--
ok
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/013.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/013.phpt
+++ php-src/ext/reflection/tests/013.phpt
--TEST--
ReflectionExtension::getFunctions()
--FILE--
?php
$ext = new ReflectionExtension(standard);
$funcs = $ext-getFunctions();
echo $funcs[sleep]-getName();
?
--EXPECT--
sleep
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/014.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/014.phpt
+++ php-src/ext/reflection/tests/014.phpt
--TEST--
ReflectionExtension::getConstants()
--FILE--
?php
$ext = new ReflectionExtension(standard);
$consts = $ext-getConstants();
var_dump($consts[CONNECTION_NORMAL]);
?
--EXPECT--
int(0)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/015.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/015.phpt
+++ php-src/ext/reflection/tests/015.phpt
--TEST--
ReflectionExtension::getINIEntries()
--INI--
user_agent=php
--FILE--
?php
$ext = new ReflectionExtension(standard);
$inis = $ext-getINIEntries();
var_dump($inis[user_agent]);
?
--EXPECT--
string(3) php
--UEXPECT--
unicode(3) php
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/016.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/016.phpt
+++ php-src/ext/reflection/tests/016.phpt
--TEST--
ReflectionExtension::getDependencies()
--SKIPIF--
?php
if (!extension_loaded(xml)) {
die('skip xml extension not available');
}
?
--FILE--
?php
$ext = new ReflectionExtension(xml);
$deps = $ext-getDependencies();
var_dump($deps);
?
--EXPECT--
array(1) {
[libxml]=
string(8) Required
}
--UEXPECT--
array(1) {
[ulibxml]=
unicode(8) Required
}
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/017.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/017.phpt
+++ php-src/ext/reflection/tests/017.phpt
--TEST--
ReflectionClass::__toString() (constants)
--FILE--
?php
class Foo {
const test = ok;
}
$class = new ReflectionClass(Foo);
echo $class;
?
--EXPECTF--
Class [ user class Foo ] {
@@ %s017.php 2-4
- Constants [1] {
Constant [ string test ] { ok }
}
- Static properties [0] {
}
- Static methods [0] {
}
- Properties [0] {
}
- Methods [0] {
}
}
--UEXPECTF--
Class [ user class Foo ] {
@@ %s017.php 2-4
- Constants [1] {
Constant [ Unicode string test ] { ok }
}
- Static properties [0] {
}
- Static methods [0] {
}
- Properties [0] {
}
- Methods [0] {
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/018.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/018.phpt
+++ php-src/ext/reflection/tests/018.phpt
--TEST--
Reflection::getModifierNames
--FILE--
?php
var_dump(Reflection::getModifierNames(ReflectionMethod::IS_FINAL |
ReflectionMethod::IS_PROTECTED));
?
--EXPECT--
array(2) {
[0]=
string(5) final
[1]=
string(9) protected
}
--UEXPECT--
array(2) {
[0]=
unicode(5) final
[1]=
unicode(9) protected
}
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/019.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/019.phpt
+++ php-src/ext/reflection/tests/019.phpt
--TEST--
ReflectionFunction::getExtensionName
--FILE--
?php
$f =
[PHP-CVS] cvs: php-src /ext/curl/tests .cvsignore
nlopess Mon Aug 11 15:18:47 2008 UTC Added files: /php-src/ext/curl/tests .cvsignore Log: add http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/.cvsignore?view=markuprev=1.1 Index: php-src/ext/curl/tests/.cvsignore +++ php-src/ext/curl/tests/.cvsignore *.mem *.diff *.log *.exp *.out *.php -- 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/curl/tests .cvsignore
nlopess Mon Aug 11 15:20:57 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/curl/tests .cvsignore Log: add http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/.cvsignore?view=markuprev=1.1 Index: php-src/ext/curl/tests/.cvsignore +++ php-src/ext/curl/tests/.cvsignore *.mem *.diff *.log *.exp *.out *.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard link.c /ext/standard/tests/file symlink_to_symlink.phpt /tests/security open_basedir_symlink.phpt
lbarnaudMon Aug 11 15:29:06 2008 UTC
Modified files:
/php-src/tests/security open_basedir_symlink.phpt
/php-src/ext/standard link.c
/php-src/ext/standard/tests/filesymlink_to_symlink.phpt
Log:
Check the relevant path for open_basedir in symlink()
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_symlink.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/tests/security/open_basedir_symlink.phpt
diff -u php-src/tests/security/open_basedir_symlink.phpt:1.3
php-src/tests/security/open_basedir_symlink.phpt:1.4
--- php-src/tests/security/open_basedir_symlink.phpt:1.3Mon May 26
15:52:05 2008
+++ php-src/tests/security/open_basedir_symlink.phptMon Aug 11 15:29:05 2008
@@ -31,6 +31,12 @@
var_dump(symlink($target, $symlink));
var_dump(unlink($symlink));
+
+var_dump(mkdir(ok2));
+$symlink = ($directory./test/ok/ok2/ok.txt);
+var_dump(symlink(../ok.txt, $symlink)); // $target ==
(dirname($symlink)./.$target) == ($directory./test/ok/ok.txt);
+var_dump(unlink($symlink));
+
test_open_basedir_after(symlink);
?
--CLEAN--
@@ -74,4 +80,7 @@
bool(false)
bool(true)
bool(true)
+bool(true)
+bool(true)
+bool(true)
*** Finished testing open_basedir configuration [symlink] ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/link.c?r1=1.62r2=1.63diff_format=u
Index: php-src/ext/standard/link.c
diff -u php-src/ext/standard/link.c:1.62 php-src/ext/standard/link.c:1.63
--- php-src/ext/standard/link.c:1.62Sun Aug 10 11:54:18 2008
+++ php-src/ext/standard/link.c Mon Aug 11 15:29:06 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: link.c,v 1.62 2008/08/10 11:54:18 lbarnaud Exp $ */
+/* $Id: link.c,v 1.63 2008/08/11 15:29:06 lbarnaud Exp $ */
#include php.h
#include php_filestat.h
@@ -49,6 +49,7 @@
#include php_link.h
#include ext/standard/file.h
+#include php_string.h
/* {{{ proto string readlink(string filename) U
Return the target of a symbolic link */
@@ -126,6 +127,8 @@
int ret;
char source_p[MAXPATHLEN];
char dest_p[MAXPATHLEN];
+ char dirname[MAXPATHLEN];
+ size_t len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ZZ, pp_topath,
pp_frompath) == FAILURE ||
@@ -134,7 +137,15 @@
return;
}
- if (!expand_filepath(frompath, source_p TSRMLS_CC) ||
!expand_filepath(topath, dest_p TSRMLS_CC)) {
+ if (!expand_filepath(frompath, source_p TSRMLS_CC)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, No such file or
directory);
+ RETURN_FALSE;
+ }
+
+ memcpy(dirname, source_p, sizeof(source_p));
+ len = php_dirname(dirname, strlen(dirname));
+
+ if (!expand_filepath_ex(topath, dest_p, dirname, len TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, No such file or
directory);
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_to_symlink.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/symlink_to_symlink.phpt
diff -u php-src/ext/standard/tests/file/symlink_to_symlink.phpt:1.1
php-src/ext/standard/tests/file/symlink_to_symlink.phpt:1.2
--- php-src/ext/standard/tests/file/symlink_to_symlink.phpt:1.1 Sun Aug 10
11:54:18 2008
+++ php-src/ext/standard/tests/file/symlink_to_symlink.phpt Mon Aug 11
15:29:06 2008
@@ -1,5 +1,11 @@
--TEST--
symlink() using a relative path, and symlink() to a symlink
+--SKIPIF--
+?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+die('skip no symlinks on Windows');
+}
+?
--FILE--
?php
$prefix = __FILE__;
--
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 link.c /ext/standard/tests/file symlink_to_symlink.phpt /tests/security open_basedir_symlink.phpt
lbarnaudMon Aug 11 15:30:44 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/tests/security open_basedir_symlink.phpt
/php-src/ext/standard link.c
/php-src/ext/standard/tests/filesymlink_to_symlink.phpt
Log:
MFH: Check the relevant path for open_basedir in symlink()
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_symlink.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/tests/security/open_basedir_symlink.phpt
diff -u php-src/tests/security/open_basedir_symlink.phpt:1.1.4.2
php-src/tests/security/open_basedir_symlink.phpt:1.1.4.3
--- php-src/tests/security/open_basedir_symlink.phpt:1.1.4.2Fri May 9
08:39:44 2008
+++ php-src/tests/security/open_basedir_symlink.phptMon Aug 11 15:30:44 2008
@@ -31,6 +31,12 @@
var_dump(symlink($target, $symlink));
var_dump(unlink($symlink));
+
+var_dump(mkdir(ok2));
+$symlink = ($directory./test/ok/ok2/ok.txt);
+var_dump(symlink(../ok.txt, $symlink)); // $target ==
(dirname($symlink)./.$target) == ($directory./test/ok/ok.txt);
+var_dump(unlink($symlink));
+
test_open_basedir_after(symlink);
?
--CLEAN--
@@ -74,5 +80,8 @@
bool(false)
bool(true)
bool(true)
+bool(true)
+bool(true)
+bool(true)
*** Finished testing open_basedir configuration [symlink] ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/link.c?r1=1.52.2.1.2.3.2.3r2=1.52.2.1.2.3.2.4diff_format=u
Index: php-src/ext/standard/link.c
diff -u php-src/ext/standard/link.c:1.52.2.1.2.3.2.3
php-src/ext/standard/link.c:1.52.2.1.2.3.2.4
--- php-src/ext/standard/link.c:1.52.2.1.2.3.2.3Sun Aug 10 11:54:41 2008
+++ php-src/ext/standard/link.c Mon Aug 11 15:30:44 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: link.c,v 1.52.2.1.2.3.2.3 2008/08/10 11:54:41 lbarnaud Exp $ */
+/* $Id: link.c,v 1.52.2.1.2.3.2.4 2008/08/11 15:30:44 lbarnaud Exp $ */
#include php.h
#include php_filestat.h
@@ -49,6 +49,7 @@
#include safe_mode.h
#include php_link.h
+#include php_string.h
/* {{{ proto string readlink(string filename)
Return the target of a symbolic link */
@@ -116,12 +117,22 @@
int ret;
char source_p[MAXPATHLEN];
char dest_p[MAXPATHLEN];
+ char dirname[MAXPATHLEN];
+ size_t len;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss, topath,
topath_len, frompath, frompath_len) == FAILURE) {
return;
}
+
+ if (!expand_filepath(frompath, source_p TSRMLS_CC)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, No such file or
directory);
+ RETURN_FALSE;
+ }
- if (!expand_filepath(frompath, source_p TSRMLS_CC) ||
!expand_filepath(topath, dest_p TSRMLS_CC)) {
+ memcpy(dirname, source_p, sizeof(source_p));
+ len = php_dirname(dirname, strlen(dirname));
+
+ if (!expand_filepath_ex(topath, dest_p, dirname, len TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, No such file or
directory);
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_to_symlink.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/standard/tests/file/symlink_to_symlink.phpt
diff -u php-src/ext/standard/tests/file/symlink_to_symlink.phpt:1.1.2.2
php-src/ext/standard/tests/file/symlink_to_symlink.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/symlink_to_symlink.phpt:1.1.2.2 Sun Aug
10 11:54:41 2008
+++ php-src/ext/standard/tests/file/symlink_to_symlink.phpt Mon Aug 11
15:30:44 2008
@@ -1,5 +1,11 @@
--TEST--
symlink() using a relative path, and symlink() to a symlink
+--SKIPIF--
+?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+die('skip no symlinks on Windows');
+}
+?
--FILE--
?php
$prefix = __FILE__;
--
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 link.c /ext/standard/tests/file symlink_to_symlink.phpt /tests/security open_basedir_symlink.phpt
lbarnaudMon Aug 11 15:31:01 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/tests/security open_basedir_symlink.phpt
/php-src/ext/standard link.c
/php-src/ext/standard/tests/filesymlink_to_symlink.phpt
Log:
MFH: Check the relevant path for open_basedir in symlink()
http://cvs.php.net/viewvc.cgi/php-src/tests/security/open_basedir_symlink.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/tests/security/open_basedir_symlink.phpt
diff -u php-src/tests/security/open_basedir_symlink.phpt:1.1.2.1
php-src/tests/security/open_basedir_symlink.phpt:1.1.2.2
--- php-src/tests/security/open_basedir_symlink.phpt:1.1.2.1Fri May 9
08:35:58 2008
+++ php-src/tests/security/open_basedir_symlink.phptMon Aug 11 15:31:01 2008
@@ -31,6 +31,12 @@
var_dump(symlink($target, $symlink));
var_dump(unlink($symlink));
+
+var_dump(mkdir(ok2));
+$symlink = ($directory./test/ok/ok2/ok.txt);
+var_dump(symlink(../ok.txt, $symlink)); // $target ==
(dirname($symlink)./.$target) == ($directory./test/ok/ok.txt);
+var_dump(unlink($symlink));
+
test_open_basedir_after(symlink);
?
--CLEAN--
@@ -74,5 +80,8 @@
bool(false)
bool(true)
bool(true)
+bool(true)
+bool(true)
+bool(true)
*** Finished testing open_basedir configuration [symlink] ***
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/link.c?r1=1.52.2.1.2.5r2=1.52.2.1.2.6diff_format=u
Index: php-src/ext/standard/link.c
diff -u php-src/ext/standard/link.c:1.52.2.1.2.5
php-src/ext/standard/link.c:1.52.2.1.2.6
--- php-src/ext/standard/link.c:1.52.2.1.2.5Sun Aug 10 11:55:26 2008
+++ php-src/ext/standard/link.c Mon Aug 11 15:31:01 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: link.c,v 1.52.2.1.2.5 2008/08/10 11:55:26 lbarnaud Exp $ */
+/* $Id: link.c,v 1.52.2.1.2.6 2008/08/11 15:31:01 lbarnaud Exp $ */
#include php.h
#include php_filestat.h
@@ -49,6 +49,7 @@
#include safe_mode.h
#include php_link.h
+#include php_string.h
/* {{{ proto string readlink(string filename)
Return the target of a symbolic link */
@@ -115,6 +116,8 @@
int ret;
char source_p[MAXPATHLEN];
char dest_p[MAXPATHLEN];
+ char dirname[MAXPATHLEN];
+ size_t len;
if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, topath,
frompath) == FAILURE) {
WRONG_PARAM_COUNT;
@@ -122,7 +125,15 @@
convert_to_string_ex(topath);
convert_to_string_ex(frompath);
- if (!expand_filepath(Z_STRVAL_PP(frompath), source_p TSRMLS_CC) ||
!expand_filepath(Z_STRVAL_PP(topath), dest_p TSRMLS_CC)) {
+ if (!expand_filepath(Z_STRVAL_PP(frompath), source_p TSRMLS_CC)) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, No such file or
directory);
+ RETURN_FALSE;
+ }
+
+ memcpy(dirname, source_p, sizeof(source_p));
+ len = php_dirname(dirname, strlen(dirname));
+
+ if (!expand_filepath_ex(Z_STRVAL_PP(topath), dest_p, dirname, len
TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, No such file or
directory);
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/symlink_to_symlink.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/standard/tests/file/symlink_to_symlink.phpt
diff -u php-src/ext/standard/tests/file/symlink_to_symlink.phpt:1.1.4.2
php-src/ext/standard/tests/file/symlink_to_symlink.phpt:1.1.4.3
--- php-src/ext/standard/tests/file/symlink_to_symlink.phpt:1.1.4.2 Sun Aug
10 11:55:26 2008
+++ php-src/ext/standard/tests/file/symlink_to_symlink.phpt Mon Aug 11
15:31:01 2008
@@ -1,5 +1,11 @@
--TEST--
symlink() using a relative path, and symlink() to a symlink
+--SKIPIF--
+?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+die('skip no symlinks on Windows');
+}
+?
--FILE--
?php
$prefix = __FILE__;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main fopen_wrappers.c fopen_wrappers.h
lbarnaudMon Aug 11 15:32:52 2008 UTC
Modified files:
/php-src/main fopen_wrappers.c fopen_wrappers.h
Log:
Missing files in previous commit (Check the relevant path for open_basedir
in symlink())
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.208r2=1.209diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.208 php-src/main/fopen_wrappers.c:1.209
--- php-src/main/fopen_wrappers.c:1.208 Mon Aug 4 07:20:44 2008
+++ php-src/main/fopen_wrappers.c Mon Aug 11 15:32:52 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.208 2008/08/04 07:20:44 dmitry Exp $ */
+/* $Id: fopen_wrappers.c,v 1.209 2008/08/11 15:32:52 lbarnaud Exp $ */
/* {{{ includes
*/
@@ -695,6 +695,14 @@
*/
PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC)
{
+ return expand_filepath_ex(filepath, real_path, NULL, 0 TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ expand_filepath_ex
+ */
+PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const
char *relative_to, size_t relative_to_len TSRMLS_DC)
+{
cwd_state new_state;
char cwd[MAXPATHLEN];
int copy_len;
@@ -705,7 +713,16 @@
cwd[0] = '\0';
} else {
const char *iam = SG(request_info).path_translated;
- char *result = VCWD_GETCWD(cwd, MAXPATHLEN);
+ const char *result;
+ if (relative_to) {
+ if (relative_to_len MAXPATHLEN-1U) {
+ return NULL;
+ }
+ result = relative_to;
+ memcpy(cwd, relative_to, relative_to_len+1U);
+ } else {
+ result = VCWD_GETCWD(cwd, MAXPATHLEN);
+ }
if (!result (iam != filepath)) {
int fdtest = -1;
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.h?r1=1.52r2=1.53diff_format=u
Index: php-src/main/fopen_wrappers.h
diff -u php-src/main/fopen_wrappers.h:1.52 php-src/main/fopen_wrappers.h:1.53
--- php-src/main/fopen_wrappers.h:1.52 Wed Mar 5 13:35:02 2008
+++ php-src/main/fopen_wrappers.h Mon Aug 11 15:32:52 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fopen_wrappers.h,v 1.52 2008/03/05 13:35:02 dmitry Exp $ */
+/* $Id: fopen_wrappers.h,v 1.53 2008/08/11 15:32:52 lbarnaud Exp $ */
#ifndef FOPEN_WRAPPERS_H
#define FOPEN_WRAPPERS_H
@@ -27,6 +27,7 @@
PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC);
PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC);
+PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const
char *relative_to, size_t relative_to_len TSRMLS_DC);
PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC);
PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC);
--
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) /main fopen_wrappers.c fopen_wrappers.h
lbarnaudMon Aug 11 15:33:02 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/main fopen_wrappers.c fopen_wrappers.h
Log:
MFH: Missing files in previous commit (Check the relevant path for
open_basedir
in symlink())
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.175.2.3.2.13.2.12r2=1.175.2.3.2.13.2.13diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.175.2.3.2.13.2.12
php-src/main/fopen_wrappers.c:1.175.2.3.2.13.2.13
--- php-src/main/fopen_wrappers.c:1.175.2.3.2.13.2.12 Mon Aug 4 07:20:15 2008
+++ php-src/main/fopen_wrappers.c Mon Aug 11 15:33:02 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.175.2.3.2.13.2.12 2008/08/04 07:20:15 dmitry Exp
$ */
+/* $Id: fopen_wrappers.c,v 1.175.2.3.2.13.2.13 2008/08/11 15:33:02 lbarnaud
Exp $ */
/* {{{ includes
*/
@@ -723,6 +723,14 @@
*/
PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC)
{
+ return expand_filepath_ex(filepath, real_path, NULL, 0 TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ expand_filepath_ex
+ */
+PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const
char *relative_to, size_t relative_to_len TSRMLS_DC)
+{
cwd_state new_state;
char cwd[MAXPATHLEN];
int copy_len;
@@ -733,7 +741,16 @@
cwd[0] = '\0';
} else {
const char *iam = SG(request_info).path_translated;
- char *result = VCWD_GETCWD(cwd, MAXPATHLEN);
+ const char *result;
+ if (relative_to) {
+ if (relative_to_len MAXPATHLEN-1U) {
+ return NULL;
+ }
+ result = relative_to;
+ memcpy(cwd, relative_to, relative_to_len+1U);
+ } else {
+ result = VCWD_GETCWD(cwd, MAXPATHLEN);
+ }
if (!result (iam != filepath)) {
int fdtest = -1;
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.h?r1=1.44.2.1.2.2.2.3r2=1.44.2.1.2.2.2.4diff_format=u
Index: php-src/main/fopen_wrappers.h
diff -u php-src/main/fopen_wrappers.h:1.44.2.1.2.2.2.3
php-src/main/fopen_wrappers.h:1.44.2.1.2.2.2.4
--- php-src/main/fopen_wrappers.h:1.44.2.1.2.2.2.3 Wed Mar 5 13:34:12 2008
+++ php-src/main/fopen_wrappers.h Mon Aug 11 15:33:02 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fopen_wrappers.h,v 1.44.2.1.2.2.2.3 2008/03/05 13:34:12 dmitry Exp $ */
+/* $Id: fopen_wrappers.h,v 1.44.2.1.2.2.2.4 2008/08/11 15:33:02 lbarnaud Exp $
*/
#ifndef FOPEN_WRAPPERS_H
#define FOPEN_WRAPPERS_H
@@ -26,6 +26,7 @@
PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC);
PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC);
+PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const
char *relative_to, size_t relative_to_len TSRMLS_DC);
PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC);
PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC);
--
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) /main fopen_wrappers.c fopen_wrappers.h
lbarnaudMon Aug 11 15:33:14 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main fopen_wrappers.c fopen_wrappers.h
Log:
MFH: Missing files in previous commit (Check the relevant path for
open_basedir
in symlink())
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.c?r1=1.175.2.3.2.19r2=1.175.2.3.2.20diff_format=u
Index: php-src/main/fopen_wrappers.c
diff -u php-src/main/fopen_wrappers.c:1.175.2.3.2.19
php-src/main/fopen_wrappers.c:1.175.2.3.2.20
--- php-src/main/fopen_wrappers.c:1.175.2.3.2.19Tue Jan 29 14:23:19 2008
+++ php-src/main/fopen_wrappers.c Mon Aug 11 15:33:14 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: fopen_wrappers.c,v 1.175.2.3.2.19 2008/01/29 14:23:19 dmitry Exp $ */
+/* $Id: fopen_wrappers.c,v 1.175.2.3.2.20 2008/08/11 15:33:14 lbarnaud Exp $ */
/* {{{ includes
*/
@@ -601,6 +601,14 @@
*/
PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC)
{
+ return expand_filepath_ex(filepath, real_path, NULL, 0 TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ expand_filepath_ex
+ */
+PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const
char *relative_to, size_t relative_to_len TSRMLS_DC)
+{
cwd_state new_state;
char cwd[MAXPATHLEN];
int copy_len;
@@ -611,7 +619,16 @@
cwd[0] = '\0';
} else {
const char *iam = SG(request_info).path_translated;
- char *result = VCWD_GETCWD(cwd, MAXPATHLEN);
+ const char *result;
+ if (relative_to) {
+ if (relative_to_len MAXPATHLEN-1U) {
+ return NULL;
+ }
+ result = relative_to;
+ memcpy(cwd, relative_to, relative_to_len+1U);
+ } else {
+ result = VCWD_GETCWD(cwd, MAXPATHLEN);
+ }
if (!result (iam != filepath)) {
int fdtest = -1;
http://cvs.php.net/viewvc.cgi/php-src/main/fopen_wrappers.h?r1=1.44.2.1.2.4r2=1.44.2.1.2.5diff_format=u
Index: php-src/main/fopen_wrappers.h
diff -u php-src/main/fopen_wrappers.h:1.44.2.1.2.4
php-src/main/fopen_wrappers.h:1.44.2.1.2.5
--- php-src/main/fopen_wrappers.h:1.44.2.1.2.4 Mon Dec 31 07:20:14 2007
+++ php-src/main/fopen_wrappers.h Mon Aug 11 15:33:14 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: fopen_wrappers.h,v 1.44.2.1.2.4 2007/12/31 07:20:14 sebastian Exp $ */
+/* $Id: fopen_wrappers.h,v 1.44.2.1.2.5 2008/08/11 15:33:14 lbarnaud Exp $ */
#ifndef FOPEN_WRAPPERS_H
#define FOPEN_WRAPPERS_H
@@ -26,6 +26,7 @@
PHPAPI int php_fopen_primary_script(zend_file_handle *file_handle TSRMLS_DC);
PHPAPI char *expand_filepath(const char *filepath, char *real_path TSRMLS_DC);
+PHPAPI char *expand_filepath_ex(const char *filepath, char *real_path, const
char *relative_to, size_t relative_to_len TSRMLS_DC);
PHPAPI int php_check_open_basedir(const char *path TSRMLS_DC);
PHPAPI int php_check_open_basedir_ex(const char *path, int warn TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
nlopess Mon Aug 11 15:40:41 2008 UTC Modified files: /php-src/ext/mbstring mbstring.c Log: fix build when host machine doest has pcre installed http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.295r2=1.296diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.295 php-src/ext/mbstring/mbstring.c:1.296 --- php-src/ext/mbstring/mbstring.c:1.295 Mon Aug 4 21:10:17 2008 +++ php-src/ext/mbstring/mbstring.c Mon Aug 11 15:40:41 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.295 2008/08/04 21:10:17 moriyoshi Exp $ */ +/* $Id: mbstring.c,v 1.296 2008/08/11 15:40:41 nlopess Exp $ */ /* * PHP 4 Multibyte String module mbstring @@ -86,7 +86,7 @@ #include oniguruma.h #undef UChar #elif HAVE_PCRE || HAVE_BUNDLED_PCRE -#include pcre.h +#include ext/pcre/php_pcre.h #endif /* }}} */ -- 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/mbstring mbstring.c
nlopess Mon Aug 11 15:42:35 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/mbstring mbstring.c Log: MFH: fix build when pcre is not present http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.29r2=1.224.2.22.2.25.2.30diff_format=u Index: php-src/ext/mbstring/mbstring.c diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.29 php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.30 --- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.29Mon Aug 4 21:06:13 2008 +++ php-src/ext/mbstring/mbstring.c Mon Aug 11 15:42:35 2008 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: mbstring.c,v 1.224.2.22.2.25.2.29 2008/08/04 21:06:13 moriyoshi Exp $ */ +/* $Id: mbstring.c,v 1.224.2.22.2.25.2.30 2008/08/11 15:42:35 nlopess Exp $ */ /* * PHP 4 Multibyte String module mbstring @@ -86,7 +86,7 @@ #include oniguruma.h #undef UChar #elif HAVE_PCRE || HAVE_BUNDLED_PCRE -#include pcre.h +#include ext/pcre/php_pcre.h #endif /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/mbstring mbstring.c
On 11.08.2008 19:40, Nuno Lopes wrote: #include oniguruma.h #undef UChar #elif HAVE_PCRE || HAVE_BUNDLED_PCRE -#include pcre.h +#include ext/pcre/php_pcre.h #endif Right, I didn't notice that =) Thanks. -- Wbr, Antony Dovgal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/tests spl_004.phpt
helly Mon Aug 11 17:30:22 2008 UTC Modified files: /php-src/ext/spl/tests spl_004.phpt Log: - EXPECT rather than EXPECTF http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_004.phpt?r1=1.4r2=1.5diff_format=u Index: php-src/ext/spl/tests/spl_004.phpt diff -u php-src/ext/spl/tests/spl_004.phpt:1.4 php-src/ext/spl/tests/spl_004.phpt:1.5 --- php-src/ext/spl/tests/spl_004.phpt:1.4 Sat May 24 14:12:00 2008 +++ php-src/ext/spl/tests/spl_004.phpt Mon Aug 11 17:30:22 2008 @@ -49,7 +49,7 @@ ? ===DONE=== ?php exit(0); ? ---EXPECTF-- +--EXPECT-- int(0) int(1) int(2) -- 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/spl/tests spl_004.phpt
helly Mon Aug 11 17:30:37 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/spl/tests spl_004.phpt Log: - MFH EXPECT rather than EXPECTF http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/spl_004.phpt?r1=1.1.2.2.2.3r2=1.1.2.2.2.4diff_format=u Index: php-src/ext/spl/tests/spl_004.phpt diff -u php-src/ext/spl/tests/spl_004.phpt:1.1.2.2.2.3 php-src/ext/spl/tests/spl_004.phpt:1.1.2.2.2.4 --- php-src/ext/spl/tests/spl_004.phpt:1.1.2.2.2.3 Sat May 24 14:10:44 2008 +++ php-src/ext/spl/tests/spl_004.phpt Mon Aug 11 17:30:37 2008 @@ -49,7 +49,7 @@ ? ===DONE=== ?php exit(0); ? ---EXPECTF-- +--EXPECT-- int(0) int(1) int(2) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests 024.phpt pecl/sdo/SCA/Bindings/atom .cvsignore Atom1.0.xsd AtomDas.php Proxy.php RequestTester.php SCA_AtomServer.php
On 11/08/2008, Felipe Pena [EMAIL PROTECTED] wrote: felipeMon Aug 11 13:35:49 2008 UTC Removed files: /pecl/sdo/SCA/Bindings/atom AtomDas.php Atom1.0.xsd ServiceRequestHandler.php SCA_AtomServer.php RequestTester.php .cvsignore xml.xsd SCA_ServiceWrapperAtom.php xhtml1-strict.xsd Proxy.php Modified files: /pecl/sdo/SCA/Bindings/atom binding Soo.. this looks confusing...? I can't see any changes being made (or files removed for that matter) browsing viewvc.. and I thought this dir (along with all other IBM projects) were CLAd and therefore with explicit unavail lines? -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c
helly Mon Aug 11 19:34:49 2008 UTC
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
- Cleanup
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.313r2=1.314diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.313
php-src/ext/reflection/php_reflection.c:1.314
--- php-src/ext/reflection/php_reflection.c:1.313 Mon Aug 11 13:35:48 2008
+++ php-src/ext/reflection/php_reflection.c Mon Aug 11 19:34:49 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.313 2008/08/11 13:35:48 felipe Exp $ */
+/* $Id: php_reflection.c,v 1.314 2008/08/11 19:34:49 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -232,8 +232,8 @@
{
if (fptr
fptr-type != ZEND_USER_FUNCTION
-(fptr-internal_function.fn_flags
ZEND_ACC_CALL_VIA_HANDLER) != 0
- ) {
+(fptr-internal_function.fn_flags
ZEND_ACC_CALL_VIA_HANDLER) != 0)
+ {
efree(fptr-internal_function.function_name.v);
efree(fptr);
}
@@ -363,7 +363,7 @@
/* The information where a class is declared is only available for user
classes */
if (ce-type == ZEND_USER_CLASS) {
string_printf(str, %s @@ %s %d-%d\n, indent, ce-filename,
- ce-line_start, ce-line_end);
+ ce-line_start, ce-line_end);
}
/* Constants */
@@ -442,7 +442,8 @@
while
(zend_hash_get_current_data_ex(ce-function_table, (void **) mptr, pos) ==
SUCCESS) {
if (mptr-common.fn_flags ZEND_ACC_STATIC
-((mptr-common.fn_flags
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce)) {
+((mptr-common.fn_flags
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce))
+ {
count_static_funcs++;
}
zend_hash_move_forward_ex(ce-function_table,
pos);
@@ -459,7 +460,8 @@
while
(zend_hash_get_current_data_ex(ce-function_table, (void **) mptr, pos) ==
SUCCESS) {
if (mptr-common.fn_flags ZEND_ACC_STATIC
-((mptr-common.fn_flags
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce)) {
+((mptr-common.fn_flags
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce))
+ {
string_printf(str, \n);
_function_string(str, mptr, ce,
sub_indent.string TSRMLS_CC);
}
@@ -538,8 +540,9 @@
zend_hash_internal_pointer_reset_ex(ce-function_table, pos);
while
(zend_hash_get_current_data_ex(ce-function_table, (void **) mptr, pos) ==
SUCCESS) {
- if ((mptr-common.fn_flags ZEND_ACC_STATIC)
== 0
- ((mptr-common.fn_flags
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce)) {
+ if ((mptr-common.fn_flags ZEND_ACC_STATIC)
== 0
+((mptr-common.fn_flags
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce))
+ {
zstr key;
uint key_len;
ulong num_index;
@@ -547,19 +550,19 @@
zstr lcname =
zend_u_str_case_fold(ZEND_STR_TYPE, mptr-common.function_name, len, 1,
lcname_len);
/* Do not display old-style inherited
constructors */
- if ((mptr-common.fn_flags
ZEND_ACC_CTOR) == 0 ||
- mptr-common.scope == ce ||
-
zend_hash_get_current_key_ex(ce-function_table, key, key_len, num_index,
0, pos) != (UG(unicode)?HASH_KEY_IS_UNICODE:HASH_KEY_IS_STRING) ||
- (UG(unicode)
-? zend_u_binary_strcmp(key.u,
key_len-1, lcname.u, lcname_len) == 0
-: zend_binary_strcmp(key.s,
key_len-1, lcname.s, lcname_len) == 0)
- ) {
+ if ((mptr-common.fn_flags
ZEND_ACC_CTOR) == 0
+ || mptr-common.scope == ce
+ ||
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection php_reflection.c
helly Mon Aug 11 19:35:01 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/reflection php_reflection.c
Log:
- Cleanup
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.31r2=1.164.2.33.2.45.2.32diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.31
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.32
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.31Mon Aug
11 13:56:24 2008
+++ php-src/ext/reflection/php_reflection.c Mon Aug 11 19:35:00 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.31 2008/08/11 13:56:24 felipe Exp
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.32 2008/08/11 19:35:00 helly Exp
$ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -235,8 +235,8 @@
{
if (fptr
fptr-type == ZEND_INTERNAL_FUNCTION
-(fptr-internal_function.fn_flags
ZEND_ACC_CALL_VIA_HANDLER) != 0
- ) {
+(fptr-internal_function.fn_flags
ZEND_ACC_CALL_VIA_HANDLER) != 0)
+ {
efree(fptr-internal_function.function_name);
efree(fptr);
}
@@ -363,7 +363,7 @@
/* The information where a class is declared is only available for user
classes */
if (ce-type == ZEND_USER_CLASS) {
string_printf(str, %s @@ %s %d-%d\n, indent, ce-filename,
- ce-line_start, ce-line_end);
+ ce-line_start, ce-line_end);
}
/* Constants */
@@ -442,7 +442,8 @@
while
(zend_hash_get_current_data_ex(ce-function_table, (void **) mptr, pos) ==
SUCCESS) {
if (mptr-common.fn_flags ZEND_ACC_STATIC
-((mptr-common.fn_flags
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce)) {
+((mptr-common.fn_flags
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce))
+ {
count_static_funcs++;
}
zend_hash_move_forward_ex(ce-function_table,
pos);
@@ -459,7 +460,8 @@
while
(zend_hash_get_current_data_ex(ce-function_table, (void **) mptr, pos) ==
SUCCESS) {
if (mptr-common.fn_flags ZEND_ACC_STATIC
-((mptr-common.fn_flags
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce)) {
+((mptr-common.fn_flags
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce))
+ {
string_printf(str, \n);
_function_string(str, mptr, ce,
sub_indent.string TSRMLS_CC);
}
@@ -538,25 +540,26 @@
zend_hash_internal_pointer_reset_ex(ce-function_table, pos);
while
(zend_hash_get_current_data_ex(ce-function_table, (void **) mptr, pos) ==
SUCCESS) {
- if ((mptr-common.fn_flags ZEND_ACC_STATIC)
== 0
- ((mptr-common.fn_flags
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce)) {
+ if ((mptr-common.fn_flags ZEND_ACC_STATIC)
== 0
+((mptr-common.fn_flags
ZEND_ACC_PRIVATE) == 0 || mptr-common.scope == ce))
+ {
char *key;
uint key_len;
ulong num_index;
uint len =
strlen(mptr-common.function_name);
/* Do not display old-style inherited
constructors */
- if ((mptr-common.fn_flags
ZEND_ACC_CTOR) == 0 ||
- mptr-common.scope == ce ||
-
zend_hash_get_current_key_ex(ce-function_table, key, key_len, num_index,
0, pos) != HASH_KEY_IS_STRING ||
- zend_binary_strcasecmp(key,
key_len-1, mptr-common.function_name, len) == 0) {
-
+ if ((mptr-common.fn_flags
ZEND_ACC_CTOR) == 0
+ || mptr-common.scope == ce
+ ||
zend_hash_get_current_key_ex(ce-function_table, key, key_len, num_index,
0, pos) != HASH_KEY_IS_STRING
+ || zend_binary_strcasecmp(key,
key_len-1, mptr-common.function_name, len)
Re: [PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests 024.phpt pecl/sdo/SCA/Bindings/atom .cvsignore Atom1.0.xsd AtomDas.php Proxy.php RequestTester.php SCA_AtomServer.php
I can't see any changes being made (or files removed for that matter) browsing viewvc.. and I thought this dir (along with all other IBM projects) were CLAd and therefore with explicit unavail lines? It is. It's also not a development branch - it's the release-only branch! Best write a nice letter to Caroline :) (cem@) - Steph -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
helly Mon Aug 11 19:36:55 2008 UTC Modified files: /CVSROOTavail Log: - Account for Christian Seiler http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1432r2=1.1433diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1432 CVSROOT/avail:1.1433 --- CVSROOT/avail:1.1432Fri Aug 8 13:25:41 2008 +++ CVSROOT/avail Mon Aug 11 19:36:55 2008 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb +avail|lstrojny,dharmap,kraghuba,stevseea,colder,lwe,auroraeosrose,mike,rolland,cawa,msisolak,alan_k,rrichards,tal,mfischer,fmk,hirokawa,jah,eschmid,dbeu,sebastian,samjam,avsm,ronabob,derick,sterling,venaas,stas,hholzgra,cmv,phildriscoll,jmoore,andre,jani,sr,david,jdonagher,chagenbu,jon,elixer,joosters,jason,mysql,kalowsky,opaquedave,steinm,phanto,gluke,svanegmond,rjs,vlad,jimjag,emile,wez,sasha,camber,ohrn,romolo,martin,lurcher,wsanchez,dreid,bmcadams,swm,zhang,kevin,joey,entity,cardinal,coar,jflemer,raphael,danda,rbb,mboeren,dougm,edink,alexwaugh,bernd,zak,sesser,yohgaki,imajes,markonen,dickmeiss,helly,sander,jan,kir,aaron,jwoolley,pbannister,rvenkat,dali,rodif_bl,hyanantha,witten,georg,msopacua,mpdoremus,fujimoto,iliaa,chregu,azzit,gschlossnagle,andrey,dan,moriyoshi,dviner,bfrance,flex,iwakiri,john,harrie,pollita,ianh,k.schroeder,dcowgill,jerenkrantz,jay,ddhill,jorton,thetaphi,abies,vincent,goba,dmitry,pajoye,shie,rafi,magnus,tony2001,johannes,dbs,skoduru,nrathna,jesus,go! palv,bjori,nlopess,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith,cellog,davidc,felipe,robinf,jmessa,philip,sixd,gwynne,ant,kalle,mattwil,sfox,hnangelo,ohill,indeyets,felixdv,mich4ld,lbarnaud,cseiler|phpfi,php3,php-src,pecl,non-pecl,spl,phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa,phpdoc-fi,phpdoc-fr,phpdoc-he,phpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,phpdoc-nl,phpdoc-pl,phpdoc-pt_BR,phpdoc-pt,phpdoc-ro,phpdoc-ru,phpdoc-sk,phpdoc-sl,phpdoc-sv,phpdoc-tr,phpdoc-tw,phpdoc-zh,phpdoc-ca,phpdoc-no,phd,docweb # Some people have access to tests in the Engine avail|magnus,michael,zoe,jmessa,sfox,tomerc|Zend/tests,ZendEngine2/tests -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests 024.phpt pecl/sdo/SCA/Bindings/atom .cvsignore Atom1.0.xsd AtomDas.php Proxy.php RequestTester.php SCA_AtomServer.php
Em Seg, 2008-08-11 às 21:24 +0200, [EMAIL PROTECTED] escreveu: On 11/08/2008, Felipe Pena [EMAIL PROTECTED] wrote: felipe Mon Aug 11 13:35:49 2008 UTC Removed files: /pecl/sdo/SCA/Bindings/atom AtomDas.php Atom1.0.xsd ServiceRequestHandler.php SCA_AtomServer.php RequestTester.php .cvsignore xml.xsd SCA_ServiceWrapperAtom.php xhtml1-strict.xsd Proxy.php Modified files: /pecl/sdo/SCA/Bindings/atom binding Soo.. this looks confusing...? I can't see any changes being made (or files removed for that matter) browsing viewvc.. and I thought this dir (along with all other IBM projects) were CLAd and therefore with explicit unavail lines? Yeah, That also occured to Tony times ago. I received the warnings when commiting: Use of uninitialized value in string eq at /repository/CVSROOT/loginfo.pl line 127, FC line 1. Use of uninitialized value in string eq at /repository/CVSROOT/loginfo.pl line 127, FC line 1. Use of uninitialized value in concatenation (.) or string at /repository/CVSROOT/loginfo.pl line 152. Use of uninitialized value in concatenation (.) or string at /repository/CVSROOT/loginfo.pl line 152. Use of uninitialized value in concatenation (.) or string at /repository/CVSROOT/loginfo.pl line 153. Use of uninitialized value in concatenation (.) or string at /repository/CVSROOT/loginfo.pl line 153. cvs rdiff: cannot find module `pecl/sdo/SCA/Bindings/atom/binding' - ignored 46398 Mailing the commit email to php-cvs@lists.php.net -- Regards, Felipe Pena. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/reflection php_reflection.c/ext/reflection/tests 024.phpt pecl/sdo/SCA/Bindings/atom .cvsignoreAtom1.0.xsd AtomDas.php Proxy.php RequestTester.php SCA_AtomServer.phpSCA
I received the warnings when commiting: Ohh. It's supposed to just fail... - Steph -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
andiMon Aug 11 19:41:57 2008 UTC Modified files: /CVSROOTavail Log: - Karma to commit tests for CURL. http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1433r2=1.1434diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1433 CVSROOT/avail:1.1434 --- CVSROOT/avail:1.1433Mon Aug 11 19:36:55 2008 +++ CVSROOT/avail Mon Aug 11 19:41:56 2008 @@ -145,7 +145,7 @@ avail|phanto,abrown|php-src/ext/com avail|steinm|php-src/ext/cpdf avail|hholzgra|php-src/ext/ctype -avail|sterling|php-src/ext/curl +avail|sterling,eyal|php-src/ext/curl avail|evan|php-src/ext/cybercash avail|spages|php-src/ext/cybermut avail|steinm,jarkol,zenderx,chregu,jtate,thoralf|php-src/ext/domxml -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: win-installer / ExtensionsFeatures53.wxs
jmertic Mon Aug 11 19:58:24 2008 UTC Modified files: /win-installer ExtensionsFeatures53.wxs Log: Assure that the only oracle extensions are php_oci, php_oci8_11g, and php_pdo_oci http://cvs.php.net/viewvc.cgi/win-installer/ExtensionsFeatures53.wxs?r1=1.5r2=1.6diff_format=u Index: win-installer/ExtensionsFeatures53.wxs diff -u win-installer/ExtensionsFeatures53.wxs:1.5 win-installer/ExtensionsFeatures53.wxs:1.6 --- win-installer/ExtensionsFeatures53.wxs:1.5 Mon Aug 11 12:18:37 2008 +++ win-installer/ExtensionsFeatures53.wxs Mon Aug 11 19:58:24 2008 @@ -246,6 +246,9 @@ Feature AllowAdvertise=no Id=ext_php_operator Title=$(loc.Featureext_php_operatorTitle) Description=$(loc.Featureext_php_operatorDescription) Level=10 ComponentRef Id=php_operator/ /Feature + Feature AllowAdvertise=no Id=ext_php_oci Title=$(loc.Featureext_php_ociTitle) Description=$(loc.Featureext_php_ociDescription) Level=10 + ComponentRef Id=php_oci/ + /Feature Feature AllowAdvertise=no Id=ext_php_oci8_11g Title=$(loc.Featureext_php_oci8_11gTitle) Description=$(loc.Featureext_php_oci8_11gDescription) Level=10 ComponentRef Id=php_oci8_11g/ /Feature @@ -282,8 +285,8 @@ Feature AllowAdvertise=no Id=ext_php_pdo_mysql Title=$(loc.Featureext_php_pdo_mysqlTitle) Description=$(loc.Featureext_php_pdo_mysqlDescription) TypicalDefault=install Level=1 ComponentRef Id=php_pdo_mysql/ /Feature - Feature AllowAdvertise=no Id=ext_php_pdo_oci8 Title=$(loc.Featureext_php_pdo_oci8Title) Description=$(loc.Featureext_php_pdo_oci8Description) Level=10 - ComponentRef Id=php_pdo_oci8/ + Feature AllowAdvertise=no Id=ext_php_pdo_oci Title=$(loc.Featureext_php_pdo_ociTitle) Description=$(loc.Featureext_php_pdo_ociDescription) Level=10 + ComponentRef Id=php_pdo_oci/ /Feature Feature AllowAdvertise=no Id=ext_php_pdo_odbc Title=$(loc.Featureext_php_pdo_odbcTitle) Description=$(loc.Featureext_php_pdo_odbcDescription) TypicalDefault=install Level=1 ComponentRef Id=php_pdo_odbc/ -- 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/reflection php_reflection.c /ext/reflection/tests reflectionParameter_invalidMethodInConstructor.phpt
cseiler Mon Aug 11 22:08:59 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/reflection/tests
reflectionParameter_invalidMethodInConstructor.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
- Fixed segmentation fault (test added)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.52r2=1.164.2.33.2.53diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.52
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.53
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.52 Mon Aug 11
00:50:02 2008
+++ php-src/ext/reflection/php_reflection.c Mon Aug 11 22:08:58 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.52 2008/08/11 00:50:02 felipe Exp $ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.53 2008/08/11 22:08:58 cseiler Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1871,7 +1871,7 @@
if (zend_hash_find(ce-function_table, lcname,
lcname_len + 1, (void **) fptr) == FAILURE) {
efree(lcname);
zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
- Method %s::%s() does not
exist, Z_STRVAL_PP(classref), Z_TYPE_PP(method), Z_STRVAL_PP(method));
+ Method %s::%s() does not
exist, ce-name, Z_STRVAL_PP(method));
return;
}
efree(lcname);
@@ -4908,7 +4908,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Id: php_reflection.c,v
1.164.2.33.2.52 2008/08/11 00:50:02 felipe Exp $);
+ php_info_print_table_row(2, Version, $Id: php_reflection.c,v
1.164.2.33.2.53 2008/08/11 22:08:58 cseiler Exp $);
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/reflectionParameter_invalidMethodInConstructor.phpt?view=markuprev=1.1
Index:
php-src/ext/reflection/tests/reflectionParameter_invalidMethodInConstructor.phpt
+++
php-src/ext/reflection/tests/reflectionParameter_invalidMethodInConstructor.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/reflection php_reflection.c /ext/reflection/tests closures_003.phpt closures_004.phpt reflectionParameter_invalidMethodInConstructor.phpt
cseiler Mon Aug 11 22:30:44 2008 UTC
Added files:
/php-src/ext/reflection/tests closures_003.phpt closures_004.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
/php-src/ext/reflection/tests
reflectionParameter_invalidMethodInConstructor.phpt
Log:
- Fixed sefaults (tests added)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.314r2=1.315diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.314
php-src/ext/reflection/php_reflection.c:1.315
--- php-src/ext/reflection/php_reflection.c:1.314 Mon Aug 11 19:34:49 2008
+++ php-src/ext/reflection/php_reflection.c Mon Aug 11 22:30:44 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.314 2008/08/11 19:34:49 helly Exp $ */
+/* $Id: php_reflection.c,v 1.315 2008/08/11 22:30:44 cseiler Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -228,6 +228,28 @@
}
/* }}} */
+static zend_function *_copy_function(zend_function *fptr TSRMLS_DC) /* {{{ */
+{
+ if (fptr
+fptr-type == ZEND_INTERNAL_FUNCTION
+(fptr-internal_function.fn_flags
ZEND_ACC_CALL_VIA_HANDLER) != 0)
+ {
+ zend_function *copy_fptr;
+ copy_fptr = emalloc(sizeof(zend_function));
+ memcpy(copy_fptr, fptr, sizeof(zend_function));
+ if (UG(unicode)) {
+ copy_fptr-internal_function.function_name.u =
eustrdup(fptr-internal_function.function_name.u);
+ } else {
+ copy_fptr-internal_function.function_name.s =
estrdup(fptr-internal_function.function_name.s);
+ }
+ return copy_fptr;
+ } else {
+ /* no copy needed */
+ return fptr;
+ }
+}
+/* }}} */
+
static void _free_function(zend_function *fptr TSRMLS_DC) /* {{{ */
{
if (fptr
@@ -1812,7 +1834,7 @@
zval *parameter;
ALLOC_ZVAL(parameter);
- reflection_parameter_factory(fptr, arg_info, i,
fptr-common.required_num_args, parameter TSRMLS_CC);
+ reflection_parameter_factory(_copy_function(fptr TSRMLS_CC),
arg_info, i, fptr-common.required_num_args, parameter TSRMLS_CC);
add_next_index_zval(return_value, parameter);
arg_info++;
@@ -1956,7 +1978,7 @@
} else if
(zend_u_hash_find(ce-function_table, Z_TYPE_PP(method), lcname, lcname_len +
1, (void **) fptr) == FAILURE) {
efree(lcname.v);
zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC,
- Method %R::%R() does not
exist, Z_TYPE_PP(classref), Z_UNIVAL_PP(classref), Z_TYPE_PP(method),
Z_UNIVAL_PP(method));
+ Method %v::%R() does not
exist, ce-name, Z_TYPE_PP(method), Z_UNIVAL_PP(method));
return;
}
efree(lcname.v);
@@ -2064,9 +2086,9 @@
GET_REFLECTION_OBJECT_PTR(param);
if (!param-fptr-common.scope) {
- reflection_function_factory(param-fptr, return_value
TSRMLS_CC);
+ reflection_function_factory(_copy_function(param-fptr
TSRMLS_CC), return_value TSRMLS_CC);
} else {
- reflection_method_factory(param-fptr-common.scope,
param-fptr, return_value TSRMLS_CC);
+ reflection_method_factory(param-fptr-common.scope,
_copy_function(param-fptr TSRMLS_CC), return_value TSRMLS_CC);
}
}
/* }}} */
@@ -2458,7 +2480,14 @@
/* Returns from this function */
}
- zend_create_closure(return_value, mptr, mptr-common.scope, obj
TSRMLS_CC);
+ /* This is an original closure object and __invoke is to be
called. */
+ if (Z_OBJCE_P(obj) == zend_ce_closure mptr-type ==
ZEND_INTERNAL_FUNCTION
+ (mptr-internal_function.fn_flags
ZEND_ACC_CALL_VIA_HANDLER) != 0)
+ {
+ RETURN_ZVAL(obj, 1, 0);
+ } else {
+ zend_create_closure(return_value, mptr,
mptr-common.scope, obj TSRMLS_CC);
+ }
}
}
/* }}} */
@@ -5394,7 +5423,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.314
2008/08/11 19:34:49 helly Exp $);
+ php_info_print_table_row(2, Version, $Id: php_reflection.c,v 1.315
2008/08/11 22:30:44 cseiler Exp $);
php_info_print_table_end();
} /* }}} */
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/reflection php_reflection.c /ext/reflection/tests closures_003.phpt closures_004.phpt reflectionParameter_invalidMethodInConstructor.phpt
cseiler Mon Aug 11 22:31:23 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/reflection/tests closures_003.phpt closures_004.phpt
reflectionParameter_invalidMethodInConstructor.phpt
Modified files:
/php-src/ext/reflection php_reflection.c
Log:
MFH: Fixed segfaults (tests added)
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/php_reflection.c?r1=1.164.2.33.2.45.2.32r2=1.164.2.33.2.45.2.33diff_format=u
Index: php-src/ext/reflection/php_reflection.c
diff -u php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.32
php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.33
--- php-src/ext/reflection/php_reflection.c:1.164.2.33.2.45.2.32Mon Aug
11 19:35:00 2008
+++ php-src/ext/reflection/php_reflection.c Mon Aug 11 22:31:21 2008
@@ -20,7 +20,7 @@
+--+
*/
-/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.32 2008/08/11 19:35:00 helly Exp
$ */
+/* $Id: php_reflection.c,v 1.164.2.33.2.45.2.33 2008/08/11 22:31:21 cseiler
Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -231,6 +231,24 @@
class_entry-interfaces[num_interfaces - 1] = interface_entry;
}
+static zend_function *_copy_function(zend_function *fptr TSRMLS_DC) /* {{{ */
+{
+ if (fptr
+fptr-type == ZEND_INTERNAL_FUNCTION
+(fptr-internal_function.fn_flags
ZEND_ACC_CALL_VIA_HANDLER) != 0)
+ {
+ zend_function *copy_fptr;
+ copy_fptr = emalloc(sizeof(zend_function));
+ memcpy(copy_fptr, fptr, sizeof(zend_function));
+ copy_fptr-internal_function.function_name =
estrdup(fptr-internal_function.function_name);
+ return copy_fptr;
+ } else {
+ /* no copy needed */
+ return fptr;
+ }
+}
+/* }}} */
+
static void _free_function(zend_function *fptr TSRMLS_DC) /* {{{ */
{
if (fptr
@@ -1782,7 +1800,7 @@
zval *parameter;
ALLOC_ZVAL(parameter);
- reflection_parameter_factory(fptr, arg_info, i,
fptr-common.required_num_args, parameter TSRMLS_CC);
+ reflection_parameter_factory(_copy_function(fptr TSRMLS_CC),
arg_info, i, fptr-common.required_num_args, parameter TSRMLS_CC);
add_next_index_zval(return_value, parameter);
arg_info++;
@@ -2033,9 +2051,9 @@
GET_REFLECTION_OBJECT_PTR(param);
if (!param-fptr-common.scope) {
- reflection_function_factory(param-fptr, return_value
TSRMLS_CC);
+ reflection_function_factory(_copy_function(param-fptr
TSRMLS_CC), return_value TSRMLS_CC);
} else {
- reflection_method_factory(param-fptr-common.scope,
param-fptr, return_value TSRMLS_CC);
+ reflection_method_factory(param-fptr-common.scope,
_copy_function(param-fptr TSRMLS_CC), return_value TSRMLS_CC);
}
}
/* }}} */
@@ -2393,7 +2411,14 @@
/* Returns from this function */
}
- zend_create_closure(return_value, mptr, mptr-common.scope, obj
TSRMLS_CC);
+ /* This is an original closure object and __invoke is to be
called. */
+ if (Z_OBJCE_P(obj) == zend_ce_closure mptr-type ==
ZEND_INTERNAL_FUNCTION
+ (mptr-internal_function.fn_flags
ZEND_ACC_CALL_VIA_HANDLER) != 0)
+ {
+ RETURN_ZVAL(obj, 1, 0);
+ } else {
+ zend_create_closure(return_value, mptr,
mptr-common.scope, obj TSRMLS_CC);
+ }
}
}
/* }}} */
@@ -5217,7 +5242,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Reflection, enabled);
- php_info_print_table_row(2, Version, $Id: php_reflection.c,v
1.164.2.33.2.45.2.32 2008/08/11 19:35:00 helly Exp $);
+ php_info_print_table_row(2, Version, $Id: php_reflection.c,v
1.164.2.33.2.45.2.33 2008/08/11 22:31:21 cseiler Exp $);
php_info_print_table_end();
} /* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/tests/closures_003.phpt?view=markuprev=1.1
Index: php-src/ext/reflection/tests/closures_003.phpt
+++ php-src/ext/reflection/tests/closures_003.phpt
--TEST--
Reflection on closures: Segfaults with getParameters() and
getDeclaringFunction()
--FILE--
?php
$closure = function($a, $b = 0) { };
$method = new ReflectionMethod ($closure);
$params = $method-getParameters ();
unset ($method);
$method = $params[0]-getDeclaringFunction ();
unset ($params);
echo $method-getName ().\n;
$parameter = new ReflectionParameter ($closure, 'b');
$method = $parameter-getDeclaringFunction ();
unset ($parameter);
echo $method-getName ().\n;
?
===DONE===
--EXPECTF--
__invoke
__invoke
===DONE===
[PHP-CVS] cvs: php-src /ext/standard dir.c /ext/standard/tests/file bug45181.phpt
lbarnaudMon Aug 11 22:38:17 2008 UTC
Added files:
/php-src/ext/standard/tests/filebug45181.phpt
Modified files:
/php-src/ext/standard dir.c
Log:
Fixed #45181 (chdir() should clear relative entries in stat cache)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.178r2=1.179diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.178 php-src/ext/standard/dir.c:1.179
--- php-src/ext/standard/dir.c:1.178Thu Jul 24 12:48:47 2008
+++ php-src/ext/standard/dir.c Mon Aug 11 22:38:17 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.178 2008/07/24 12:48:47 felipe Exp $ */
+/* $Id: dir.c,v 1.179 2008/08/11 22:38:17 lbarnaud Exp $ */
/* {{{ includes/startup/misc */
@@ -26,6 +26,7 @@
#include php_dir.h
#include php_string.h
#include php_scandir.h
+#include basic_functions.h
#ifdef HAVE_DIRENT_H
#include dirent.h
@@ -354,6 +355,15 @@
RETURN_FALSE;
}
+ if (BG(CurrentStatFile) !IS_ABSOLUTE_PATH(BG(CurrentStatFile),
strlen(BG(CurrentStatFile {
+ efree(BG(CurrentStatFile));
+ BG(CurrentStatFile) = NULL;
+ }
+ if (BG(CurrentLStatFile) !IS_ABSOLUTE_PATH(BG(CurrentLStatFile),
strlen(BG(CurrentLStatFile {
+ efree(BG(CurrentLStatFile));
+ BG(CurrentLStatFile) = NULL;
+ }
+
RETURN_TRUE;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug45181.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug45181.phpt
+++ php-src/ext/standard/tests/file/bug45181.phpt
--TEST--
Bug #45181 (chdir() should clear relative entries in stat cache)
--FILE--
?php
mkdir(bug45181_x);
var_dump(is_dir(bug45181_x));
chdir(bug45181_x);
var_dump(is_dir(bug45181_x));
?
--CLEAN--
?php
rmdir(bug45181_x);
?
--EXPECT--
bool(true)
bool(false)
--
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 dir.c /ext/standard/tests/file bug45181.phpt
lbarnaudMon Aug 11 22:38:31 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filebug45181.phpt
Modified files:
/php-src/ext/standard dir.c
Log:
MFH: Fixed #45181 (chdir() should clear relative entries in stat cache)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.12.2.9r2=1.147.2.3.2.12.2.10diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.12.2.9
php-src/ext/standard/dir.c:1.147.2.3.2.12.2.10
--- php-src/ext/standard/dir.c:1.147.2.3.2.12.2.9 Thu Jul 24 12:49:11 2008
+++ php-src/ext/standard/dir.c Mon Aug 11 22:38:31 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.147.2.3.2.12.2.9 2008/07/24 12:49:11 felipe Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.12.2.10 2008/08/11 22:38:31 lbarnaud Exp $ */
/* {{{ includes/startup/misc */
@@ -26,6 +26,7 @@
#include php_dir.h
#include php_string.h
#include php_scandir.h
+#include basic_functions.h
#ifdef HAVE_DIRENT_H
#include dirent.h
@@ -330,6 +331,15 @@
RETURN_FALSE;
}
+ if (BG(CurrentStatFile) !IS_ABSOLUTE_PATH(BG(CurrentStatFile),
strlen(BG(CurrentStatFile {
+ efree(BG(CurrentStatFile));
+ BG(CurrentStatFile) = NULL;
+ }
+ if (BG(CurrentLStatFile) !IS_ABSOLUTE_PATH(BG(CurrentLStatFile),
strlen(BG(CurrentLStatFile {
+ efree(BG(CurrentLStatFile));
+ BG(CurrentLStatFile) = NULL;
+ }
+
RETURN_TRUE;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug45181.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug45181.phpt
+++ php-src/ext/standard/tests/file/bug45181.phpt
--TEST--
Bug #45181 (chdir() should clear relative entries in stat cache)
--FILE--
?php
mkdir(bug45181_x);
var_dump(is_dir(bug45181_x));
chdir(bug45181_x);
var_dump(is_dir(bug45181_x));
?
--CLEAN--
?php
rmdir(bug45181_x);
?
--EXPECT--
bool(true)
bool(false)
--
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 dir.c /ext/standard/tests/file bug45181.phpt
lbarnaudMon Aug 11 22:39:42 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/filebug45181.phpt
Modified files:
/php-src/ext/standard dir.c
Log:
MFH: Fixed #45181 (chdir() should clear relative entries in stat cache)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.18r2=1.147.2.3.2.19diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.18
php-src/ext/standard/dir.c:1.147.2.3.2.19
--- php-src/ext/standard/dir.c:1.147.2.3.2.18 Wed Jul 23 11:25:50 2008
+++ php-src/ext/standard/dir.c Mon Aug 11 22:39:42 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.147.2.3.2.18 2008/07/23 11:25:50 tony2001 Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.19 2008/08/11 22:39:42 lbarnaud Exp $ */
/* {{{ includes/startup/misc */
@@ -26,6 +26,7 @@
#include php_dir.h
#include php_string.h
#include php_scandir.h
+#include basic_functions.h
#ifdef HAVE_DIRENT_H
#include dirent.h
@@ -329,6 +330,15 @@
RETURN_FALSE;
}
+ if (BG(CurrentStatFile) !IS_ABSOLUTE_PATH(BG(CurrentStatFile),
strlen(BG(CurrentStatFile {
+ efree(BG(CurrentStatFile));
+ BG(CurrentStatFile) = NULL;
+ }
+ if (BG(CurrentLStatFile) !IS_ABSOLUTE_PATH(BG(CurrentLStatFile),
strlen(BG(CurrentLStatFile {
+ efree(BG(CurrentLStatFile));
+ BG(CurrentLStatFile) = NULL;
+ }
+
RETURN_TRUE;
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug45181.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/bug45181.phpt
+++ php-src/ext/standard/tests/file/bug45181.phpt
--TEST--
Bug #45181 (chdir() should clear relative entries in stat cache)
--FILE--
?php
mkdir(bug45181_x);
var_dump(is_dir(bug45181_x));
chdir(bug45181_x);
var_dump(is_dir(bug45181_x));
?
--CLEAN--
?php
rmdir(bug45181_x);
?
--EXPECT--
bool(true)
bool(false)
--
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
lbarnaudMon Aug 11 22:40:03 2008 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1194r2=1.2027.2.547.2.1195diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1194 php-src/NEWS:1.2027.2.547.2.1195 --- php-src/NEWS:1.2027.2.547.2.1194Mon Aug 11 00:52:41 2008 +++ php-src/NEWSMon Aug 11 22:40:02 2008 @@ -44,6 +44,8 @@ - Fixed bug #45251 (double free or corruption with setAttributeNode()). (Rob) - Fixed bug #45220 (curl_read callback returns -1 when needs to return size_t (unsigned)). (Felipe) +- Fixed bug #45181 (chdir() should clear relative entries in stat cache). + (Arnaud) - Fixed bug #45178 (memory corruption on assignment result of new by reference). (Dmitry) - Fixed bug #45151 (Crash with URI/file..php (filename contains 2 dots)). -- 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/phar/tests/zip corrupt_010.phpt /ext/phar/tests/zip/files corrupt3.php.inc corrupt_zipmaker.php.inc disknumber.zip extralen_toolong.zip
cellog Mon Aug 11 22:43:02 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/phar/tests/zip corrupt_010.phpt
/php-src/ext/phar/tests/zip/files disknumber.zip
Modified files:
/php-src/ext/phar/tests/zip/files corrupt3.php.inc
corrupt_zipmaker.php.inc
extralen_toolong.zip
Log:
increase code coverage
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/corrupt3.php.inc?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/phar/tests/zip/files/corrupt3.php.inc
diff -u php-src/ext/phar/tests/zip/files/corrupt3.php.inc:1.1.2.1
php-src/ext/phar/tests/zip/files/corrupt3.php.inc:1.1.2.2
--- php-src/ext/phar/tests/zip/files/corrupt3.php.inc:1.1.2.1 Mon Aug 11
03:53:57 2008
+++ php-src/ext/phar/tests/zip/files/corrupt3.php.inc Mon Aug 11 22:43:02 2008
@@ -3,4 +3,7 @@
$a = new corrupt_zipmaker;
$a-addFile('hi', null, 'hii', null, null, null, 'extralen1');
$a-writeZip(dirname(__FILE__) . '/extralen_toolong.zip');
+$a = new corrupt_zipmaker;
+$a-addFile('hi', null, 'hii');
+$a-writeZip(dirname(__FILE__) . '/disknumber.zip', 'disknumber');
?
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc?r1=1.5.2.1r2=1.5.2.2diff_format=u
Index: php-src/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc
diff -u php-src/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc:1.5.2.1
php-src/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc:1.5.2.2
--- php-src/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc:1.5.2.1 Mon Aug
11 03:53:57 2008
+++ php-src/ext/phar/tests/zip/files/corrupt_zipmaker.php.inc Mon Aug 11
22:43:02 2008
@@ -26,7 +26,7 @@
* @author Vincent Lascaux [EMAIL PROTECTED]
* @copyright 1997-2005 The PHP Group
* @licensehttp://www.gnu.org/copyleft/lesser.html LGPL
- * @versionCVS: $Id: corrupt_zipmaker.php.inc,v 1.5.2.1 2008/08/11
03:53:57 cellog Exp $
+ * @versionCVS: $Id: corrupt_zipmaker.php.inc,v 1.5.2.2 2008/08/11
22:43:02 cellog Exp $
* @link http://pear.php.net/package/File_Archive
*/
@@ -288,6 +288,12 @@
$this-offset, strlen($this-start),
strlen($this-comment)) .
$this-comment;
break;
+ case 'disknumber' :
+ $write .= PK\x05\x06\x01\x00\x01\x00 .
+ pack(vvVVv, $this-count,
$this-count,
+ $this-offset, strlen($this-start),
+ strlen($this-comment)) .
$this-comment;
+ break;
case 'count1' :
$write .= PK\x05\x06\x00\x00\x00\x00 .
pack(vvVVv, $this-count + 1,
$this-count,
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/extralen_toolong.zip?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/phar/tests/zip/files/extralen_toolong.zip
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/corrupt_010.phpt?view=markuprev=1.1
Index: php-src/ext/phar/tests/zip/corrupt_010.phpt
+++ php-src/ext/phar/tests/zip/corrupt_010.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/zip/files/disknumber.zip?view=markuprev=1.1
Index: php-src/ext/phar/tests/zip/files/disknumber.zip
+++ php-src/ext/phar/tests/zip/files/disknumber.zip
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard dir.c /ext/standard/tests/file chroot_001.phpt
lbarnaudMon Aug 11 23:14:21 2008 UTC
Added files:
/php-src/ext/standard/tests/filechroot_001.phpt
Modified files:
/php-src/ext/standard dir.c
Log:
clear stat cache in chroot()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.179r2=1.180diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.179 php-src/ext/standard/dir.c:1.180
--- php-src/ext/standard/dir.c:1.179Mon Aug 11 22:38:17 2008
+++ php-src/ext/standard/dir.c Mon Aug 11 23:14:21 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.179 2008/08/11 22:38:17 lbarnaud Exp $ */
+/* $Id: dir.c,v 1.180 2008/08/11 23:14:21 lbarnaud Exp $ */
/* {{{ includes/startup/misc */
@@ -320,7 +320,7 @@
RETURN_FALSE;
}
- realpath_cache_clean(TSRMLS_C);
+ php_clear_stat_cache(1, NULL, 0 TSRMLS_CC);
ret = chdir(/);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chroot_001.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/chroot_001.phpt
+++ php-src/ext/standard/tests/file/chroot_001.phpt
--TEST--
chroot()
--SKIPIF--
?php
chdir(/);
if ([EMAIL PROTECTED](testtmpskipifdir)) {
die(skip for root only);
}
rmdir(testtmpskipifdir);
if (!function_exists(chroot)) {
die(skip chroot() not available);
}
?
--FILE--
?php
mkdir(chroot_001_x);
var_dump(is_dir(chroot_001_x));
var_dump(chroot(chroot_001_x));
var_dump(is_dir(chroot_001_x));
var_dump(realpath(.));
?
--CLEAN--
?php
rmdir(chroot_001_x);
?
--EXPECTF--
bool(true)
bool(true)
bool(false)
%unicode|string%(1) /
--
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 dir.c /ext/standard/tests/file chroot_001.phpt
lbarnaudMon Aug 11 23:14:36 2008 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filechroot_001.phpt
Modified files:
/php-src/ext/standard dir.c
Log:
MFH: clear stat cache in chroot()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.12.2.10r2=1.147.2.3.2.12.2.11diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.12.2.10
php-src/ext/standard/dir.c:1.147.2.3.2.12.2.11
--- php-src/ext/standard/dir.c:1.147.2.3.2.12.2.10 Mon Aug 11 22:38:31 2008
+++ php-src/ext/standard/dir.c Mon Aug 11 23:14:36 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.147.2.3.2.12.2.10 2008/08/11 22:38:31 lbarnaud Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.12.2.11 2008/08/11 23:14:36 lbarnaud Exp $ */
/* {{{ includes/startup/misc */
@@ -296,7 +296,7 @@
RETURN_FALSE;
}
- realpath_cache_clean(TSRMLS_C);
+ php_clear_stat_cache(1, NULL, 0 TSRMLS_CC);
ret = chdir(/);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chroot_001.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/chroot_001.phpt
+++ php-src/ext/standard/tests/file/chroot_001.phpt
--TEST--
chroot()
--SKIPIF--
?php
chdir(/);
if ([EMAIL PROTECTED](testtmpskipifdir)) {
die(skip for root only);
}
rmdir(testtmpskipifdir);
if (!function_exists(chroot)) {
die(skip chroot() not available);
}
?
--FILE--
?php
mkdir(chroot_001_x);
var_dump(is_dir(chroot_001_x));
var_dump(chroot(chroot_001_x));
var_dump(is_dir(chroot_001_x));
var_dump(realpath(.));
?
--CLEAN--
?php
rmdir(chroot_001_x);
?
--EXPECTF--
bool(true)
bool(true)
bool(false)
%unicode|string%(1) /
--
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 dir.c /ext/standard/tests/file chroot_001.phpt
lbarnaudMon Aug 11 23:16:41 2008 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/filechroot_001.phpt
Modified files:
/php-src/ext/standard dir.c
Log:
MFH: clear stat cache in chroot()
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/dir.c?r1=1.147.2.3.2.19r2=1.147.2.3.2.20diff_format=u
Index: php-src/ext/standard/dir.c
diff -u php-src/ext/standard/dir.c:1.147.2.3.2.19
php-src/ext/standard/dir.c:1.147.2.3.2.20
--- php-src/ext/standard/dir.c:1.147.2.3.2.19 Mon Aug 11 22:39:42 2008
+++ php-src/ext/standard/dir.c Mon Aug 11 23:16:40 2008
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: dir.c,v 1.147.2.3.2.19 2008/08/11 22:39:42 lbarnaud Exp $ */
+/* $Id: dir.c,v 1.147.2.3.2.20 2008/08/11 23:16:40 lbarnaud Exp $ */
/* {{{ includes/startup/misc */
@@ -295,7 +295,7 @@
RETURN_FALSE;
}
- realpath_cache_clean(TSRMLS_C);
+ php_clear_stat_cache(TSRMLS_C);
ret = chdir(/);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/chroot_001.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/chroot_001.phpt
+++ php-src/ext/standard/tests/file/chroot_001.phpt
--TEST--
chroot()
--SKIPIF--
?php
chdir(/);
if ([EMAIL PROTECTED](testtmpskipifdir)) {
die(skip for root only);
}
rmdir(testtmpskipifdir);
if (!function_exists(chroot)) {
die(skip chroot() not available);
}
?
--FILE--
?php
mkdir(chroot_001_x);
var_dump(is_dir(chroot_001_x));
var_dump(chroot(chroot_001_x));
var_dump(is_dir(chroot_001_x));
var_dump(realpath(.));
?
--CLEAN--
?php
rmdir(chroot_001_x);
?
--EXPECTF--
bool(true)
bool(true)
bool(false)
%unicode|string%(1) /
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
