[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Sun May 10 01:33:00 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3398r2=1.3399diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3398 php-src/ChangeLog:1.3399 --- php-src/ChangeLog:1.3398Sat May 9 01:33:01 2009 +++ php-src/ChangeLog Sun May 10 01:32:59 2009 @@ -1,3 +1,90 @@ +2009-05-09 Johannes Schlüter johan...@schlueters.de + +* (PHP_5_3) + ext/standard/CREDITS: + really delete it + +* ext/standard/CREDITS + ext/standard/credits_ext.h: + Remove bad CREDITS file + +2009-05-09 Etienne Kneuss p...@colder.ch + +* (PHP_5_3) + NEWS + ext/spl/spl_directory.c + ext/spl/tests/bug47534.phpt: + MFH: Fix bug #47534 (RecursiveDirectoryIterator::getChildren ignoring + CURRENT_AS_PATHNAME) + +* ext/spl/spl_directory.c + ext/spl/tests/bug47534.phpt + ext/spl/tests/bug47534.phpt: + Fix bug #47534 (RecursiveDirectoryIterator::getChildren ignoring + CURRENT_AS_PATHNAME) + +* ext/spl/tests/bug47534.phpt + ext/spl/tests/bug47534.phpt: + + file bug47534.phpt was initially added on branch PHP_5_2. + +2009-05-09 Scott MacVicar sc...@macvicar.net + +* (PHP_5_2) + NEWS + NEWS: + BFN + +2009-05-09 Jani Taskinen jani.taski...@sci.fi + +* (PHP_5_3) + NEWS: + - Moved to PHP_5_2 + +2009-05-09 Scott MacVicar sc...@macvicar.net + +* ext/fileinfo/libmagic/patchlevel.h + ext/fileinfo/libmagic/readcdf.c: + Update bundled libmagic to 5.03 + +2009-05-09 Jani Taskinen jani.taski...@sci.fi + +* (PHP_5_2) + NEWS + acinclude.m4: + MFH: sync + - Fixed bug #47468 (enable cli|cgi-only extensions for embed + sapi) + +* (PHP_5_3) + acinclude.m4: + MFH:- Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi) + +* acinclude.m4: + - Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi) + +2009-05-09 Scott MacVicar sc...@macvicar.net + +* (PHP_5_3) + ext/spl/tests/dit_003.phpt: + MFH Broken test when you have a snapshot as it relies on CVS + +* ext/spl/tests/dit_003.phpt: + Broken test when you have a snapshot as it relies on CVS + +* (PHP_5_2) + ext/spl/spl_iterators.c + ext/spl/spl_iterators.c: + MFH Fix bug #48206 - Iterating over an invalid data structure leads to a + segfault + +* ext/spl/spl_iterators.c + ext/spl/spl_iterators.c: + Fix bug #48206 again + +* ext/spl/spl_iterators.c: + Fix bug #48206 - Iterating over an invalid data structure leads to a + segfault + 2009-05-08 Matt Wilmas php_li...@realplain.com * (PHP_5_2) @@ -38876,7 +38963,7 @@ * sapi/litespeed/lsapi_main.c sapi/litespeed/lsapilib.c: - - Added missing $Id: ChangeLog,v 1.3398 2009/05/09 01:33:01 changelog Exp $ tags and nuked c++ comments + - Added missing $Id: ChangeLog,v 1.3399 2009/05/10 01:32:59 changelog Exp $ tags and nuked c++ comments * (PHP_5_3) ext/intl/locale/locale.c
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_iterators.c
scottmacSat May 9 19:35:10 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_iterators.c
Log:
MFH Fix bug #48206 - Iterating over an invalid data structure leads to a
segfault
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28.2.22r2=1.73.2.30.2.28.2.23diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.22
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.23
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.22 Tue Jan 20 00:43:25 2009
+++ php-src/ext/spl/spl_iterators.c Sat May 9 19:35:09 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.22 2009/01/20 00:43:25 felipe Exp $
*/
+/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.23 2009/05/09 19:35:09 scottmac Exp
$ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -922,7 +922,9 @@
iterator-funcs-get_current_data(iterator, data TSRMLS_CC);
zend_replace_error_handling(EH_THROW, spl_ce_UnexpectedValueException,
error_handling TSRMLS_CC);
- RETVAL_ZVAL(*data, 1, 0);
+ if (data *data) {
+ RETVAL_ZVAL(*data, 1, 0);
+ }
if (Z_TYPE_P(return_value) == IS_ARRAY) {
zval_dtor(return_value);
ZVAL_STRINGL(return_value, Array, sizeof(Array)-1, 1);
@@ -1006,7 +1008,11 @@
zval **data;
iterator-funcs-get_current_data(iterator, data TSRMLS_CC);
- RETURN_ZVAL(*data, 1, 0);
+ if (data *data) {
+ RETURN_ZVAL(*data, 1, 0);
+ } else {
+ RETURN_NULL();
+ }
}
spl_recursive_tree_iterator_get_prefix(object, prefix TSRMLS_CC);
@@ -2729,7 +2735,9 @@
intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
intern-inner.iterator-funcs-get_current_data(intern-inner.iterator,
data TSRMLS_CC);
- RETURN_ZVAL(*data, 1, 0);
+ if (data *data) {
+ RETURN_ZVAL(*data, 1, 0);
+ }
} /* }}} */
/* {{{ proto void NoRewindIterator::next()
@@ -3041,6 +3049,9 @@
if (EG(exception)) {
return ZEND_HASH_APPLY_STOP;
}
+ if (data == NULL || *data == NULL) {
+ return ZEND_HASH_APPLY_STOP;
+ }
if (iter-funcs-get_current_key) {
key_type = iter-funcs-get_current_key(iter, str_key,
str_key_len, int_key TSRMLS_CC);
if (EG(exception)) {
@@ -3072,6 +3083,9 @@
if (EG(exception)) {
return ZEND_HASH_APPLY_STOP;
}
+ if (data == NULL || *data == NULL) {
+ return ZEND_HASH_APPLY_STOP;
+ }
Z_ADDREF_PP(data);
add_next_index_zval(return_value, *data);
return ZEND_HASH_APPLY_KEEP;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c
scottmacSat May 9 19:37:34 2009 UTC
Modified files:
/php-src/ext/splspl_iterators.c
Log:
Fix bug #48206 - Iterating over an invalid data structure leads to a segfault
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.188r2=1.189diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.188
php-src/ext/spl/spl_iterators.c:1.189
--- php-src/ext/spl/spl_iterators.c:1.188 Thu Mar 26 20:02:12 2009
+++ php-src/ext/spl/spl_iterators.c Sat May 9 19:37:34 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.188 2009/03/26 20:02:12 felipe Exp $ */
+/* $Id: spl_iterators.c,v 1.189 2009/05/09 19:37:34 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -929,8 +929,9 @@
iterator-funcs-get_current_data(iterator, data TSRMLS_CC);
zend_replace_error_handling(EH_THROW, spl_ce_UnexpectedValueException,
error_handling TSRMLS_CC);
-
- RETVAL_ZVAL(*data, 1, 0);
+ if (data *data) {
+ RETVAL_ZVAL(*data, 1, 0);
+ }
if (Z_TYPE_P(return_value) == IS_ARRAY) {
zval_dtor(return_value);
ZVAL_STRINGL(return_value, Array, sizeof(Array)-1, 1);
@@ -1017,7 +1018,11 @@
zval **data;
iterator-funcs-get_current_data(iterator, data TSRMLS_CC);
- RETURN_ZVAL(*data, 1, 0);
+ if (data *data) {
+ RETURN_ZVAL(*data, 1, 0);
+ } else {
+ RETURN_NULL();
+ }
}
spl_recursive_tree_iterator_get_entry(object, entry TSRMLS_CC);
@@ -2806,7 +2811,9 @@
intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
intern-inner.iterator-funcs-get_current_data(intern-inner.iterator,
data TSRMLS_CC);
- RETURN_ZVAL(*data, 1, 0);
+ if (data *data) {
+ RETURN_ZVAL(*data, 1, 0);
+ }
} /* }}} */
/* {{{ proto void NoRewindIterator::next() U
@@ -3118,6 +3125,9 @@
if (EG(exception)) {
return ZEND_HASH_APPLY_STOP;
}
+ if (data == NULL || *data == NULL) {
+ return ZEND_HASH_APPLY_STOP;
+ }
if (iter-funcs-get_current_key) {
key_type = iter-funcs-get_current_key(iter, str_key,
str_key_len, int_key TSRMLS_CC);
if (EG(exception)) {
@@ -3153,6 +3163,9 @@
if (EG(exception)) {
return ZEND_HASH_APPLY_STOP;
}
+ if (data == NULL || *data == NULL) {
+ return ZEND_HASH_APPLY_STOP;
+ }
Z_ADDREF_PP(data);
add_next_index_zval(return_value, *data);
return ZEND_HASH_APPLY_KEEP;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c
scottmacSat May 9 19:42:43 2009 UTC
Modified files:
/php-src/ext/splspl_iterators.c
Log:
Fix bug #48206 again
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.189r2=1.190diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.189
php-src/ext/spl/spl_iterators.c:1.190
--- php-src/ext/spl/spl_iterators.c:1.189 Sat May 9 19:37:34 2009
+++ php-src/ext/spl/spl_iterators.c Sat May 9 19:42:43 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.189 2009/05/09 19:37:34 scottmac Exp $ */
+/* $Id: spl_iterators.c,v 1.190 2009/05/09 19:42:43 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -600,7 +600,9 @@
zval **data;
iterator-funcs-get_current_data(iterator, data TSRMLS_CC);
- RETURN_ZVAL(*data, 1, 0);
+ if (data *data) {
+ RETURN_ZVAL(*data, 1, 0);
+ }
} /* }}} */
/* {{{ proto void RecursiveIteratorIterator::next() U
--
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 spl_iterators.c
scottmacSat May 9 19:45:26 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_iterators.c
Log:
Fix bug #48206 again
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28.2.23r2=1.73.2.30.2.28.2.24diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.23
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.24
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.23 Sat May 9 19:35:09 2009
+++ php-src/ext/spl/spl_iterators.c Sat May 9 19:45:26 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.23 2009/05/09 19:35:09 scottmac Exp
$ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.24 2009/05/09 19:45:26 scottmac Exp
$ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -596,7 +596,9 @@
zval **data;
iterator-funcs-get_current_data(iterator, data TSRMLS_CC);
- RETURN_ZVAL(*data, 1, 0);
+ if (data *data) {
+ RETURN_ZVAL(*data, 1, 0);
+ }
} /* }}} */
/* {{{ proto void RecursiveIteratorIterator::next()
--
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/spl spl_iterators.c
scottmacSat May 9 19:48:15 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/splspl_iterators.c
Log:
MFH Fix bug #48206 - Iterating over an invalid data structure leads to a
segfault
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.35r2=1.73.2.30.2.36diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.35
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.36
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.35 Tue Jan 20 00:47:01 2009
+++ php-src/ext/spl/spl_iterators.c Sat May 9 19:48:15 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_iterators.c,v 1.73.2.30.2.35 2009/01/20 00:47:01 felipe Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.36 2009/05/09 19:48:15 scottmac Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -536,7 +536,9 @@
zval **data;
iterator-funcs-get_current_data(iterator, data TSRMLS_CC);
- RETURN_ZVAL(*data, 1, 0);
+ if (data *data) {
+ RETURN_ZVAL(*data, 1, 0);
+ }
} /* }}} */
/* {{{ proto void RecursiveIteratorIterator::next()
@@ -2400,7 +2402,9 @@
intern = (spl_dual_it_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
intern-inner.iterator-funcs-get_current_data(intern-inner.iterator,
data TSRMLS_CC);
- RETURN_ZVAL(*data, 1, 0);
+ if (data *data) {
+ RETURN_ZVAL(*data, 1, 0);
+ }
} /* }}} */
/* {{{ proto void NoRewindIterator::next()
@@ -2714,6 +2718,9 @@
if (EG(exception)) {
return ZEND_HASH_APPLY_STOP;
}
+ if (data == NULL || *data == NULL) {
+ return ZEND_HASH_APPLY_STOP;
+ }
if (iter-funcs-get_current_key) {
key_type = iter-funcs-get_current_key(iter, str_key,
str_key_len, int_key TSRMLS_CC);
if (EG(exception)) {
@@ -2745,6 +2752,9 @@
if (EG(exception)) {
return ZEND_HASH_APPLY_STOP;
}
+ if (data == NULL || *data == NULL) {
+ return ZEND_HASH_APPLY_STOP;
+ }
(*data)-refcount++;
add_next_index_zval(return_value, *data);
return ZEND_HASH_APPLY_KEEP;
--
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 dit_003.phpt
scottmacSat May 9 20:18:18 2009 UTC
Modified files:
/php-src/ext/spl/tests dit_003.phpt
Log:
Broken test when you have a snapshot as it relies on CVS
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dit_003.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/spl/tests/dit_003.phpt
diff -u php-src/ext/spl/tests/dit_003.phpt:1.2
php-src/ext/spl/tests/dit_003.phpt:1.3
--- php-src/ext/spl/tests/dit_003.phpt:1.2 Sat May 24 14:11:59 2008
+++ php-src/ext/spl/tests/dit_003.phpt Sat May 9 20:18:18 2009
@@ -3,7 +3,7 @@
--FILE--
?php
$count = 0;
-foreach(new FilesystemIterator('CVS') as $ent)
+foreach(new FilesystemIterator(__DIR__) as $ent)
{
++$count;
}
--
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 dit_003.phpt
scottmacSat May 9 20:18:43 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/spl/tests dit_003.phpt
Log:
MFH Broken test when you have a snapshot as it relies on CVS
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dit_003.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/spl/tests/dit_003.phpt
diff -u php-src/ext/spl/tests/dit_003.phpt:1.1.2.3
php-src/ext/spl/tests/dit_003.phpt:1.1.2.4
--- php-src/ext/spl/tests/dit_003.phpt:1.1.2.3 Sat May 24 14:10:43 2008
+++ php-src/ext/spl/tests/dit_003.phpt Sat May 9 20:18:43 2009
@@ -3,7 +3,7 @@
--FILE--
?php
$count = 0;
-foreach(new FilesystemIterator('CVS') as $ent)
+foreach(new FilesystemIterator(__DIR__) as $ent)
{
++$count;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl spl_iterators.c
Scott MacVicar kirjoitti: scottmacSat May 9 19:48:15 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/spl spl_iterators.c Log: MFH Fix bug #48206 - Iterating over an invalid data structure leads to a segfault NEWS.. ? --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / acinclude.m4
janiSat May 9 20:26:28 2009 UTC Modified files: /php-srcacinclude.m4 Log: - Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi) http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.392r2=1.393diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.392 php-src/acinclude.m4:1.393 --- php-src/acinclude.m4:1.392 Thu Dec 4 00:41:17 2008 +++ php-src/acinclude.m4Sat May 9 20:26:28 2009 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.392 2008/12/04 00:41:17 dsp Exp $ +dnl $Id: acinclude.m4,v 1.393 2009/05/09 20:26:28 jani Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -920,7 +920,7 @@ ]) dnl -dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx[, zend_ext]) +dnl PHP_NEW_EXTENSION(extname, sources [, shared [, sapi_class [, extra-cflags [, cxx [, zend_ext]) dnl dnl Includes an extension in the build. dnl @@ -968,12 +968,15 @@ if test $3 != shared test $3 != yes test $4 = cli; then dnl -- CLI static module [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no -if test $PHP_SAPI = cgi; then - PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,) - EXT_STATIC=$EXT_STATIC $1 -else - PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli) -fi +case $PHP_SAPI in + cgi|embed[)] +PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,) +EXT_STATIC=$EXT_STATIC $1 +;; + *[)] +PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli) +;; +esac EXT_CLI_STATIC=$EXT_CLI_STATIC $1 fi PHP_ADD_BUILD_DIR($ext_builddir) -- 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) / acinclude.m4
janiSat May 9 20:26:51 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcacinclude.m4 Log: MFH:- Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi) http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.26.2.12r2=1.332.2.14.2.26.2.13diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.14.2.26.2.12 php-src/acinclude.m4:1.332.2.14.2.26.2.13 --- php-src/acinclude.m4:1.332.2.14.2.26.2.12 Wed Dec 3 19:53:45 2008 +++ php-src/acinclude.m4Sat May 9 20:26:51 2009 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.14.2.26.2.12 2008/12/03 19:53:45 dsp Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14.2.26.2.13 2009/05/09 20:26:51 jani Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -920,7 +920,7 @@ ]) dnl -dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx[, zend_ext]) +dnl PHP_NEW_EXTENSION(extname, sources [, shared [, sapi_class [, extra-cflags [, cxx [, zend_ext]) dnl dnl Includes an extension in the build. dnl @@ -968,12 +968,15 @@ if test $3 != shared test $3 != yes test $4 = cli; then dnl -- CLI static module [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no -if test $PHP_SAPI = cgi; then - PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,) - EXT_STATIC=$EXT_STATIC $1 -else - PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli) -fi +case $PHP_SAPI in + cgi|embed[)] +PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,) +EXT_STATIC=$EXT_STATIC $1 +;; + *[)] +PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli) +;; +esac EXT_CLI_STATIC=$EXT_CLI_STATIC $1 fi PHP_ADD_BUILD_DIR($ext_builddir) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl spl_iterators.c
On 9 May 2009, at 21:21, Jani Taskinen wrote: Scott MacVicar kirjoitti: scottmacSat May 9 19:48:15 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/spl spl_iterators.c Log: MFH Fix bug #48206 - Iterating over an invalid data structure leads to a segfault NEWS.. ? Wifi on train is an absolute failure, its modified locally just can't get it committed. Scott -- 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 acinclude.m4
janiSat May 9 20:28:04 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcacinclude.m4 NEWS Log: MFH: sync + - Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi) http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.28r2=1.332.2.14.2.29diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.14.2.28 php-src/acinclude.m4:1.332.2.14.2.29 --- php-src/acinclude.m4:1.332.2.14.2.28Mon Sep 8 10:24:38 2008 +++ php-src/acinclude.m4Sat May 9 20:28:02 2009 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.14.2.28 2008/09/08 10:24:38 tony2001 Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14.2.29 2009/05/09 20:28:02 jani Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -920,7 +920,7 @@ ]) dnl -dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx[, zend_ext]) +dnl PHP_NEW_EXTENSION(extname, sources [, shared [, sapi_class [, extra-cflags [, cxx [, zend_ext]) dnl dnl Includes an extension in the build. dnl @@ -968,12 +968,15 @@ if test $3 != shared test $3 != yes test $4 = cli; then dnl -- CLI static module [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no -if test $PHP_SAPI = cgi; then - PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,) - EXT_STATIC=$EXT_STATIC $1 -else - PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli) -fi +case $PHP_SAPI in + cgi|embed[)] +PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,) +EXT_STATIC=$EXT_STATIC $1 +;; + *[)] +PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli) +;; +esac EXT_CLI_STATIC=$EXT_CLI_STATIC $1 fi PHP_ADD_BUILD_DIR($ext_builddir) @@ -2766,6 +2769,23 @@ ) ]) +dnl PHP_DETECT_SUNCC +dnl Detect if the systems default compiler is suncc. +dnl We also set some usefull CFLAGS if the user didn't set any +AC_DEFUN([PHP_DETECT_SUNCC],[ + SUNCC=no + AC_MSG_CHECKING([for suncc]) + AC_EGREP_CPP([^__SUNPRO_C], [__SUNPRO_C], +SUNCC=no +AC_MSG_RESULT([no]), +SUNCC=yes +GCC=no +test -n $auto_cflags CFLAGS=-fsimple=2 -xnorunpath -xO4 -xalias_level=basic -xipo=1 -xlibmopt -xprefetch_level=1 -xprefetch=auto -xstrconst -xtarget=native -zlazyload +GCC= +AC_MSG_RESULT([yes]) + ) +]) + dnl dnl PHP_CRYPT_R_STYLE dnl detect the style of crypt_r() is any is available http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1491r2=1.2027.2.547.2.1492diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1491 php-src/NEWS:1.2027.2.547.2.1492 --- php-src/NEWS:1.2027.2.547.2.1491Thu May 7 13:45:47 2009 +++ php-src/NEWSSat May 9 20:28:03 2009 @@ -12,7 +12,6 @@ - Fixed leaks in imap when a mail_criteria is used. (Pierre) - Fixed bug #48156 (Added support for lcov v1.7). (Ilia) - - Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via bindto). (Ilia) - Fixed bug #48132 (configure check for curl ssl support fails with @@ -58,6 +57,7 @@ - Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia) - Fixed bug #47487 (performance degraded when reading large chunks after fix of bug #44607). (Arnaud) +- Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi). (Jani) - Fixed bug #47365 (ip2long() may allow some invalid values on certain 64bit systems). (Ilia) - Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/fileinfo/libmagic patchlevel.h readcdf.c
scottmacSat May 9 20:34:26 2009 UTC
Modified files:
/php-src/ext/fileinfo/libmagic patchlevel.h readcdf.c
Log:
Update bundled libmagic to 5.03
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/patchlevel.h?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/fileinfo/libmagic/patchlevel.h
diff -u php-src/ext/fileinfo/libmagic/patchlevel.h:1.4
php-src/ext/fileinfo/libmagic/patchlevel.h:1.5
--- php-src/ext/fileinfo/libmagic/patchlevel.h:1.4 Mon May 4 20:52:43 2009
+++ php-src/ext/fileinfo/libmagic/patchlevel.h Sat May 9 20:34:26 2009
@@ -1,11 +1,14 @@
#defineFILE_VERSION_MAJOR 5
-#definepatchlevel 2
+#definepatchlevel 3
/*
* Patchlevel file for Ian Darwin's MAGIC command.
* $File: patchlevel.h,v 1.68 2008/03/22 21:39:43 christos Exp $
*
* $Log: patchlevel.h,v $
+ * Revision 1.5 2009/05/09 20:34:26 scottmac
+ * Update bundled libmagic to 5.03
+ *
* Revision 1.4 2009/05/04 20:52:43 scottmac
* Update libmagic to 5.02
*
http://cvs.php.net/viewvc.cgi/php-src/ext/fileinfo/libmagic/readcdf.c?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/fileinfo/libmagic/readcdf.c
diff -u php-src/ext/fileinfo/libmagic/readcdf.c:1.3
php-src/ext/fileinfo/libmagic/readcdf.c:1.4
--- php-src/ext/fileinfo/libmagic/readcdf.c:1.3 Mon May 4 20:52:43 2009
+++ php-src/ext/fileinfo/libmagic/readcdf.c Sat May 9 20:34:26 2009
@@ -155,15 +155,8 @@
size_t count;
int m;
- if (cdf_unpack_summary_info(sst, si, info, count) == -1) {
- if (si.si_byte_order != 0xfffe)
- return 0;
- else
- return -1;
- }
-
- if (si.si_byte_order != 0xfffe)
- return 0;
+ if (cdf_unpack_summary_info(sst, si, info, count) == -1)
+ return -1;
if (NOTMIME(ms)) {
if (file_printf(ms, CDF V2 Document) == -1)
@@ -255,7 +248,7 @@
if ((i = cdf_read_summary_info(info, h, sat, ssat, sst, dir,
scn)) == -1) {
- expn = ;
+ expn = Cannot read summary info;
goto out4;
}
#ifdef CDF_DEBUG
--
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 configure.in /scripts phpize.m4
janiSat May 9 20:36:35 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS configure.in /php-src/scriptsphpize.m4 Log: MFH: Add support for Sun CC http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1492r2=1.2027.2.547.2.1493diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1492 php-src/NEWS:1.2027.2.547.2.1493 --- php-src/NEWS:1.2027.2.547.2.1492Sat May 9 20:28:03 2009 +++ php-src/NEWSSat May 9 20:36:34 2009 @@ -5,6 +5,7 @@ - Added new CURL options CURLOPT_REDIR_PROTOCOLS, CURLOPT_PROTOCOLS, and CURLPROTO_* for redirect fixes in CURL 7.19.4. (Yoram Bar Haim, Stas) +- Added support for Sun CC (FR #46595 and FR #46513). (David Soria Parra) - Fixed memory corruptions while reading properties of zip files. (Ilia) - Fixed memory leak in ob_get_clean/ob_get_flush. (Christian) http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.133r2=1.579.2.52.2.134diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.133 php-src/configure.in:1.579.2.52.2.134 --- php-src/configure.in:1.579.2.52.2.133 Wed May 6 14:05:54 2009 +++ php-src/configure.inSat May 9 20:36:35 2009 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.133 2009/05/06 14:05:54 iliaa Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.134 2009/05/09 20:36:35 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -140,8 +140,9 @@ dnl Checks for programs. dnl - -AC_PROG_CC +AC_PROG_CC([cc gcc]) PHP_DETECT_ICC +PHP_DETECT_SUNCC AC_PROG_CC_C_O dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf dnl AC_PROG_CC_STDC @@ -187,6 +188,10 @@ CFLAGS=$CFLAGS -ieee fi ;; + sparc*) +if test $SUNCC = yes; then + CFLAGS=$CFLAGS -xmemalign=8s +fi esac case $host_alias in @@ -731,6 +736,15 @@ dnl Add the special gcc flags CFLAGS=$CFLAGS -O0 -fprofile-arcs -ftest-coverage CXXFLAGS=$CXXFLAGS -O0 -fprofile-arcs -ftest-coverage + if test $SUNCC = yes; then +if test -n $auto_cflags; then + CFLAGS=-g + CXXFLAGS=-g +else + CFLAGS=$CFLAGS -g + CXXFLAGS=$CFLAGS -g +fi + fi fi PHP_ARG_ENABLE(debug, whether to include debugging symbols, http://cvs.php.net/viewvc.cgi/php-src/scripts/phpize.m4?r1=1.17.2.3.2.9r2=1.17.2.3.2.10diff_format=u Index: php-src/scripts/phpize.m4 diff -u php-src/scripts/phpize.m4:1.17.2.3.2.9 php-src/scripts/phpize.m4:1.17.2.3.2.10 --- php-src/scripts/phpize.m4:1.17.2.3.2.9 Thu Jul 31 00:45:46 2008 +++ php-src/scripts/phpize.m4 Sat May 9 20:36:35 2009 @@ -17,11 +17,15 @@ test [$]$1 = no $1=yes ])dnl dnl + +test -z $CFLAGS auto_cflags=1 + abs_srcdir=`(cd $srcdir pwd)` abs_builddir=`pwd` -AC_PROG_CC +AC_PROG_CC([cc gcc]) PHP_DETECT_ICC +PHP_DETECT_SUNCC AC_PROG_CC_C_O dnl Support systems with system libraries in e.g. /usr/lib64 @@ -116,6 +120,15 @@ CFLAGS=$CFLAGS -O0 CXXFLAGS=$CXXFLAGS -O0 fi + if test $SUNCC = yes; then +if test -n $auto_cflags; then + CFLAGS=-g + CXXFLAGS=-g +else + CFLAGS=$CFLAGS -g + CXXFLAGS=$CFLAGS -g +fi + fi else PHP_DEBUG=0 ZEND_DEBUG=no -- 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
janiSat May 9 20:37:47 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: - Moved to PHP_5_2 http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.591r2=1.2027.2.547.2.965.2.592diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.591 php-src/NEWS:1.2027.2.547.2.965.2.592 --- php-src/NEWS:1.2027.2.547.2.965.2.591 Thu May 7 23:29:54 2009 +++ php-src/NEWSSat May 9 20:37:47 2009 @@ -5,6 +5,7 @@ - Disabled SQLite3::loadExtension for threaded SAPIs. (Scott) + 07 May 2009, PHP 5.3.0 RC 2 - Upgraded bundled sqlite to version 3.6.13. (Ilia) - Upgraded bundled PCRE to version 7.9. (Nuno) @@ -274,9 +275,6 @@ (Keisial at gmail dot com, Greg) - Added support for using compressed connections with PDO_mysql. (Johannes) -- Implemented FR #46595 (Use cc as the default compiler). (David Soria Parra) -- Implemented FR #46513 (Missing compiler flags for suncc). (David Soria Parra) - - Deprecated define_syslog_variables(). (Kalle) - Deprecated ereg extension. (Felipe) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/spl spl_iterators.c
On Sat, 2009-05-09 at 19:37 +, Scott MacVicar wrote: scottmac Sat May 9 19:37:34 2009 UTC Modified files: /php-src/ext/spl spl_iterators.c Log: Fix bug #48206 - Iterating over an invalid data structure leads to a segfault is there a test case for this which can be committed? johannes -- 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
scottmacSat May 9 20:42:44 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.592r2=1.2027.2.547.2.965.2.593diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.965.2.592 php-src/NEWS:1.2027.2.547.2.965.2.593 --- php-src/NEWS:1.2027.2.547.2.965.2.592 Sat May 9 20:37:47 2009 +++ php-src/NEWSSat May 9 20:42:44 2009 @@ -2,6 +2,7 @@ ||| ?? ??? 2009, PHP 5.3.0 RC 3 - Upgraded bundled sqlite to version 3.6.14. (Scott) +- Upgraded bundled libmagic to 5.03 in the fileinfo extension. (Scott) - Disabled SQLite3::loadExtension for threaded SAPIs. (Scott) -- 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
scottmacSat May 9 20:42:56 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: BFN http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1493r2=1.2027.2.547.2.1494diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1493 php-src/NEWS:1.2027.2.547.2.1494 --- php-src/NEWS:1.2027.2.547.2.1493Sat May 9 20:36:34 2009 +++ php-src/NEWSSat May 9 20:42:56 2009 @@ -12,6 +12,8 @@ - Fixed segfault on invalid session.save_path. (Hannes) - Fixed leaks in imap when a mail_criteria is used. (Pierre) +- Fixed bug #48206 (Iterating over an invalid data structure + with RecursiveIteratorIterator leads to a segfault). (Scott) - Fixed bug #48156 (Added support for lcov v1.7). (Ilia) - Fixed bug #48131 (Don't try to bind ipv4 addresses to ipv6 ips via bindto). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/spl spl_iterators.c
On 9 May 2009, at 21:42, Johannes Schlüter wrote: On Sat, 2009-05-09 at 19:37 +, Scott MacVicar wrote: scottmacSat May 9 19:37:34 2009 UTC Modified files: /php-src/ext/spl spl_iterators.c Log: Fix bug #48206 - Iterating over an invalid data structure leads to a segfault is there a test case for this which can be committed? It's in the testfest repository, didn't want to get a test duplicated. Will be copied over early next week. Scott -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/spl spl_iterators.c
Johannes Schlüter wrote: On Sat, 2009-05-09 at 19:37 +, Scott MacVicar wrote: scottmacSat May 9 19:37:34 2009 UTC Modified files: /php-src/ext/spl spl_iterators.c Log: Fix bug #48206 - Iterating over an invalid data structure leads to a segfault is there a test case for this which can be committed? johannes Yes: recursiveiteratoriterator_getsubiterator_variation_002.phpt. It's from the London test fest and I will commit. Z -- 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/spl/tests bug47534.phpt
colder Sat May 9 20:58:34 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/spl/tests bug47534.phpt Log: Add test for bug #47534 http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug47534.phpt?view=markuprev=1.1 Index: php-src/ext/spl/tests/bug47534.phpt +++ php-src/ext/spl/tests/bug47534.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl spl_directory.c /ext/spl/tests bug47534.phpt
colder Sat May 9 21:05:18 2009 UTC
Modified files:
/php-src/ext/spl/tests bug47534.phpt
/php-src/ext/splspl_directory.c
Log:
Fix bug #47534 (RecursiveDirectoryIterator::getChildren ignoring
CURRENT_AS_PATHNAME)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug47534.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/spl/tests/bug47534.phpt
diff -u /dev/null php-src/ext/spl/tests/bug47534.phpt:1.2
--- /dev/null Sat May 9 21:05:18 2009
+++ php-src/ext/spl/tests/bug47534.phpt Sat May 9 21:05:18 2009
@@ -0,0 +1,14 @@
+--TEST--
+SPL: RecursiveDirectoryIterator bug 47534
+--FILE--
+?php
+$it1 = new RecursiveDirectoryIterator(dirname(__FILE__),
FileSystemIterator::CURRENT_AS_PATHNAME);
+$it1-rewind();
+echo gettype($it1-current()).\n;
+
+$it2 = new RecursiveDirectoryIterator(dirname(__FILE__));
+$it2-rewind();
+echo gettype($it2-current()).\n;
+--EXPECT--
+unicode
+object
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.180r2=1.181diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.180
php-src/ext/spl/spl_directory.c:1.181
--- php-src/ext/spl/spl_directory.c:1.180 Thu Mar 26 20:02:12 2009
+++ php-src/ext/spl/spl_directory.c Sat May 9 21:05:18 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.180 2009/03/26 20:02:12 felipe Exp $ */
+/* $Id: spl_directory.c,v 1.181 2009/05/09 21:05:18 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1386,28 +1386,32 @@
spl_filesystem_object_get_file_name(intern TSRMLS_CC);
- INIT_PZVAL(zflags);
- INIT_PZVAL(zpath);
- ZVAL_LONG(zflags, intern-flags);
- ZVAL_ZSTRL(zpath, intern-file_name_type, intern-file_name,
intern-file_name_len, 1);
-
- spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), return_value, 0, zpath,
zflags TSRMLS_CC);
-
- zval_dtor(zpath);
-
- subdir =
(spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC);
- if (subdir) {
- if (intern-u.dir.sub_path.v intern-u.dir.sub_path_len 1)
{
- subdir-u.dir.sub_path_type =
intern-u.dir.sub_path_type;
- subdir-u.dir.sub_path_len =
zspprintf(intern-u.dir.sub_path_type, subdir-u.dir.sub_path, 0, %R%c%s,
intern-u.dir.sub_path_type, intern-u.dir.sub_path, slash,
intern-u.dir.entry.d_name);
- } else {
- subdir-u.dir.sub_path_len =
strlen(intern-u.dir.entry.d_name);
- subdir-u.dir.sub_path_type = IS_STRING;
- subdir-u.dir.sub_path.s =
estrndup(intern-u.dir.entry.d_name, subdir-u.dir.sub_path_len);
- }
- subdir-info_class = intern-info_class;
- subdir-file_class = intern-file_class;
- subdir-oth = intern-oth;
+ if (SPL_HAS_FLAG(intern-flags, SPL_FILE_DIR_CURRENT_AS_PATHNAME)) {
+ RETURN_ZSTRL(intern-file_name_type, intern-file_name,
intern-file_name_len, 1);
+ } else {
+ INIT_PZVAL(zflags);
+ INIT_PZVAL(zpath);
+ ZVAL_LONG(zflags, intern-flags);
+ ZVAL_ZSTRL(zpath, intern-file_name_type, intern-file_name,
intern-file_name_len, 1);
+
+ spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), return_value, 0,
zpath, zflags TSRMLS_CC);
+
+ zval_dtor(zpath);
+
+ subdir =
(spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC);
+ if (subdir) {
+ if (intern-u.dir.sub_path.v
intern-u.dir.sub_path_len 1) {
+ subdir-u.dir.sub_path_type =
intern-u.dir.sub_path_type;
+ subdir-u.dir.sub_path_len =
zspprintf(intern-u.dir.sub_path_type, subdir-u.dir.sub_path, 0, %R%c%s,
intern-u.dir.sub_path_type, intern-u.dir.sub_path, slash,
intern-u.dir.entry.d_name);
+ } else {
+ subdir-u.dir.sub_path_len =
strlen(intern-u.dir.entry.d_name);
+ subdir-u.dir.sub_path_type = IS_STRING;
+ subdir-u.dir.sub_path.s =
estrndup(intern-u.dir.entry.d_name, subdir-u.dir.sub_path_len);
+ }
+ subdir-info_class = intern-info_class;
+ subdir-file_class = intern-file_class;
+ subdir-oth = intern-oth;
+ }
}
}
/* }}} */
--
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/spl spl_directory.c /ext/spl/tests bug47534.phpt
colder Sat May 9 21:06:59 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests bug47534.phpt
Modified files:
/php-src/ext/splspl_directory.c
/php-srcNEWS
Log:
MFH: Fix bug #47534 (RecursiveDirectoryIterator::getChildren ignoring
CURRENT_AS_PATHNAME)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_directory.c?r1=1.45.2.27.2.23.2.41r2=1.45.2.27.2.23.2.42diff_format=u
Index: php-src/ext/spl/spl_directory.c
diff -u php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.41
php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.42
--- php-src/ext/spl/spl_directory.c:1.45.2.27.2.23.2.41 Tue Mar 10 23:28:17 2009
+++ php-src/ext/spl/spl_directory.c Sat May 9 21:06:58 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.41 2009/03/10 23:28:17 helly Exp $
*/
+/* $Id: spl_directory.c,v 1.45.2.27.2.23.2.42 2009/05/09 21:06:58 colder Exp $
*/
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1268,24 +1268,27 @@
spl_filesystem_object_get_file_name(intern TSRMLS_CC);
- INIT_PZVAL(zflags);
- INIT_PZVAL(zpath);
- ZVAL_LONG(zflags, intern-flags);
- ZVAL_STRINGL(zpath, intern-file_name, intern-file_name_len, 0);
-
- spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), return_value, 0, zpath,
zflags TSRMLS_CC);
-
- subdir =
(spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC);
- if (subdir) {
- if (intern-u.dir.sub_path intern-u.dir.sub_path[0]) {
- subdir-u.dir.sub_path_len =
spprintf(subdir-u.dir.sub_path, 0, %s%c%s, intern-u.dir.sub_path, slash,
intern-u.dir.entry.d_name);
- } else {
- subdir-u.dir.sub_path_len =
strlen(intern-u.dir.entry.d_name);
- subdir-u.dir.sub_path =
estrndup(intern-u.dir.entry.d_name, subdir-u.dir.sub_path_len);
+ if (SPL_HAS_FLAG(intern-flags, SPL_FILE_DIR_CURRENT_AS_PATHNAME)) {
+ RETURN_STRINGL(intern-file_name, intern-file_name_len, 1);
+ } else {
+ INIT_PZVAL(zflags);
+ INIT_PZVAL(zpath);
+ ZVAL_LONG(zflags, intern-flags);
+ ZVAL_STRINGL(zpath, intern-file_name, intern-file_name_len,
0);
+ spl_instantiate_arg_ex2(Z_OBJCE_P(getThis()), return_value, 0,
zpath, zflags TSRMLS_CC);
+
+ subdir =
(spl_filesystem_object*)zend_object_store_get_object(return_value TSRMLS_CC);
+ if (subdir) {
+ if (intern-u.dir.sub_path
intern-u.dir.sub_path[0]) {
+ subdir-u.dir.sub_path_len =
spprintf(subdir-u.dir.sub_path, 0, %s%c%s, intern-u.dir.sub_path, slash,
intern-u.dir.entry.d_name);
+ } else {
+ subdir-u.dir.sub_path_len =
strlen(intern-u.dir.entry.d_name);
+ subdir-u.dir.sub_path =
estrndup(intern-u.dir.entry.d_name, subdir-u.dir.sub_path_len);
+ }
+ subdir-info_class = intern-info_class;
+ subdir-file_class = intern-file_class;
+ subdir-oth = intern-oth;
}
- subdir-info_class = intern-info_class;
- subdir-file_class = intern-file_class;
- subdir-oth = intern-oth;
}
}
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.593r2=1.2027.2.547.2.965.2.594diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.593
php-src/NEWS:1.2027.2.547.2.965.2.594
--- php-src/NEWS:1.2027.2.547.2.965.2.593 Sat May 9 20:42:44 2009
+++ php-src/NEWSSat May 9 21:06:59 2009
@@ -63,6 +63,8 @@
- Fixed bug #47560 (explode()'s limit parameter odd behaviour). (Matt)
- Fixed bug #47535 (Compilation failure in ps_fetch_from_1_to_8_bytes()).
(Johannes)
+- Fixed bug #47534 (RecursiveDiteratoryIterator::getChildren ignoring
+ CURRENT_AS_PATHNAME). (Etienne)
- Fixed bug #47516 (nowdoc can not be embed in heredoc but can be embed in
double quote). (Dmitry)
- Fixed bug #47038 (Memory leak in include). (Dmitry)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug47534.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/bug47534.phpt
+++ php-src/ext/spl/tests/bug47534.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 CREDITS credits_ext.h
johannesSat May 9 22:33:55 2009 UTC Removed files: /php-src/ext/standard CREDITS Modified files: /php-src/ext/standard credits_ext.h Log: Remove bad CREDITS file # I'd welcome sane proposals for ext/standard credits, there are ca. 20 people # mentioned as Author and 100 people who committed into *.c here http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.48r2=1.49diff_format=u Index: php-src/ext/standard/credits_ext.h diff -u php-src/ext/standard/credits_ext.h:1.48 php-src/ext/standard/credits_ext.h:1.49 --- php-src/ext/standard/credits_ext.h:1.48 Thu Apr 2 09:24:16 2009 +++ php-src/ext/standard/credits_ext.h Sat May 9 22:33:55 2009 @@ -10,7 +10,6 @@ */ -CREDIT_LINE(Assert, Thies C. Arntzen); CREDIT_LINE(BC Math, Andi Gutmans); CREDIT_LINE(Bzip2, Sterling Hughes); CREDIT_LINE(Calendar, Shane Caraveo, Colin Viebrock, Hartmut Holzgraefe, Wez Furlong); -- 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 credits_ext.h
johannesSat May 9 22:34:45 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard credits_ext.h Log: MFH Remove bad CREDITS file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/credits_ext.h?r1=1.30.2.6.2.6.2.11r2=1.30.2.6.2.6.2.12diff_format=u Index: php-src/ext/standard/credits_ext.h diff -u php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.11 php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.12 --- php-src/ext/standard/credits_ext.h:1.30.2.6.2.6.2.11Thu Apr 2 09:18:00 2009 +++ php-src/ext/standard/credits_ext.h Sat May 9 22:34:45 2009 @@ -10,7 +10,6 @@ */ -CREDIT_LINE(Assert, Thies C. Arntzen); CREDIT_LINE(BC Math, Andi Gutmans); CREDIT_LINE(Bzip2, Sterling Hughes); CREDIT_LINE(Calendar, Shane Caraveo, Colin Viebrock, Hartmut Holzgraefe, Wez Furlong); -- 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 CREDITS
johannesSat May 9 22:36:14 2009 UTC Removed files: (Branch: PHP_5_3) /php-src/ext/standard CREDITS Log: really delete it -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/sockets sockets.c
felipe Sun May 10 01:00:15 2009 UTC
Modified files:
/php-src/ext/socketssockets.c
Log:
- Fixed memory leak (patch by Christian Weiske)
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.212r2=1.213diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.212 php-src/ext/sockets/sockets.c:1.213
--- php-src/ext/sockets/sockets.c:1.212 Thu Apr 16 05:32:58 2009
+++ php-src/ext/sockets/sockets.c Sun May 10 01:00:15 2009
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.212 2009/04/16 05:32:58 pajoye Exp $ */
+/* $Id: sockets.c,v 1.213 2009/05/10 01:00:15 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1553,6 +1553,7 @@
sin.sin_family = AF_INET;
if (arg6 == NULL) {
+ efree(recv_buf);
WRONG_PARAM_COUNT;
}
@@ -1581,6 +1582,7 @@
sin6.sin6_family = AF_INET6;
if (arg6 == NULL) {
+ efree(recv_buf);
WRONG_PARAM_COUNT;
}
--
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/sockets sockets.c
felipe Sun May 10 01:03:45 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/socketssockets.c
Log:
- MFH: Fixed memory leak (patch by Christian Weiske)
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.14.2.17r2=1.171.2.9.2.14.2.18diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.17
php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.18
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.17 Thu Apr 16 05:33:13 2009
+++ php-src/ext/sockets/sockets.c Sun May 10 01:03:45 2009
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.171.2.9.2.14.2.17 2009/04/16 05:33:13 pajoye Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.14.2.18 2009/05/10 01:03:45 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1563,6 +1563,7 @@
sin.sin_family = AF_INET;
if (arg6 == NULL) {
+ efree(recv_buf);
WRONG_PARAM_COUNT;
}
@@ -1591,6 +1592,7 @@
sin6.sin6_family = AF_INET6;
if (arg6 == NULL) {
+ efree(recv_buf);
WRONG_PARAM_COUNT;
}
--
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/sockets sockets.c
felipe Sun May 10 01:07:01 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/socketssockets.c
Log:
- MFH: Fixed memory leak (patch by Christian Weiske)
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.23r2=1.171.2.9.2.24diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.23
php-src/ext/sockets/sockets.c:1.171.2.9.2.24
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.23Thu Apr 16 05:32:38 2009
+++ php-src/ext/sockets/sockets.c Sun May 10 01:07:01 2009
@@ -19,7 +19,7 @@
+--+
*/
-/* $Id: sockets.c,v 1.171.2.9.2.23 2009/04/16 05:32:38 pajoye Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.24 2009/05/10 01:07:01 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1418,6 +1418,7 @@
sin.sin_family = AF_INET;
if (arg6 == NULL) {
+ efree(recv_buf);
WRONG_PARAM_COUNT;
}
@@ -1446,6 +1447,7 @@
sin6.sin6_family = AF_INET6;
if (arg6 == NULL) {
+ efree(recv_buf);
WRONG_PARAM_COUNT;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
