[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Dec 18 01:31:33 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1210r2=1.1211diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1210 ZendEngine2/ChangeLog:1.1211 --- ZendEngine2/ChangeLog:1.1210Sat Dec 15 01:31:29 2007 +++ ZendEngine2/ChangeLog Tue Dec 18 01:31:33 2007 @@ -1,3 +1,18 @@ +2007-12-17 Dmitry Stogov [EMAIL PROTECTED] + +* zend_operators.c: + Fixed bug #42868 (Floats cast to integer droduce unpredicatable results). + (Zoe Slattery) + +* (PHP_5_3) + tests/bug41919.phpt: + Fixed test + +* (PHP_5_3) + zend_operators.c: + Fixed bug #42868 (Floats cast to integer produce unpredicatable results). + (Zoe Slattery) + 2007-12-14 Dmitry Stogov [EMAIL PROTECTED] * zend_execute.c @@ -20424,7 +20439,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1210 2007/12/15 01:31:29 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1211 2007/12/18 01:31:33 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -22148,7 +22163,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1210 2007/12/15 01:31:29 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1211 2007/12/18 01:31:33 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/exif exif.c
janiMon Dec 17 08:51:17 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/exif exif.c
Log:
- Fix indent of macros
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20.2.2r2=1.173.2.5.2.20.2.3diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20.2.2
php-src/ext/exif/exif.c:1.173.2.5.2.20.2.3
--- php-src/ext/exif/exif.c:1.173.2.5.2.20.2.2 Sun Dec 16 17:14:11 2007
+++ php-src/ext/exif/exif.c Mon Dec 17 08:51:17 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.173.2.5.2.20.2.2 2007/12/16 17:14:11 iliaa Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.20.2.3 2007/12/17 08:51:17 jani Exp $ */
/* ToDos
*
@@ -142,7 +142,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.20.2.2 2007/12/16 17:14:11
iliaa Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.20.2.3 2007/12/17 08:51:17
jani Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -244,9 +244,9 @@
/* {{{ exif dependencies */
static const zend_module_dep exif_module_deps[] = {
ZEND_MOD_REQUIRED(standard)
- #if EXIF_USE_MBSTRING
+#if EXIF_USE_MBSTRING
ZEND_MOD_REQUIRED(mbstring)
- #endif
+#endif
{NULL, NULL, NULL}
};
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/exif exif.c
janiMon Dec 17 08:51:58 2007 UTC
Modified files:
/php-src/ext/exif exif.c
Log:
- Fix indent of macros
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.197r2=1.198diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.197 php-src/ext/exif/exif.c:1.198
--- php-src/ext/exif/exif.c:1.197 Sun Dec 16 17:15:05 2007
+++ php-src/ext/exif/exif.c Mon Dec 17 08:51:58 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.197 2007/12/16 17:15:05 iliaa Exp $ */
+/* $Id: exif.c,v 1.198 2007/12/17 08:51:58 jani Exp $ */
/* ToDos
*
@@ -142,7 +142,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.197 2007/12/16 17:15:05 iliaa Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.198 2007/12/17 08:51:58 jani Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -244,9 +244,9 @@
/* {{{ exif dependencies */
static const zend_module_dep exif_module_deps[] = {
ZEND_MOD_REQUIRED(standard)
- #if EXIF_USE_MBSTRING
+#if EXIF_USE_MBSTRING
ZEND_MOD_REQUIRED(mbstring)
- #endif
+#endif
{NULL, NULL, 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_2) /ext/exif exif.c
janiMon Dec 17 08:52:30 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/exif exif.c
Log:
MFH:- Fix indent of macros
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.21r2=1.173.2.5.2.22diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.21
php-src/ext/exif/exif.c:1.173.2.5.2.22
--- php-src/ext/exif/exif.c:1.173.2.5.2.21 Sun Dec 16 17:14:54 2007
+++ php-src/ext/exif/exif.c Mon Dec 17 08:52:30 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.173.2.5.2.21 2007/12/16 17:14:54 iliaa Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.22 2007/12/17 08:52:30 jani Exp $ */
/* ToDos
*
@@ -142,7 +142,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.21 2007/12/16 17:14:54
iliaa Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.22 2007/12/17 08:52:30
jani Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -244,9 +244,9 @@
/* {{{ exif dependencies */
static const zend_module_dep exif_module_deps[] = {
ZEND_MOD_REQUIRED(standard)
- #if EXIF_USE_MBSTRING
+#if EXIF_USE_MBSTRING
ZEND_MOD_REQUIRED(mbstring)
- #endif
+#endif
{NULL, NULL, 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) / NEWS /ext/standard/tests/array array_fill_variation1.phpt /ext/standard/tests/general_functions gettype_settype_variation2.phpt /ext/standard/tests/strings chunk_s
dmitry Mon Dec 17 10:02:13 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcNEWS
/ZendEngine2zend_operators.c
/php-src/ext/standard/tests/array array_fill_variation1.phpt
/php-src/ext/standard/tests/general_functions
gettype_settype_variation2.phpt
/php-src/ext/standard/tests/strings chunk_split_variation2.phpt
htmlspecialchars_decode_variation2.phpt
pack.phpt
sprintf_variation35.phpt
sprintf_variation4.phpt
sprintf_variation41.phpt
str_split_variation2.phpt
vsprintf_variation15.phpt
vsprintf_variation15_64bit.phpt
vsprintf_variation16.phpt
vsprintf_variation4.phpt
Log:
Fixed bug #42868 (Floats cast to integer produce unpredicatable results).
(Zoe Slattery)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.58r2=1.2027.2.547.2.965.2.59diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.58
php-src/NEWS:1.2027.2.547.2.965.2.59
--- php-src/NEWS:1.2027.2.547.2.965.2.58Fri Dec 14 14:49:15 2007
+++ php-src/NEWSMon Dec 17 10:02:12 2007
@@ -68,6 +68,8 @@
- Fixed bug #43128 (Very long class name causes segfault). (Dmitry)
- Fixed bug #42952 (soap cache file is created with insecure permissions).
(Dmitry)
+- Fixed bug #42868 (Floats cast to integer produce unpredicatable results).
+ (Zoe Slattery)
- Fixed bug #42848 (Status: header incorrect under FastCGI). (Dmitry)
- Fixed bug #42773 (WSDL error causes HTTP 500 Response). (Dmitry)
- Fixed bug #42737 (preg_split('//u') triggers a E_NOTICE with newlines).
(Nuno)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.208.2.4.2.23.2.3r2=1.208.2.4.2.23.2.4diff_format=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.3
ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.4
--- ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.3 Tue Nov 20 13:26:36 2007
+++ ZendEngine2/zend_operators.cMon Dec 17 10:02:13 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.3 2007/11/20 13:26:36 dmitry Exp $
*/
+/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.4 2007/12/17 10:02:13 dmitry Exp $
*/
#include ctype.h
@@ -183,20 +183,37 @@
}
\
}
+#define MAX_UNSIGNED_INT ((double) LONG_MAX * 2) + 1
#ifdef _WIN64
# define DVAL_TO_LVAL(d, l) \
- if ((d) LONG_MAX) { \
- (l) = (long)(unsigned long)(__int64) (d); \
- } else { \
- (l) = (long) (d); \
- }
+if ((d) LONG_MAX) { \
+if ((d) MAX_UNSIGNED_INT) { \
+(l) = LONG_MAX; \
+} else { \
+(l) = (long)(unsigned long)(__int64) (d); \
+} \
+} else { \
+if((d) LONG_MIN) { \
+(l) = LONG_MIN; \
+} else { \
+(l) = (long) (d); \
+} \
+}
#else
# define DVAL_TO_LVAL(d, l) \
- if ((d) LONG_MAX) { \
- (l) = (unsigned long) (d); \
- } else { \
- (l) = (long) (d); \
- }
+if ((d) LONG_MAX) { \
+if ((d) MAX_UNSIGNED_INT) { \
+(l) = LONG_MAX; \
+} else { \
+(l) = (unsigned long) (d); \
+} \
+} else { \
+if((d) LONG_MIN) { \
+(l) = LONG_MIN; \
+} else { \
+(l) = (long) (d); \
+} \
+}
#endif
#define zendi_convert_to_long(op, holder, result)
\
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_fill_variation1.phpt?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/standard/tests/array/array_fill_variation1.phpt
diff -u php-src/ext/standard/tests/array/array_fill_variation1.phpt:1.1.2.4
php-src/ext/standard/tests/array/array_fill_variation1.phpt:1.1.2.5
--- php-src/ext/standard/tests/array/array_fill_variation1.phpt:1.1.2.4 Thu Nov
8 10:13:33 2007
+++ php-src/ext/standard/tests/array/array_fill_variation1.phpt Mon Dec 17
10:02:13 2007
@@ -125,9 +125,9 @@
}
-- Iteration 3 --
array(2) {
- [-1097262584]=
+ [2147483647]=
int(100)
- [0]=
+ [-2147483648]=
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings setlocale_basic1.phpt setlocale_basic2.phpt setlocale_basic3.phpt setlocale_error.phpt setlocale_variation1.phpt setlocale_variation2.ph
ext/standard/tests/strings/setlocale_basic1.phpt $common_locales = array( english_US= en_US.utf8gfd, english_AU = en_AU.utf8hgg, These gfd and hgg... I don't think these are common locales.. typos? This test also needs a skipif section, I don't have any of these locales so the test fails for me. -Hannes On Oct 5, 2007 8:32 PM, Raghubansh Kumar [EMAIL PROTECTED] wrote: kraghubaFri Oct 5 19:32:28 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings setlocale_variation4.phpt setlocale_variation5.phpt setlocale_basic1.phpt setlocale_error.phpt setlocale_basic2.phpt setlocale_basic3.phpt setlocale_variation1.phpt setlocale_variation2.phpt setlocale_variation3.phpt Log: New testcases for setlocale() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation4.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation5.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_basic1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_basic1.phpt +++ php-src/ext/standard/tests/strings/setlocale_basic1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_error.phpt +++ php-src/ext/standard/tests/strings/setlocale_error.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_basic2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_basic2.phpt +++ php-src/ext/standard/tests/strings/setlocale_basic2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_basic3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_basic3.phpt +++ php-src/ext/standard/tests/strings/setlocale_basic3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation1.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation2.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/setlocale_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/strings/setlocale_variation3.phpt +++ php-src/ext/standard/tests/strings/setlocale_variation3.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.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) / run-tests.php
bjori Mon Dec 17 11:00:16 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-srcrun-tests.php
Log:
Check if we know which php executable we should use
# Fixes weird test failures when TEST_PHP_EXECUTABLE isn't set
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.6r2=1.226.2.37.2.35.2.7diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.6
php-src/run-tests.php:1.226.2.37.2.35.2.7
--- php-src/run-tests.php:1.226.2.37.2.35.2.6 Wed Dec 12 09:20:54 2007
+++ php-src/run-tests.php Mon Dec 17 11:00:16 2007
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.6 2007/12/12 09:20:54 tony2001 Exp $
*/
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.7 2007/12/17 11:00:16 bjori Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -408,7 +408,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.6
$'.\n;
+ echo '$Revision: 1.226.2.37.2.35.2.7
$'.\n;
exit(1);
case 'u':
@@ -519,6 +519,7 @@
// Run selected tests.
$test_cnt = count($test_files);
if ($test_cnt) {
+ verify_config();
write_information($html_output);
usort($test_files, test_sort);
$start_time = time();
--
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/array array_fill_variation1.phpt /ext/standard/tests/general_functions gettype_settype_variation2.phpt /ext/standard/tests/strings chunk_split_variation2.p
dmitry Mon Dec 17 11:06:43 2007 UTC
Modified files:
/ZendEngine2zend_operators.c
/php-src/ext/standard/tests/array array_fill_variation1.phpt
/php-src/ext/standard/tests/general_functions
gettype_settype_variation2.phpt
/php-src/ext/standard/tests/strings chunk_split_variation2.phpt
htmlspecialchars_decode_variation2.phpt
pack.phpt
sprintf_variation35.phpt
sprintf_variation4.phpt
sprintf_variation41.phpt
vsprintf_variation15.phpt
vsprintf_variation15_64bit.phpt
vsprintf_variation16.phpt
vsprintf_variation4.phpt
Log:
Fixed bug #42868 (Floats cast to integer droduce unpredicatable results).
(Zoe Slattery)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.284r2=1.285diff_format=u
Index: ZendEngine2/zend_operators.c
diff -u ZendEngine2/zend_operators.c:1.284 ZendEngine2/zend_operators.c:1.285
--- ZendEngine2/zend_operators.c:1.284 Tue Nov 20 13:26:08 2007
+++ ZendEngine2/zend_operators.cMon Dec 17 11:06:42 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: zend_operators.c,v 1.284 2007/11/20 13:26:08 dmitry Exp $ */
+/* $Id: zend_operators.c,v 1.285 2007/12/17 11:06:42 dmitry Exp $ */
#include ctype.h
@@ -240,20 +240,37 @@
/* }}} */
/* {{{ DVAL_TO_LVAL */
+#define MAX_UNSIGNED_INT ((double) LONG_MAX * 2) + 1
#ifdef _WIN64
# define DVAL_TO_LVAL(d, l) \
- if ((d) LONG_MAX) { \
- (l) = (long)(unsigned long)(__int64) (d); \
- } else { \
- (l) = (long) (d); \
- }
+if ((d) LONG_MAX) { \
+if ((d) MAX_UNSIGNED_INT) { \
+(l) = LONG_MAX; \
+} else { \
+(l) = (long)(unsigned long)(__int64) (d); \
+} \
+} else { \
+if((d) LONG_MIN) { \
+(l) = LONG_MIN; \
+} else { \
+(l) = (long) (d); \
+} \
+}
#else
# define DVAL_TO_LVAL(d, l) \
- if ((d) LONG_MAX) { \
- (l) = (unsigned long) (d); \
- } else { \
- (l) = (long) (d); \
- }
+if ((d) LONG_MAX) { \
+if ((d) MAX_UNSIGNED_INT) { \
+(l) = LONG_MAX; \
+} else { \
+(l) = (unsigned long) (d); \
+} \
+} else { \
+if((d) LONG_MIN) { \
+(l) = LONG_MIN; \
+} else { \
+(l) = (long) (d); \
+} \
+}
#endif
/* }}} */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_fill_variation1.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/standard/tests/array/array_fill_variation1.phpt
diff -u php-src/ext/standard/tests/array/array_fill_variation1.phpt:1.3
php-src/ext/standard/tests/array/array_fill_variation1.phpt:1.4
--- php-src/ext/standard/tests/array/array_fill_variation1.phpt:1.3 Thu Nov
8 10:13:18 2007
+++ php-src/ext/standard/tests/array/array_fill_variation1.phpt Mon Dec 17
11:06:42 2007
@@ -125,9 +125,9 @@
}
-- Iteration 3 --
array(2) {
- [-1097262584]=
+ [2147483647]=
int(100)
- [0]=
+ [-2147483648]=
int(100)
}
-- Iteration 4 --
@@ -146,23 +146,23 @@
}
-- Iteration 6 --
-Warning: array_fill() expects parameter 1 to be long, array given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, array given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 7 --
-Warning: array_fill() expects parameter 1 to be long, array given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, array given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 8 --
-Warning: array_fill() expects parameter 1 to be long, array given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, array given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 9 --
-Warning: array_fill() expects parameter 1 to be long, array given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, array given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 10 --
-Warning: array_fill() expects parameter 1 to be long, array given in %s on
line %d
+Warning: array_fill() expects parameter 1 to be long, array given in
%sarray_fill_variation1.php on line %d
NULL
-- Iteration 11 --
array(2) {
@@ -208,23 +208,23 @@
}
-- Iteration 17 --
-Warning:
[PHP-CVS] cvs: php-src / run-tests.php
bjori Mon Dec 17 11:34:55 2007 UTC
Modified files:
/php-srcrun-tests.php
Log:
MFB5.3: - Allow to specify php executable on commandline
MFB5.3: - Allow to check the out,exp and diff results on console while
executing the tests
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.333r2=1.334diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.333 php-src/run-tests.php:1.334
--- php-src/run-tests.php:1.333 Wed Dec 12 09:20:41 2007
+++ php-src/run-tests.php Mon Dec 17 11:34:55 2007
@@ -24,7 +24,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.333 2007/12/12 09:20:41 tony2001 Exp $ */
+/* $Id: run-tests.php,v 1.334 2007/12/17 11:34:55 bjori Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -113,8 +113,10 @@
$environment['TEST_PHP_CGI_EXECUTABLE'] = $php_cgi;
}
-if ($argc !=2 || ($argv[1] != '-h' $argv[1] != '-help' $argv !=
'--help'))
+function verify_config()
{
+ global $php;
+
if (empty($php) || !file_exists($php)) {
error(environment variable TEST_PHP_EXECUTABLE must be set to
specify PHP executable!);
}
@@ -254,7 +256,7 @@
$no_clean = false;
$cfgtypes = array('show', 'keep');
-$cfgfiles = array('skip', 'php', 'clean');
+$cfgfiles = array('skip', 'php', 'clean', 'out', 'diff', 'exp');
$cfg = array();
foreach($cfgtypes as $type) {
$cfg[$type] = array();
@@ -279,11 +281,28 @@
$switch = substr($argv[$i],1,1);
$repeat = substr($argv[$i],0,1) == '-';
while ($repeat) {
- $repeat = false;
if (!$is_switch) {
$switch = substr($argv[$i],1,1);
}
$is_switch = true;
+ if ($repeat) {
+ foreach($cfgtypes as $type) {
+ if (strpos($switch, '--'.$type) === 0) {
+ foreach($cfgfiles as $file) {
+ if ($switch ==
'--'.$type.'-'.$file) {
+
$cfg[$type][$file] = true;
+ $is_switch =
false;
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (!$is_switch) {
+ $is_switch = true;
+ break;
+ }
+ $repeat = false;
switch($switch) {
case 'r':
case 'l':
@@ -321,15 +340,6 @@
$cfg['keep'][$file] = true;
}
break;
- case '--keep-skip':
- $cfg['keep']['skip'] = true;
- break;
- case '--keep-php':
- $cfg['keep']['php'] = true;
- break;
- case '--keep-clean':
- $cfg['keep']['clean'] = true;
- break;
//case 'l'
case 'm':
$leak_check = true;
@@ -348,6 +358,10 @@
case '--no-clean':
$no_clean = true;
break;
+ case 'p':
+ $php = $argv[++$i];
+ putenv(TEST_PHP_EXECUTABLE=$php);
+ break;
case 'q':
putenv('NO_INTERACTION=1');
break;
@@ -361,15 +375,6 @@
$cfg['show'][$file] = true;
}
break;
- case '--show-skip':
- $cfg['show']['skip'] = true;
- break;
- case '--show-php':
- $cfg['show']['php']
[PHP-CVS] cvs: php-src /ext/standard/tests/array array_walk_error1.phpt array_walk_error2.phpt array_walk_recursive_error1.phpt array_walk_recursive_error2.phpt array_walk_recursive_variation2.phpt ar
kraghubaMon Dec 17 13:00:52 2007 UTC Modified files: /php-src/ext/standard/tests/array array_walk_recursive_variation8.phpt array_walk_variation8.phpt array_walk_recursive_error1.phpt array_walk_recursive_error2.phpt array_walk_error1.phpt array_walk_error2.phpt array_walk_recursive_variation2.phpt array_walk_variation2.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_recursive_variation8.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/array_walk_recursive_variation8.phpt diff -u php-src/ext/standard/tests/array/array_walk_recursive_variation8.phpt:1.1 php-src/ext/standard/tests/array/array_walk_recursive_variation8.phpt:1.2 --- php-src/ext/standard/tests/array/array_walk_recursive_variation8.phpt:1.1 Tue Dec 11 10:43:28 2007 +++ php-src/ext/standard/tests/array/array_walk_recursive_variation8.phpt Mon Dec 17 13:00:52 2007 @@ -1,5 +1,5 @@ --TEST-- -Test array_walk_recursive() function : usage variations - buit-in function as callback(Bug#43558) +Test array_walk_recursive() function : usage variations - buit-in function as callback --FILE-- ?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) @@ -38,7 +38,7 @@ -- With 'echo' language construct -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d -bool(false) +NULL Done --UEXPECTF-- *** Testing array_walk_recursive() : built-in function as callback *** @@ -49,5 +49,5 @@ -- With 'echo' language construct -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode string given in %s on line %d -bool(false) +NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_variation8.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/array_walk_variation8.phpt diff -u php-src/ext/standard/tests/array/array_walk_variation8.phpt:1.1 php-src/ext/standard/tests/array/array_walk_variation8.phpt:1.2 --- php-src/ext/standard/tests/array/array_walk_variation8.phpt:1.1 Tue Dec 11 10:40:23 2007 +++ php-src/ext/standard/tests/array/array_walk_variation8.phpt Mon Dec 17 13:00:52 2007 @@ -1,5 +1,5 @@ --TEST-- -Test array_walk() function : usage variations - buit-in function as callback(Bug#43558) +Test array_walk() function : usage variations - buit-in function as callback --FILE-- ?php /* Prototype : bool array_walk(array $input, string $funcname [, mixed $userdata]) @@ -38,7 +38,7 @@ -- With 'echo' language construct -- Warning: array_walk() expects parameter 2 to be valid callback, string given in %s on line %d -bool(false) +NULL Done --UEXPECTF-- *** Testing array_walk() : built-in function as callback *** @@ -49,5 +49,5 @@ -- With 'echo' language construct -- Warning: array_walk() expects parameter 2 to be valid callback, Unicode string given in %s on line %d -bool(false) +NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_recursive_error1.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/array_walk_recursive_error1.phpt diff -u php-src/ext/standard/tests/array/array_walk_recursive_error1.phpt:1.1 php-src/ext/standard/tests/array/array_walk_recursive_error1.phpt:1.2 --- php-src/ext/standard/tests/array/array_walk_recursive_error1.phpt:1.1 Tue Dec 11 10:43:28 2007 +++ php-src/ext/standard/tests/array/array_walk_recursive_error1.phpt Mon Dec 17 13:00:52 2007 @@ -1,5 +1,5 @@ --TEST-- -Test array_walk_recursive() function : error conditions(Bug#43558) +Test array_walk_recursive() function : error conditions --FILE-- ?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) @@ -44,7 +44,7 @@ -- Testing array_walk_recursive() function with non existent callback function -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, string given in %s on line %d -bool(false) +NULL Done --UEXPECTF-- *** Testing array_walk_recursive() : error conditions *** @@ -59,5 +59,5 @@ -- Testing array_walk_recursive() function with non existent callback function -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, Unicode string given in %s on line %d -bool(false) +NULL Done http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_recursive_error2.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/array_walk_recursive_error2.phpt diff -u php-src/ext/standard/tests/array/array_walk_recursive_error2.phpt:1.1
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array array_walk_error1.phpt array_walk_error2.phpt array_walk_recursive_error1.phpt array_walk_recursive_error2.phpt array_walk_recursive_variation
kraghubaMon Dec 17 13:02:28 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array array_walk_recursive_variation2.phpt array_walk_variation2.phpt array_walk_recursive_variation8.phpt array_walk_variation8.phpt array_walk_recursive_error1.phpt array_walk_recursive_error2.phpt array_walk_error1.phpt array_walk_error2.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_walk_recursive_variation2.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/array/array_walk_recursive_variation2.phpt diff -u php-src/ext/standard/tests/array/array_walk_recursive_variation2.phpt:1.1.2.2 php-src/ext/standard/tests/array/array_walk_recursive_variation2.phpt:1.1.2.3 --- php-src/ext/standard/tests/array/array_walk_recursive_variation2.phpt:1.1.2.2 Tue Dec 11 10:45:50 2007 +++ php-src/ext/standard/tests/array/array_walk_recursive_variation2.phpt Mon Dec 17 13:02:27 2007 @@ -1,5 +1,5 @@ --TEST-- -Test array_walk_recursive() function : usage variations - unexpected values in place of 'funcname' argument(Bug#43558) +Test array_walk_recursive() function : usage variations - unexpected values in place of 'funcname' argument --FILE-- ?php /* Prototype : bool array_walk_recursive(array $input, string $funcname [, mixed $userdata]) @@ -93,176 +93,176 @@ -- Iteration 1 -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d -bool(false) +NULL Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d -bool(false) +NULL -- Iteration 2 -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d -bool(false) +NULL Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d -bool(false) +NULL -- Iteration 3 -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d -bool(false) +NULL Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d -bool(false) +NULL -- Iteration 4 -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d -bool(false) +NULL Warning: array_walk_recursive() expects parameter 2 to be valid callback, integer given in %s on line %d -bool(false) +NULL -- Iteration 5 -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d -bool(false) +NULL Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d -bool(false) +NULL -- Iteration 6 -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d -bool(false) +NULL Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d -bool(false) +NULL -- Iteration 7 -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d -bool(false) +NULL Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d -bool(false) +NULL -- Iteration 8 -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d -bool(false) +NULL Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d -bool(false) +NULL -- Iteration 9 -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d -bool(false) +NULL Warning: array_walk_recursive() expects parameter 2 to be valid callback, double given in %s on line %d -bool(false) +NULL -- Iteration 10 -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d -bool(false) +NULL Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d -bool(false) +NULL -- Iteration 11 -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d -bool(false) +NULL Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d -bool(false) +NULL -- Iteration 12 -- Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d -bool(false) +NULL Warning: array_walk_recursive() expects parameter 2 to be valid callback, array given in %s on line %d -bool(false)
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array array_walk_basic1.phpt array_walk_basic2.phpt array_walk_error1.phpt array_walk_error2.phpt array_walk_object1.phpt array_walk_object2.php
Fixed, thanks On Dec 17, 2007 12:53 AM, Hannes Magnusson [EMAIL PROTECTED] wrote: array_walk, like most other PHP functions, returns NULL when passed invalid arguments. -Hannes On Dec 11, 2007 11:45 AM, Raghubansh Kumar [EMAIL PROTECTED] wrote: kraghubaTue Dec 11 10:45:25 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array array_walk_variation1.phpt array_walk_variation2.phpt array_walk_variation3.phpt array_walk_variation4.phpt array_walk_variation5.phpt array_walk_basic1.phpt array_walk_variation6.phpt array_walk_basic2.phpt array_walk_variation7.phpt array_walk_variation8.phpt array_walk_variation9.phpt array_walk_error1.phpt array_walk_error2.phpt array_walk_object1.phpt array_walk_object2.phpt Log: New testcases for array_walk() function -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- with Regards, Raghubansh
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/exif exif.c
Hello Ilia,
ZEND_MOD_REQUIRED(standard) ?
we do not do that for any other ext. Care to explain why it is needed for exif?
best regards
marcus
Sunday, December 16, 2007, 6:14:12 PM, you wrote:
iliaa Sun Dec 16 17:14:12 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/exif exif.c
Log:
Fixed bug #43606 (define missing depencies of the exif extension)
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20.2.1r2=1.173.2.5.2.20.2.2diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20.2.1
php-src/ext/exif/exif.c:1.173.2.5.2.20.2.2
--- php-src/ext/exif/exif.c:1.173.2.5.2.20.2.1 Thu Sep 27 18:00:38 2007
+++ php-src/ext/exif/exif.c Sun Dec 16 17:14:11 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: exif.c,v 1.173.2.5.2.20.2.1 2007/09/27 18:00:38 dmitry Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.20.2.2 2007/12/16 17:14:11 iliaa Exp $ */
/* ToDos
*
@@ -142,7 +142,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.20.2.1 2007/09/27
18:00:38 dmitry Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.20.2.2 2007/12/16
17:14:11 iliaa Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -241,12 +241,21 @@
}
/* }}} */
+/* {{{ exif dependencies */
+static const zend_module_dep exif_module_deps[] = {
+ ZEND_MOD_REQUIRED(standard)
+ #if EXIF_USE_MBSTRING
+ ZEND_MOD_REQUIRED(mbstring)
+ #endif
+ {NULL, NULL, NULL}
+};
+/* }}} */
+
/* {{{ exif_module_entry
*/
zend_module_entry exif_module_entry = {
-#if ZEND_MODULE_API_NO = 20010901
- STANDARD_MODULE_HEADER,
-#endif
+ STANDARD_MODULE_HEADER_EX, NULL,
+ exif_module_deps,
exif,
exif_functions,
PHP_MINIT(exif),
Best regards,
Marcus
--
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_3) /ext/bz2 bz2_filter.c
Hello Ilia, Hello Greg,
this fixes the pecl/Phar issue with bzip2 for me as well!
marcus
Sunday, December 16, 2007, 6:22:01 PM, you wrote:
iliaa Sun Dec 16 17:22:01 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/bz2bz2_filter.c
Log:
MFB: Fixed bug #43589 (a possible infinite loop in bz2_filter.c)
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2_filter.c?r1=1.3.2.2.2.5r2=1.3.2.2.2.5.2.1diff_format=u
Index: php-src/ext/bz2/bz2_filter.c
diff -u php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5
php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5.2.1
--- php-src/ext/bz2/bz2_filter.c:1.3.2.2.2.5Thu Aug 9 23:27:22 2007
+++ php-src/ext/bz2/bz2_filter.cSun Dec 16 17:22:00 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: bz2_filter.c,v 1.3.2.2.2.5 2007/08/09 23:27:22 iliaa Exp $ */
+/* $Id: bz2_filter.c,v 1.3.2.2.2.5.2.1 2007/12/16 17:22:00 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -132,6 +132,8 @@
data-strm.avail_out = data-outbuf_len;
data-strm.next_out = data-outbuf;
exit_status = PSFS_PASS_ON;
+ } else if (status == BZ_OK) {
+ break;
}
}
}
Best regards,
Marcus
--
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_array.c
helly Mon Dec 17 13:46:28 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_array.c
Log:
- Fix folding
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.9r2=1.71.2.17.2.13.2.10diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.9
php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.10
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.9 Sun Dec 16 18:31:07 2007
+++ php-src/ext/spl/spl_array.c Mon Dec 17 13:46:27 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.71.2.17.2.13.2.9 2007/12/16 18:31:07 bjori Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.13.2.10 2007/12/17 13:46:27 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -598,7 +598,7 @@
spl_array_unset_dimension_ex(0, getThis(), index TSRMLS_CC);
} /* }}} */
-/* {{ proto array ArrayObject::getArrayCopy()
+/* {{{ proto array ArrayObject::getArrayCopy()
proto array ArrayIterator::getArrayCopy()
Return a copy of the contained array */
SPL_METHOD(Array, getArrayCopy)
--
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_array.c
helly Mon Dec 17 13:47:09 2007 UTC
Modified files:
/php-src/ext/splspl_array.c
Log:
- Fix folding (again)
- Fix clone mask
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.134r2=1.135diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.134 php-src/ext/spl/spl_array.c:1.135
--- php-src/ext/spl/spl_array.c:1.134 Sat Dec 15 01:18:28 2007
+++ php-src/ext/spl/spl_array.c Mon Dec 17 13:47:09 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.134 2007/12/15 01:18:28 davidc Exp $ */
+/* $Id: spl_array.c,v 1.135 2007/12/17 13:47:09 helly Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -56,7 +56,7 @@
#define SPL_ARRAY_IS_SELF0x0200
#define SPL_ARRAY_USE_OTHER 0x0400
#define SPL_ARRAY_INT_MASK 0x
-#define SPL_ARRAY_CLONE_MASK 0x030F
+#define SPL_ARRAY_CLONE_MASK 0x0300
typedef struct _spl_array_object {
zend_object std;
@@ -777,7 +777,7 @@
efree(iterator);
}
/* }}} */
-
+
static int spl_array_it_valid(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
{
spl_array_it *iterator = (spl_array_it *)iter;
@@ -1230,38 +1230,37 @@
SPL_METHOD(cname, fname) \
{ \
spl_array_method(INTERNAL_FUNCTION_PARAM_PASSTHRU, #fname,
sizeof(#fname)-1, use_arg); \
-}
+} /* }}} */
-/* proto int ArrayObject::asort() U
+/* {{{ proto int ArrayObject::asort() U
proto int ArrayIterator::asort() U
Sort the entries by values. */
-SPL_ARRAY_METHOD(Array, asort, 0)
+SPL_ARRAY_METHOD(Array, asort, 0) /* }}} */
-/* proto int ArrayObject::ksort() U
+/* {{{ proto int ArrayObject::ksort() U
proto int ArrayIterator::ksort() U
Sort the entries by key. */
-SPL_ARRAY_METHOD(Array, ksort, 0)
+SPL_ARRAY_METHOD(Array, ksort, 0) /* }}} */
-/* proto int ArrayObject::uasort(callback cmp_function) U
+/* {{{ proto int ArrayObject::uasort(callback cmp_function) U
proto int ArrayIterator::uasort(callback cmp_function) U
Sort the entries by values user defined function. */
-SPL_ARRAY_METHOD(Array, uasort, 1)
+SPL_ARRAY_METHOD(Array, uasort, 1) /* }}} */
-/* proto int ArrayObject::uksort(callback cmp_function) U
+/* {{{ proto int ArrayObject::uksort(callback cmp_function) U
proto int ArrayIterator::uksort(callback cmp_function) U
Sort the entries by key using user defined function. */
-SPL_ARRAY_METHOD(Array, uksort, 1)
+SPL_ARRAY_METHOD(Array, uksort, 1) /* }}} */
-/* proto int ArrayObject::natsort() U
+/* {{{ proto int ArrayObject::natsort() U
proto int ArrayIterator::natsort() U
Sort the entries by values using natural order algorithm. */
-SPL_ARRAY_METHOD(Array, natsort, 0)
+SPL_ARRAY_METHOD(Array, natsort, 0) /* }}} */
-/* proto int ArrayObject::natcasesort() U
+/* {{{ proto int ArrayObject::natcasesort() U
proto int ArrayIterator::natcasesort() U
Sort the entries by key using case insensitive natural order algorithm. */
-SPL_ARRAY_METHOD(Array, natcasesort, 0)
-/* }}} */
+SPL_ARRAY_METHOD(Array, natcasesort, 0) /* }}} */
/* {{{ proto mixed|NULL ArrayIterator::current() U
Return current array entry */
--
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_3) /ext/exif exif.c
On Dec 17, 2007 2:11 PM, Marcus Boerger [EMAIL PROTECTED] wrote: Hello Ilia, ZEND_MOD_REQUIRED(standard) ? we do not do that for any other ext. Care to explain why it is needed for exif? The only reason I can think about is when ext/standard is built shared, but I thought it was not possible (and hope it was not possible :) -- 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
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/exif exif.c
On 17.12.2007 16:54, Pierre wrote: On Dec 17, 2007 2:11 PM, Marcus Boerger [EMAIL PROTECTED] wrote: Hello Ilia, ZEND_MOD_REQUIRED(standard) ? we do not do that for any other ext. Care to explain why it is needed for exif? The only reason I can think about is when ext/standard is built shared, but I thought it was not possible (and hope it was not possible :) No, it's not possible. ..but sounds like fun =)) -- Wbr, Antony Dovgal -- 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_3) /ext/exif exif.c
Marcus,
It can certainly be removed but is there a harm in having it there. As
ext/standard grows there is a good chance it'll be broken into
sections, in which case decencies may become relevant.
On 17-Dec-07, at 8:11 AM, Marcus Boerger wrote:
Hello Ilia,
ZEND_MOD_REQUIRED(standard) ?
we do not do that for any other ext. Care to explain why it is
needed for exif?
best regards
marcus
Sunday, December 16, 2007, 6:14:12 PM, you wrote:
iliaa Sun Dec 16 17:14:12 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/exif exif.c
Log:
Fixed bug #43606 (define missing depencies of the exif extension)
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20.2.1r2=1.173.2.5.2.20.2.2diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20.2.1
php-src/ext/exif/exif.c:1.173.2.5.2.20.2.2
--- php-src/ext/exif/exif.c:1.173.2.5.2.20.2.1 Thu Sep 27 18:00:38
2007
+++ php-src/ext/exif/exif.c Sun Dec 16 17:14:11 2007
@@ -17,7 +17,7 @@
+
--+
*/
-/* $Id: exif.c,v 1.173.2.5.2.20.2.1 2007/09/27 18:00:38 dmitry Exp
$ */
+/* $Id: exif.c,v 1.173.2.5.2.20.2.2 2007/12/16 17:14:11 iliaa Exp
$ */
/* ToDos
*
@@ -142,7 +142,7 @@
};
/* }}} */
-#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.20.2.1
2007/09/27 18:00:38 dmitry Exp $
+#define EXIF_VERSION 1.4 $Id: exif.c,v 1.173.2.5.2.20.2.2
2007/12/16 17:14:11 iliaa Exp $
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -241,12 +241,21 @@
}
/* }}} */
+/* {{{ exif dependencies */
+static const zend_module_dep exif_module_deps[] = {
+ ZEND_MOD_REQUIRED(standard)
+ #if EXIF_USE_MBSTRING
+ ZEND_MOD_REQUIRED(mbstring)
+ #endif
+ {NULL, NULL, NULL}
+};
+/* }}} */
+
/* {{{ exif_module_entry
*/
zend_module_entry exif_module_entry = {
-#if ZEND_MODULE_API_NO = 20010901
- STANDARD_MODULE_HEADER,
-#endif
+ STANDARD_MODULE_HEADER_EX, NULL,
+ exif_module_deps,
exif,
exif_functions,
PHP_MINIT(exif),
Best regards,
Marcus
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Ilia Alshanetsky
--
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_array.c
iliaa Mon Dec 17 19:00:08 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/splspl_array.c
Log:
Kill unused vars
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.13.2.10r2=1.71.2.17.2.13.2.11diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.10
php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.11
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.13.2.10 Mon Dec 17 13:46:27 2007
+++ php-src/ext/spl/spl_array.c Mon Dec 17 19:00:07 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: spl_array.c,v 1.71.2.17.2.13.2.10 2007/12/17 13:46:27 helly Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.13.2.11 2007/12/17 19:00:07 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
# include config.h
@@ -1446,8 +1446,7 @@
zval *object = getThis();
spl_array_object *intern =
(spl_array_object*)zend_object_store_get_object(object TSRMLS_CC);
HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
- zval **entry, members, *pmembers;
- HashPosition pos;
+ zval members, *pmembers;
php_serialize_data_t var_hash;
smart_str buf = {0};
@@ -1498,7 +1497,7 @@
int buf_len;
const unsigned char *p, *s;
php_unserialize_data_t var_hash;
- zval *pentry, *pmembers, *pflags = NULL;
+ zval *pmembers, *pflags = NULL;
long flags;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, s, buf,
buf_len) == FAILURE) {
--
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_3) /ext/exif exif.c
On Dec 17, 2007 7:42 PM, Ilia Alshanetsky [EMAIL PROTECTED] wrote: Marcus, It can certainly be removed but is there a harm in having it there. As ext/standard grows there is a good chance it'll be broken into sections, in which case decencies may become relevant. If it has to be moved into sections, I rather prefer to move to the language part what deserves to be there (I was never a fan of SPL being an extension for example). Standard means... standard, always here and can't be disabled. If functions are not critical and can be pushed into their own extension, then let create an extension (date was one of them even I still think that date should be a core feature of php :) -- 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: CVSROOT / avail
rasmus Mon Dec 17 22:21:44 2007 UTC Modified files: /CVSROOTavail Log: Another test case writer http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1335r2=1.1336diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1335 CVSROOT/avail:1.1336 --- CVSROOT/avail:1.1335Fri Dec 14 16:14:03 2007 +++ CVSROOT/avail Mon Dec 17 22:21:43 2007 @@ -17,7 +17,7 @@ # The PHP Developers have full access to the full source trees for # PHP, as well as the documentation. -avail|kraghuba,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,gopalv,bjori,nlopess,wrowe,s! hire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith|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_IR,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 +avail|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,gopalv,bjori,nlopes! s,wrowe,shire,zoe,scottmac,t2man,dsp,davidw,ab5602,nicholsr,lsmith|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_IR,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 # fastcgi implementation for IIS avail|shane,wez,edink|fastcgi-isapi -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
