[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Mon Jun 4 01:31:13 2007 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.2708r2=1.2709diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.2708 php-src/ChangeLog:1.2709 --- php-src/ChangeLog:1.2708Sun Jun 3 01:31:06 2007 +++ php-src/ChangeLog Mon Jun 4 01:31:12 2007 @@ -1,3 +1,185 @@ +2007-06-03 Hannes Magnusson [EMAIL PROTECTED] + +* (PHP_5_2) + tests/basic/027.phpt: + fix test + +2007-06-03 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_2) + sapi/cgi/tests/009.phpt: + fix test + +* sapi/cgi/tests/009.phpt: + add missing test + +* sapi/phttpd/config.m4: + another missed ]) + +* sapi/isapi/config.m4: + fix configure + +2007-06-03 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/zip/php_zip.c: + - MFB: fix logic + +* (PHP_5_2) + ext/zip/php_zip.c: + - fix logic (goto is a gift, I should use it :) + +* ext/zip/php_zip.c + ext/zip/tests/bug11216.phpt: + - MFB: PECL #11216, addEmptyDir crashes if the directory already exists + +* (PHP_5_2) + NEWS + ext/zip/php_zip.c + ext/zip/tests/bug11216.phpt: + - pecl bug #11216, better fix, leak removed and improved test + - typo in news, better late than never (-d) + +2007-06-03 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + bug news + +* (PHP_5_2) + sapi/apache/config.m4 + sapi/apache2filter/config.m4 + sapi/apache2handler/config.m4 + sapi/apache_hooks/config.m4 + sapi/caudium/config.m4 + sapi/embed/config.m4 + sapi/isapi/config.m4 + sapi/milter/config.m4 + sapi/phttpd/config.m4 + sapi/pi3web/config.m4 + sapi/roxen/config.m4 + sapi/thttpd/config.m4 + sapi/tux/config.m4 + sapi/webjames/config.m4: + MFH:- Fixed bug #41576 (misbehaviour when using --without-apxs) + +* sapi/apache/config.m4 + sapi/apache2filter/config.m4 + sapi/apache2handler/config.m4 + sapi/apache_hooks/config.m4 + sapi/caudium/config.m4 + sapi/embed/config.m4 + sapi/isapi/config.m4 + sapi/milter/config.m4 + sapi/phttpd/config.m4 + sapi/pi3web/config.m4 + sapi/roxen/config.m4 + sapi/thttpd/config.m4 + sapi/tux/config.m4 + sapi/webjames/config.m4: + - Fixed bug #41576 (misbehaviour when using --without-apxs) + +2007-06-03 Pierre-Alain Joye [EMAIL PROTECTED] + +* ext/zip/tests/bug11216.phpt + ext/zip/tests/bug11216.phpt: + + file bug11216.phpt was initially added on branch PHP_5_2. + +* (PHP_5_2) + ext/zip/php_zip.c: + - PECL #11216, addEmptyDir crashes if the directory already exists + +2007-06-03 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS: + fix news + +2007-06-03 Ilia Alshanetsky [EMAIL PROTECTED] + +* ext/standard/string.c + ext/standard/string.c + ext/standard/tests/strings/chunk_split.phpt + ext/standard/tests/strings/chunk_split.phpt: + MFB: Corrected fix for CVE-2007-2872 + +* (PHP_5_2) + NEWS + ext/standard/string.c + ext/standard/tests/strings/chunk_split.phpt: + Corrected fix for CVE-2007-2872 + +2007-06-03 Pierre-Alain Joye [EMAIL PROTECTED] + +* (PHP_5_2) + NEWS + ext/gd/gd.c + ext/gd/libgd/gd.h: + - MFH: @DOC add constants GD_MAJOR_VERSION, GD_MINOR_VERSION, + GD_RELEASE_VERSION +GD_EXTRA_VERSION and GD_VERSION_STRING + +* ext/gd/gd.c + ext/gd/libgd/gd.h: + - @DOC add constants GD_MAJOR_VERSION, GD_MINOR_VERSION, GD_RELEASE_VERSION +GD_EXTRA_VERSION and GD_VERSION_STRING + - fix #ifdef else clause + +2007-06-03 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_5_2) + ext/pdo/tests/bug_36798.phpt: + + Fixed test for PostgreSQL + +2007-06-03 Jani Taskinen [EMAIL PROTECTED] + +* (PHP_4_4) + main/php_variables.c + main/php_variables.c + tests/basic/027.phpt + tests/basic/027.phpt: + MFH:- Improved the error message for exceeding max_input_nesting_level. + +* main/php_variables.c + tests/basic/027.phpt: + - Improved the error message for exceeding max_input_nesting_level. + +2007-06-03 Ilia Alshanetsky [EMAIL PROTECTED] + +* (PHP_4_4) + NEWS + main/php_variables.c + tests/basic/027.phpt: + + MFB: Improved fix for MOPB-02-2007 + +* main/php_variables.c + tests/basic/027.phpt + tests/basic/027.phpt: + MFB: Improved fix for MOPB-02-2007 + +* (PHP_5_2) + NEWS + main/php_variables.c: + Improved fix for MOPB-02-2007 + +* tests/basic/027.phpt + tests/basic/027.phpt: + + file 027.phpt was initially added on branch PHP_5_2. + +2007-06-03 Brian Shire [EMAIL PROTECTED] + +* (PHP_5_2) + ext/standard/formatted_print.c: + MFH: Change
[PHP-CVS] cvs: php-src /ext/standard formatted_print.c
shire Sun Jun 3 09:11:52 2007 UTC Modified files: /php-src/ext/standard formatted_print.c Log: Change printf %u behavior so that it does not truncate numbers at 32-bits. (Reported by Aditya Agarwal.) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.100r2=1.101diff_format=u Index: php-src/ext/standard/formatted_print.c diff -u php-src/ext/standard/formatted_print.c:1.100 php-src/ext/standard/formatted_print.c:1.101 --- php-src/ext/standard/formatted_print.c:1.100Thu May 17 17:29:09 2007 +++ php-src/ext/standard/formatted_print.c Sun Jun 3 09:11:52 2007 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: formatted_print.c,v 1.100 2007/05/17 17:29:09 tony2001 Exp $ */ +/* $Id: formatted_print.c,v 1.101 2007/06/03 09:11:52 shire Exp $ */ #include math.h /* modf() */ #include php.h @@ -278,7 +278,7 @@ PRINTF_DEBUG((sprintf: appenduint(%x, %x, %x, %d, %d, '%c', %d)\n, *buffer, pos, size, number, width, padding, alignment)); - magn = (unsigned int) number; + magn = (unsigned long) number; /* Can't right-pad 0's on integers */ if (alignment == 0 padding == '0') padding = ' '; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/standard formatted_print.c
Brian, Can you please add a test case. Thanks, Ilia -- 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/standard formatted_print.c
Brian, This patch looks to have been broken a few *printf tests on 64 bit platforms, can you please review them to make sure the new behavior is indeed the correct one and adjust them if necessary. Thanks, Ilia -- 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 /main php_variables.c /tests/basic 027.phpt
iliaa Sun Jun 3 16:19:14 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/tests/basic027.phpt
Modified files:
/php-srcNEWS
/php-src/main php_variables.c
Log:
Improved fix for MOPB-02-2007
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.749r2=1.2027.2.547.2.750diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.749 php-src/NEWS:1.2027.2.547.2.750
--- php-src/NEWS:1.2027.2.547.2.749 Fri Jun 1 13:35:23 2007
+++ php-src/NEWSSun Jun 3 16:19:14 2007
@@ -1,6 +1,7 @@
PHPNEWS
|||
?? ??? 2007, PHP 5.2.4
+- Improved fix for MOPB-02-2007. (Ilia)
- Fixed bug #41518 (file_exists() warns of open_basedir restriction on
non-existent file). (Tony)
- Fixed bug #39330 (apache2handler does not call shutdown actions before
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.104.2.10.2.8r2=1.104.2.10.2.9diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.104.2.10.2.8
php-src/main/php_variables.c:1.104.2.10.2.9
--- php-src/main/php_variables.c:1.104.2.10.2.8 Tue Apr 17 15:06:50 2007
+++ php-src/main/php_variables.cSun Jun 3 16:19:14 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.104.2.10.2.8 2007/04/17 15:06:50 iliaa Exp $ */
+/* $Id: php_variables.c,v 1.104.2.10.2.9 2007/06/03 16:19:14 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -125,8 +125,22 @@
int new_idx_len = 0;
if(++nest_level PG(max_input_nesting_level)) {
+ HashTable *ht;
/* too many levels of nesting */
- php_error_docref(NULL TSRMLS_CC, E_ERROR,
Input variable nesting level more than allowed %ld (change
max_input_nesting_level in php.ini to increase the limit),
PG(max_input_nesting_level));
+
+ if (track_vars_array) {
+ ht = Z_ARRVAL_P(track_vars_array);
+ } else if (PG(register_globals)) {
+ ht = EG(active_symbol_table);
+ }
+
+ zend_hash_del(ht, var, var_len + 1);
+ zval_dtor(val);
+
+ if (!PG(display_errors)) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, Input variable nesting level more than allowed %ld (change
max_input_nesting_level in php.ini to increase the limit),
PG(max_input_nesting_level));
+ }
+ return;
}
ip++;
@@ -142,9 +156,9 @@
/* PHP variables cannot contain '[' in
their names, so we replace the character with a '_' */
*(index_s - 1) = '_';
- index_len = var_len = 0;
+ index_len = 0;
if (index) {
- index_len = var_len =
strlen(index);
+ index_len = strlen(index);
}
goto plain_var;
return;
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/027.phpt?view=markuprev=1.1
Index: php-src/tests/basic/027.phpt
+++ php-src/tests/basic/027.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_variables.c /tests/basic 027.phpt
iliaa Sun Jun 3 16:19:55 2007 UTC
Modified files:
/php-src/tests/basic027.phpt
/php-src/main php_variables.c
Log:
MFB: Improved fix for MOPB-02-2007
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/027.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/tests/basic/027.phpt
diff -u /dev/null php-src/tests/basic/027.phpt:1.2
--- /dev/null Sun Jun 3 16:19:55 2007
+++ php-src/tests/basic/027.phptSun Jun 3 16:19:55 2007
@@ -0,0 +1,35 @@
+--TEST--
+Handling of max_input_nesting_level being reached
+--INI--
+magic_quotes_gpc=0
+always_populate_raw_post_data=0
+display_errors=0
+max_input_nesting_level=10
+track_errors=1
+log_errors=0
+--SKIPIF--
+?php if (php_sapi_name()=='cli') echo 'skip'; ?
+--POST--
+a=1b=ZYXc[][][][][][][][][][][][][][][][][][][][][][]=123d=123e[][]][]=3
+--FILE--
+?php
+var_dump($_POST, $php_errormsg);
+?
+--EXPECT--
+array(4) {
+ [a]=
+ string(1) 1
+ [b]=
+ string(3) ZYX
+ [d]=
+ string(3) 123
+ [e]=
+ array(1) {
+[0]=
+array(1) {
+ [0]=
+ string(1) 3
+}
+ }
+}
+string(124) Unknown: Input variable nesting level more than allowed 10
(change max_input_nesting_level in php.ini to increase the limit)
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.138r2=1.139diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.138 php-src/main/php_variables.c:1.139
--- php-src/main/php_variables.c:1.138 Wed Mar 28 09:13:55 2007
+++ php-src/main/php_variables.cSun Jun 3 16:19:55 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.138 2007/03/28 09:13:55 tony2001 Exp $ */
+/* $Id: php_variables.c,v 1.139 2007/06/03 16:19:55 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -133,8 +133,22 @@
int new_idx_len = 0;
if(++nest_level PG(max_input_nesting_level)) {
+ HashTable *ht;
/* too many levels of nesting */
- php_error_docref(NULL TSRMLS_CC, E_ERROR,
Input variable nesting level more than allowed %ld (change
max_input_nesting_level in php.ini to increase the limit),
PG(max_input_nesting_level));
+
+ if (track_vars_array) {
+ ht = Z_ARRVAL_P(track_vars_array);
+ } else if (PG(register_globals)) {
+ ht = EG(active_symbol_table);
+ }
+
+ zend_hash_del(ht, var, var_len + 1);
+ zval_dtor(val);
+
+ if (!PG(display_errors)) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, Input variable nesting level more than allowed %ld (change
max_input_nesting_level in php.ini to increase the limit),
PG(max_input_nesting_level));
+ }
+ return;
}
ip++;
@@ -150,9 +164,9 @@
/* PHP variables cannot contain '[' in
their names, so we replace the character with a '_' */
*(index_s - 1) = '_';
- index_len = var_len = 0;
+ index_len = 0;
if (index) {
- index_len = var_len =
strlen(index);
+ index_len = strlen(index);
}
goto plain_var;
return;
@@ -818,8 +832,6 @@
{
char *p;
unsigned char _gpc_flags[5] = {0, 0, 0, 0, 0};
- zval *dummy_track_vars_array = NULL;
- zend_bool initialized_dummy_track_vars_array=0;
zend_bool jit_initialization = PG(auto_globals_jit);
struct auto_global_record {
char *name;
@@ -893,15 +905,9 @@
continue;
}
if (!PG(http_globals)[i]) {
- if (!initialized_dummy_track_vars_array) {
- ALLOC_ZVAL(dummy_track_vars_array);
- array_init(dummy_track_vars_array);
- INIT_PZVAL(dummy_track_vars_array);
- initialized_dummy_track_vars_array = 1;
- } else {
- dummy_track_vars_array-refcount++;
- }
- PG(http_globals)[i] = dummy_track_vars_array;
+ ALLOC_ZVAL(PG(http_globals)[i]);
+ array_init(PG(http_globals)[i]);
+
[PHP-CVS] cvs: php-src(PHP_4_4) / NEWS /main php_variables.c /tests/basic 027.phpt
iliaa Sun Jun 3 16:29:24 2007 UTC
Added files: (Branch: PHP_4_4)
/php-src/tests/basic027.phpt
Modified files:
/php-srcNEWS
/php-src/main php_variables.c
Log:
MFB: Improved fix for MOPB-02-2007
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.1247.2.920.2.231r2=1.1247.2.920.2.232diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.231 php-src/NEWS:1.1247.2.920.2.232
--- php-src/NEWS:1.1247.2.920.2.231 Wed May 30 00:35:41 2007
+++ php-src/NEWSSun Jun 3 16:29:24 2007
@@ -1,6 +1,7 @@
PHP 4 NEWS
|||
?? ??? 2007, Version 4.4.8
+- Improved fix for MOPB-02-2007 (Ilia)
- Fixed an interger overflow inside chunk_split(), identified by Gerhard
Wagner (Ilia)
- Addded max_input_nesting_level php.ini option to limit nesting level of
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.45.2.13.2.11r2=1.45.2.13.2.12diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.45.2.13.2.11
php-src/main/php_variables.c:1.45.2.13.2.12
--- php-src/main/php_variables.c:1.45.2.13.2.11 Tue May 22 18:16:38 2007
+++ php-src/main/php_variables.cSun Jun 3 16:29:24 2007
@@ -16,7 +16,7 @@
| Zeev Suraski [EMAIL PROTECTED]|
+--+
*/
-/* $Id: php_variables.c,v 1.45.2.13.2.11 2007/05/22 18:16:38 stas Exp $ */
+/* $Id: php_variables.c,v 1.45.2.13.2.12 2007/06/03 16:29:24 iliaa Exp $ */
#include stdio.h
#include php.h
@@ -130,8 +130,22 @@
int new_idx_len = 0;
if(++nest_level PG(max_input_nesting_level)) {
- /* too many levels of nesting */
- php_error_docref(NULL TSRMLS_CC, E_ERROR,
Input variable nesting level more than allowed %d (change
max_input_nesting_level in php.ini to increase the limit),
PG(max_input_nesting_level));
+ HashTable *ht;
+ /* too many levels of nesting */
+
+ if (track_vars_array) {
+ ht = Z_ARRVAL_P(track_vars_array);
+ } else if (PG(register_globals)) {
+ ht = EG(active_symbol_table);
+ }
+
+ zend_hash_del(ht, var, var_len + 1);
+ zval_dtor(val);
+
+ if (!PG(display_errors)) {
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, Input variable nesting level more than allowed %ld (change
max_input_nesting_level in php.ini to increase the limit),
PG(max_input_nesting_level));
+ }
+ return;
}
ip++;
index_s = ip;
@@ -146,9 +160,9 @@
/* PHP variables cannot contain '[' in
their names, so we replace the character with a '_' */
*(index_s - 1) = '_';
- index_len = var_len = 0;
+ index_len = 0;
if (index) {
- index_len = var_len =
strlen(index);
+ index_len = strlen(index);
}
goto plain_var;
return;
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/027.phpt?view=markuprev=1.1
Index: php-src/tests/basic/027.phpt
+++ php-src/tests/basic/027.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main php_variables.c /tests/basic 027.phpt
sniper Sun Jun 3 16:53:37 2007 UTC
Modified files:
/php-src/main php_variables.c
/php-src/tests/basic027.phpt
Log:
- Improved the error message for exceeding max_input_nesting_level.
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.139r2=1.140diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.139 php-src/main/php_variables.c:1.140
--- php-src/main/php_variables.c:1.139 Sun Jun 3 16:19:55 2007
+++ php-src/main/php_variables.cSun Jun 3 16:53:37 2007
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: php_variables.c,v 1.139 2007/06/03 16:19:55 iliaa Exp $ */
+/* $Id: php_variables.c,v 1.140 2007/06/03 16:53:37 sniper Exp $ */
#include stdio.h
#include php.h
@@ -146,7 +146,7 @@
zval_dtor(val);
if (!PG(display_errors)) {
- php_error_docref(NULL TSRMLS_CC,
E_WARNING, Input variable nesting level more than allowed %ld (change
max_input_nesting_level in php.ini to increase the limit),
PG(max_input_nesting_level));
+ php_error_docref(NULL TSRMLS_CC,
E_WARNING, Input variable nesting level exceeded %ld. To increase the limit
change max_input_nesting_level in php.ini., PG(max_input_nesting_level));
}
return;
}
http://cvs.php.net/viewvc.cgi/php-src/tests/basic/027.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/tests/basic/027.phpt
diff -u php-src/tests/basic/027.phpt:1.2 php-src/tests/basic/027.phpt:1.3
--- php-src/tests/basic/027.phpt:1.2Sun Jun 3 16:19:55 2007
+++ php-src/tests/basic/027.phptSun Jun 3 16:53:37 2007
@@ -32,4 +32,4 @@
}
}
}
-string(124) Unknown: Input variable nesting level more than allowed 10
(change max_input_nesting_level in php.ini to increase the limit)
+string(124) Unknown: Input variable nesting level exceeded 10. To increase
the level change max_input_nesting_level in php.ini.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd gd.c /ext/gd/libgd gd.h
pajoye Sun Jun 3 17:43:13 2007 UTC Modified files: /php-src/ext/gd gd.c /php-src/ext/gd/libgd gd.h Log: - @DOC add constants GD_MAJOR_VERSION, GD_MINOR_VERSION, GD_RELEASE_VERSION GD_EXTRA_VERSION and GD_VERSION_STRING - fix #ifdef else clause http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.376r2=1.377diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.376 php-src/ext/gd/gd.c:1.377 --- php-src/ext/gd/gd.c:1.376 Sat Jun 2 15:41:02 2007 +++ php-src/ext/gd/gd.c Sun Jun 3 17:43:13 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.376 2007/06/02 15:41:02 pajoye Exp $ */ +/* $Id: gd.c,v 1.377 2007/06/03 17:43:13 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1233,6 +1233,18 @@ REGISTER_LONG_CONSTANT(GD_BUNDLED, 0, CONST_CS | CONST_PERSISTENT); #endif +#ifdef GD_VERSION_STRING + REGISTER_STRING_CONSTANT(GD_VERSION, GD_VERSION_STRING, CONST_CS | CONST_PERSISTENT); +#endif + +#if defined(GD_MAJOR_VERSION) defined(GD_MINOR_VERSION) defined(GD_RELEASE_VERSION) defined(GD_EXTRA_VERSION) + REGISTER_LONG_CONSTANT(GD_MAJOR_VERSION, GD_MAJOR_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(GD_MINOR_VERSION, GD_MINOR_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(GD_RELEASE_VERSION, GD_RELEASE_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT(GD_EXTRA_VERSION, GD_EXTRA_VERSION, CONST_CS | CONST_PERSISTENT); +#endif + + #ifdef HAVE_GD_PNG /* * cannot include #include png.h http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.32r2=1.33diff_format=u Index: php-src/ext/gd/libgd/gd.h diff -u php-src/ext/gd/libgd/gd.h:1.32 php-src/ext/gd/libgd/gd.h:1.33 --- php-src/ext/gd/libgd/gd.h:1.32 Mon Apr 23 15:06:13 2007 +++ php-src/ext/gd/libgd/gd.h Sun Jun 3 17:43:13 2007 @@ -7,11 +7,17 @@ #include php_compat.h +#define GD_MAJOR_VERSION 2 +#define GD_MINOR_VERSION 0 +#define GD_RELEASE_VERSION 35 +#define GD_EXTRA_VERSION +#define GD_VERSION_STRING 2.0.35 + #ifdef NETWARE /* default fontpath for netware systems */ #define DEFAULT_FONTPATH sys:/java/nwgfx/lib/x11/fonts/ttf;. #define PATHSEPARATOR ; -#elif WIN32 +#elif defined(WIN32) /* default fontpath for windows systems */ #define DEFAULT_FONTPATH c:\\winnt\\fonts;c:\\windows\\fonts;. #define PATHSEPARATOR ; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/gd gd.c /ext/gd/libgd gd.h
pajoye Sun Jun 3 17:46:18 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/ext/gd gd.c /php-src/ext/gd/libgd gd.h Log: - MFH: @DOC add constants GD_MAJOR_VERSION, GD_MINOR_VERSION, GD_RELEASE_VERSION GD_EXTRA_VERSION and GD_VERSION_STRING http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.750r2=1.2027.2.547.2.751diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.750 php-src/NEWS:1.2027.2.547.2.751 --- php-src/NEWS:1.2027.2.547.2.750 Sun Jun 3 16:19:14 2007 +++ php-src/NEWSSun Jun 3 17:46:17 2007 @@ -2,6 +2,8 @@ ||| ?? ??? 2007, PHP 5.2.4 - Improved fix for MOPB-02-2007. (Ilia) +- Added GD version constants GD_MAJOR_VERSION, GD_MINOR_VERSION + GD_RELEASE_VERSION, GD_EXTRA_VERSION and GD_VERSION_STRING (Pierre) - Fixed bug #41518 (file_exists() warns of open_basedir restriction on non-existent file). (Tony) - Fixed bug #39330 (apache2handler does not call shutdown actions before http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.27r2=1.312.2.20.2.28diff_format=u Index: php-src/ext/gd/gd.c diff -u php-src/ext/gd/gd.c:1.312.2.20.2.27 php-src/ext/gd/gd.c:1.312.2.20.2.28 --- php-src/ext/gd/gd.c:1.312.2.20.2.27 Sat Jun 2 15:38:09 2007 +++ php-src/ext/gd/gd.c Sun Jun 3 17:46:18 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: gd.c,v 1.312.2.20.2.27 2007/06/02 15:38:09 pajoye Exp $ */ +/* $Id: gd.c,v 1.312.2.20.2.28 2007/06/03 17:46:18 pajoye Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -1288,6 +1288,7 @@ REGISTER_LONG_CONSTANT(IMG_EFFECT_NORMAL, gdEffectNormal, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_EFFECT_OVERLAY, gdEffectOverlay, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(GD_BUNDLED, 1, CONST_CS | CONST_PERSISTENT); + /* Section Filters */ REGISTER_LONG_CONSTANT(IMG_FILTER_NEGATE, IMAGE_FILTER_NEGATE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT(IMG_FILTER_GRAYSCALE, IMAGE_FILTER_GRAYSCALE, CONST_CS | CONST_PERSISTENT); @@ -1305,6 +1306,18 @@ REGISTER_LONG_CONSTANT(GD_BUNDLED, 0, CONST_CS | CONST_PERSISTENT); #endif +#ifdef GD_VERSION_STRING + REGISTER_STRING_CONSTANT(GD_VERSION, GD_VERSION_STRING, CONST_CS | CONST_PERSISTENT); +#endif + +#if defined(GD_MAJOR_VERSION) defined(GD_MINOR_VERSION) defined(GD_RELEASE_VERSION) defined(GD_EXTRA_VERSION) + REGISTER_LONG_CONSTANT(GD_MAJOR_VERSION, GD_MAJOR_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(GD_MINOR_VERSION, GD_MINOR_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_LONG_CONSTANT(GD_RELEASE_VERSION, GD_RELEASE_VERSION, CONST_CS | CONST_PERSISTENT); + REGISTER_STRING_CONSTANT(GD_EXTRA_VERSION, GD_EXTRA_VERSION, CONST_CS | CONST_PERSISTENT); +#endif + + #ifdef HAVE_GD_PNG /* http://cvs.php.net/viewvc.cgi/php-src/ext/gd/libgd/gd.h?r1=1.26.2.3.2.4r2=1.26.2.3.2.5diff_format=u Index: php-src/ext/gd/libgd/gd.h diff -u php-src/ext/gd/libgd/gd.h:1.26.2.3.2.4 php-src/ext/gd/libgd/gd.h:1.26.2.3.2.5 --- php-src/ext/gd/libgd/gd.h:1.26.2.3.2.4 Mon Apr 23 15:17:47 2007 +++ php-src/ext/gd/libgd/gd.h Sun Jun 3 17:46:18 2007 @@ -11,6 +11,12 @@ #include php_compat.h +#define GD_MAJOR_VERSION 2 +#define GD_MINOR_VERSION 0 +#define GD_RELEASE_VERSION 35 +#define GD_EXTRA_VERSION +#define GD_VERSION_STRING 2.0.35 + #ifdef NETWARE /* default fontpath for netware systems */ #define DEFAULT_FONTPATH sys:/java/nwgfx/lib/x11/fonts/ttf;. -- 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/standard formatted_print.c
Yeah will do I only tested 32-bit. :-( On Jun 3, 2007, at 9:17 AM, Ilia Alshanetsky wrote: Brian, This patch looks to have been broken a few *printf tests on 64 bit platforms, can you please review them to make sure the new behavior is indeed the correct one and adjust them if necessary. Thanks, Ilia - Shire [EMAIL PROTECTED] [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /ext/standard string.c /ext/standard/tests/strings chunk_split.phpt
iliaa Sun Jun 3 18:47:11 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/standard string.c
/php-src/ext/standard/tests/strings chunk_split.phpt
Log:
Corrected fix for CVE-2007-2872
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.751r2=1.2027.2.547.2.752diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.751 php-src/NEWS:1.2027.2.547.2.752
--- php-src/NEWS:1.2027.2.547.2.751 Sun Jun 3 17:46:17 2007
+++ php-src/NEWSSun Jun 3 18:47:10 2007
@@ -2,6 +2,7 @@
|||
?? ??? 2007, PHP 5.2.4
- Improved fix for MOPB-02-2007. (Ilia)
+- Corrected fix for CVE-2007-2872. (Ilia)
- Added GD version constants GD_MAJOR_VERSION, GD_MINOR_VERSION
GD_RELEASE_VERSION, GD_EXTRA_VERSION and GD_VERSION_STRING (Pierre)
- Fixed bug #41518 (file_exists() warns of open_basedir restriction on
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.58r2=1.445.2.14.2.59diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.58
php-src/ext/standard/string.c:1.445.2.14.2.59
--- php-src/ext/standard/string.c:1.445.2.14.2.58 Wed May 30 00:33:13 2007
+++ php-src/ext/standard/string.c Sun Jun 3 18:47:10 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.58 2007/05/30 00:33:13 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.59 2007/06/03 18:47:10 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1956,18 +1956,20 @@
char *p, *q;
int chunks; /* complete chunks! */
int restlen;
- int out_len;
+ float out_len;
chunks = srclen / chunklen;
restlen = srclen - chunks * chunklen; /* srclen % chunklen */
- out_len = (srclen + (chunks + 1) * endlen + 1);
+ out_len = chunks + 1;
+ out_len *= endlen;
+ out_len += srclen + 1;
if (out_len INT_MAX || out_len = 0) {
return NULL;
}
- dest = safe_emalloc(out_len, sizeof(char), 0);
+ dest = safe_emalloc((int)out_len, sizeof(char), 0);
for (p = src, q = dest; p (src + srclen - chunklen + 1); ) {
memcpy(q, p, chunklen);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/chunk_split.phpt?r1=1.3.4.1r2=1.3.4.2diff_format=u
Index: php-src/ext/standard/tests/strings/chunk_split.phpt
diff -u php-src/ext/standard/tests/strings/chunk_split.phpt:1.3.4.1
php-src/ext/standard/tests/strings/chunk_split.phpt:1.3.4.2
--- php-src/ext/standard/tests/strings/chunk_split.phpt:1.3.4.1 Wed May 30
00:33:13 2007
+++ php-src/ext/standard/tests/strings/chunk_split.phpt Sun Jun 3 18:47:10 2007
@@ -12,6 +12,12 @@
$c=str_repeat(B, 65535);
var_dump(chunk_split($a,$b,$c));
+$a=str_repeat(B, 65536);
+$b=1;
+$c=str_repeat(B, 65536);
+var_dump(chunk_split($a,$b,$c));
+
+
?
--EXPECT--
a-b-c-
@@ -25,3 +31,4 @@
test|end
bool(false)
+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_4_4) /ext/standard string.c /ext/standard/tests/strings chunk_split.phpt
iliaa Sun Jun 3 18:49:45 2007 UTC
Modified files: (Branch: PHP_4_4)
/php-src/ext/standard string.c
/php-src/ext/standard/tests/strings chunk_split.phpt
Log:
MFB: Corrected fix for CVE-2007-2872
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.333.2.52.2.14r2=1.333.2.52.2.15diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.333.2.52.2.14
php-src/ext/standard/string.c:1.333.2.52.2.15
--- php-src/ext/standard/string.c:1.333.2.52.2.14 Wed May 30 00:35:41 2007
+++ php-src/ext/standard/string.c Sun Jun 3 18:49:44 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.333.2.52.2.14 2007/05/30 00:35:41 iliaa Exp $ */
+/* $Id: string.c,v 1.333.2.52.2.15 2007/06/03 18:49:44 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1511,18 +1511,20 @@
char *p, *q;
int chunks; /* complete chunks! */
int restlen;
- int out_len;
+ float out_len;
chunks = srclen / chunklen;
restlen = srclen - chunks * chunklen; /* srclen % chunklen */
- out_len = (srclen + (chunks + 1) * endlen + 1);
+ out_len = chunks + 1;
+ out_len *= endlen;
+ out_len += srclen + 1;
if (out_len INT_MAX || out_len = 0) {
return NULL;
}
- dest = safe_emalloc(out_len, sizeof(char), 0);
+ dest = safe_emalloc((int)out_len, sizeof(char), 0);
for (p = src, q = dest; p (src + srclen - chunklen + 1); ) {
memcpy(q, p, chunklen);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/chunk_split.phpt?r1=1.1.2.1.2.1r2=1.1.2.1.2.2diff_format=u
Index: php-src/ext/standard/tests/strings/chunk_split.phpt
diff -u php-src/ext/standard/tests/strings/chunk_split.phpt:1.1.2.1.2.1
php-src/ext/standard/tests/strings/chunk_split.phpt:1.1.2.1.2.2
--- php-src/ext/standard/tests/strings/chunk_split.phpt:1.1.2.1.2.1 Wed May
30 00:35:41 2007
+++ php-src/ext/standard/tests/strings/chunk_split.phpt Sun Jun 3 18:49:45 2007
@@ -14,6 +14,12 @@
$c=str_repeat(B, 65535);
var_dump(chunk_split($a,$b,$c));
+$a=str_repeat(B, 65536);
+$b=1;
+$c=str_repeat(B, 65536);
+var_dump(chunk_split($a,$b,$c));
+
+
?
--EXPECT--
a-b-c-
@@ -27,3 +33,4 @@
test|end
bool(false)
+bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard string.c /ext/standard/tests/strings chunk_split.phpt
iliaa Sun Jun 3 18:53:51 2007 UTC
Modified files:
/php-src/ext/standard string.c
/php-src/ext/standard/tests/strings chunk_split.phpt
Log:
MFB: Corrected fix for CVE-2007-2872
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.638r2=1.639diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.638 php-src/ext/standard/string.c:1.639
--- php-src/ext/standard/string.c:1.638 Wed May 30 00:38:00 2007
+++ php-src/ext/standard/string.c Sun Jun 3 18:53:51 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.638 2007/05/30 00:38:00 iliaa Exp $ */
+/* $Id: string.c,v 1.639 2007/06/03 18:53:51 iliaa Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -3083,7 +3083,7 @@
int chunks; /* complete chunks! */
int restlen;
int charsize = sizeof(char);
- int out_len;
+ float out_len;
if (str_type == IS_UNICODE) {
charsize = sizeof(UChar);
@@ -3092,13 +3092,15 @@
chunks = srclen / chunklen;
restlen = srclen - chunks * chunklen; /* srclen % chunklen */
- out_len = (srclen + (chunks + 1) * endlen + 1);
+ out_len = chunks + 1;
+ out_len *= endlen;
+ out_len += srclen + 1;
if ((out_len INT_MAX || out_len = 0) || ((out_len * charsize)
INT_MAX || (out_len * charsize) = 0)) {
return NULL;
}
- dest = safe_emalloc(out_len, charsize, 0);
+ dest = safe_emalloc((int)out_len, charsize, 0);
for (p = src, q = dest; p (src + charsize * (srclen - chunklen + 1));
) {
memcpy(q, p, chunklen * charsize);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/chunk_split.phpt?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/standard/tests/strings/chunk_split.phpt
diff -u php-src/ext/standard/tests/strings/chunk_split.phpt:1.4
php-src/ext/standard/tests/strings/chunk_split.phpt:1.5
--- php-src/ext/standard/tests/strings/chunk_split.phpt:1.4 Wed May 30
00:38:00 2007
+++ php-src/ext/standard/tests/strings/chunk_split.phpt Sun Jun 3 18:53:51 2007
@@ -12,6 +12,12 @@
$c=str_repeat(B, 65535);
var_dump(chunk_split($a,$b,$c));
+$a=str_repeat(B, 65536);
+$b=1;
+$c=str_repeat(B, 65536);
+var_dump(chunk_split($a,$b,$c));
+
+
?
--EXPECT--
a-b-c-
@@ -25,3 +31,4 @@
test|end
bool(false)
+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
sniper Sun Jun 3 19:06:23 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: fix news http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.752r2=1.2027.2.547.2.753diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.752 php-src/NEWS:1.2027.2.547.2.753 --- php-src/NEWS:1.2027.2.547.2.752 Sun Jun 3 18:47:10 2007 +++ php-src/NEWSSun Jun 3 19:06:23 2007 @@ -1,10 +1,12 @@ PHPNEWS ||| ?? ??? 2007, PHP 5.2.4 -- Improved fix for MOPB-02-2007. (Ilia) +- Improved fix for MOPB-03-2007. (Ilia) - Corrected fix for CVE-2007-2872. (Ilia) - Added GD version constants GD_MAJOR_VERSION, GD_MINOR_VERSION - GD_RELEASE_VERSION, GD_EXTRA_VERSION and GD_VERSION_STRING (Pierre) + GD_RELEASE_VERSION, GD_EXTRA_VERSION and GD_VERSION_STRING. (Pierre) +- Fixed bug #41555 (configure failure: regression caused by fix for #41265). + (Jani) - Fixed bug #41518 (file_exists() warns of open_basedir restriction on non-existent file). (Tony) - Fixed bug #39330 (apache2handler does not call shutdown actions before -- 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) / NEWS /ext/zip php_zip.c /ext/zip/tests bug11216.phpt
On 6/3/07, Pierre-Alain Joye [EMAIL PROTECTED] wrote:
- if (zip_add_dir(intern, (const char *)s) == -1) {
- RETURN_FALSE;
+ if (zip_add_dir(intern, (const char *)s) == -1) {
+ RETVAL_FALSE;
+ }
+ RETVAL_TRUE;
I doubt this is correct...
-Hannes
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip php_zip.c /ext/zip/tests bug11216.phpt
pajoye Sun Jun 3 21:30:12 2007 UTC
Modified files:
/php-src/ext/zipphp_zip.c
/php-src/ext/zip/tests bug11216.phpt
Log:
- MFB: PECL #11216, addEmptyDir crashes if the directory already exists
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.44r2=1.45diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.44 php-src/ext/zip/php_zip.c:1.45
--- php-src/ext/zip/php_zip.c:1.44 Sat May 19 22:26:32 2007
+++ php-src/ext/zip/php_zip.c Sun Jun 3 21:30:12 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.44 2007/05/19 22:26:32 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.45 2007/06/03 21:30:12 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -996,6 +996,9 @@
zval *this = getThis();
char *dirname;
int dirname_len;
+ int idx;
+ struct zip_stat sb;
+ char *s;
if (!this) {
RETURN_FALSE;
@@ -1007,14 +1010,39 @@
dirname, dirname_len, UG(ascii_conv)) == FAILURE) {
return;
}
+
if (dirname_len1) {
RETURN_FALSE;
}
- if (zip_add_dir(intern, (const char *)dirname) 0) {
- RETURN_FALSE;
+if (dirname[dirname_len-1] != '/') {
+ s=(char *)emalloc(dirname_len+2);
+ strcpy(s, dirname);
+ s[dirname_len] = '/';
+ s[dirname_len+1] = '\0';
+} else {
+ s = dirname;
+ }
+
+ idx = zip_stat(intern, s, 0, sb);
+ if (idx = 0) {
+ RETVAL_FALSE;
+ } else {
+ /* reset the error */
+ if (intern-error.str) {
+ _zip_error_fini(intern-error);
+ }
+ _zip_error_init(intern-error);
+
+ if (zip_add_dir(intern, (const char *)s) == -1) {
+ RETVAL_FALSE;
+ }
+ RETVAL_TRUE;
+ }
+
+ if (s != dirname) {
+ efree(s);
}
- RETURN_TRUE;
}
/* }}} */
@@ -2116,7 +2144,7 @@
php_info_print_table_start();
php_info_print_table_row(2, Zip, enabled);
- php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.44
2007/05/19 22:26:32 pajoye Exp $);
+ php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.45
2007/06/03 21:30:12 pajoye Exp $);
php_info_print_table_row(2, Zip version, 2.0.0);
php_info_print_table_row(2, Libzip version, 0.7.1);
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/tests/bug11216.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/zip/tests/bug11216.phpt
diff -u /dev/null php-src/ext/zip/tests/bug11216.phpt:1.2
--- /dev/null Sun Jun 3 21:30:12 2007
+++ php-src/ext/zip/tests/bug11216.phpt Sun Jun 3 21:30:12 2007
@@ -0,0 +1,28 @@
+--TEST--
+Bug #11216 (::addEmptyDir() crashes when the directory already exists)
+--SKIPIF--
+?php
+/* $Id: bug11216.phpt,v 1.2 2007/06/03 21:30:12 pajoye Exp $ */
+if(!extension_loaded('zip')) die('skip');
+ ?
+--FILE--
+?php
+$archive = new ZipArchive();
+$archive-open('__test.zip', ZIPARCHIVE::CREATE);
+var_dump($archive-addEmptyDir('test'));
+print_r($archive);
+var_dump($archive-addEmptyDir('test'));
+$archive-close();
+unlink('__test.zip');
+?
+--EXPECT--
+bool(true)
+ZipArchive Object
+(
+[status] = 0
+[statusSys] = 0
+[numFiles] = 1
+[filename] =
+[comment] =
+)
+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/zip php_zip.c
pajoye Sun Jun 3 21:34:21 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/zipphp_zip.c
Log:
- fix logic (goto is a gift, I should use it :)
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.35r2=1.1.2.36diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.35 php-src/ext/zip/php_zip.c:1.1.2.36
--- php-src/ext/zip/php_zip.c:1.1.2.35 Sun Jun 3 21:21:57 2007
+++ php-src/ext/zip/php_zip.c Sun Jun 3 21:34:21 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.1.2.35 2007/06/03 21:21:57 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.1.2.36 2007/06/03 21:34:21 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1025,8 +1025,9 @@
if (zip_add_dir(intern, (const char *)s) == -1) {
RETVAL_FALSE;
+ } else {
+ RETVAL_TRUE;
}
- RETVAL_TRUE;
}
if (s != dirname) {
@@ -2050,7 +2051,7 @@
php_info_print_table_start();
php_info_print_table_row(2, Zip, enabled);
- php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v
1.1.2.35 2007/06/03 21:21:57 pajoye Exp $);
+ php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v
1.1.2.36 2007/06/03 21:34:21 pajoye Exp $);
php_info_print_table_row(2, Zip version, 2.0.0);
php_info_print_table_row(2, Libzip version, 0.7.1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/zip php_zip.c
pajoye Sun Jun 3 21:35:40 2007 UTC
Modified files:
/php-src/ext/zipphp_zip.c
Log:
- MFB: fix logic
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.45r2=1.46diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.45 php-src/ext/zip/php_zip.c:1.46
--- php-src/ext/zip/php_zip.c:1.45 Sun Jun 3 21:30:12 2007
+++ php-src/ext/zip/php_zip.c Sun Jun 3 21:35:39 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.45 2007/06/03 21:30:12 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.46 2007/06/03 21:35:39 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -1036,8 +1036,9 @@
if (zip_add_dir(intern, (const char *)s) == -1) {
RETVAL_FALSE;
+ } else {
+ RETVAL_TRUE;
}
- RETVAL_TRUE;
}
if (s != dirname) {
@@ -2144,7 +2145,7 @@
php_info_print_table_start();
php_info_print_table_row(2, Zip, enabled);
- php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.45
2007/06/03 21:30:12 pajoye Exp $);
+ php_info_print_table_row(2, Extension Version,$Id: php_zip.c,v 1.46
2007/06/03 21:35:39 pajoye Exp $);
php_info_print_table_row(2, Zip version, 2.0.0);
php_info_print_table_row(2, Libzip version, 0.7.1);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/isapi config.m4
sniper Sun Jun 3 21:54:28 2007 UTC Modified files: /php-src/sapi/isapi config.m4 Log: fix configure http://cvs.php.net/viewvc.cgi/php-src/sapi/isapi/config.m4?r1=1.18r2=1.19diff_format=u Index: php-src/sapi/isapi/config.m4 diff -u php-src/sapi/isapi/config.m4:1.18 php-src/sapi/isapi/config.m4:1.19 --- php-src/sapi/isapi/config.m4:1.18 Sun Jun 3 20:26:45 2007 +++ php-src/sapi/isapi/config.m4Sun Jun 3 21:54:28 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.18 2007/06/03 20:26:45 sniper Exp $ +dnl $Id: config.m4,v 1.19 2007/06/03 21:54:28 sniper Exp $ dnl RESULT=no @@ -24,7 +24,7 @@ PHP_SELECT_SAPI(isapi, shared, php5isapi.c) INSTALL_IT=\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$ZEUSPATH/web/bin/ RESULT=yes -]) +fi AC_MSG_RESULT($RESULT) dnl ## Local Variables: -- 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) /sapi/isapi config.m4
sniper Sun Jun 3 21:54:35 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/isapi config.m4 Log: MFH http://cvs.php.net/viewvc.cgi/php-src/sapi/isapi/config.m4?r1=1.17.4.1r2=1.17.4.2diff_format=u Index: php-src/sapi/isapi/config.m4 diff -u php-src/sapi/isapi/config.m4:1.17.4.1 php-src/sapi/isapi/config.m4:1.17.4.2 --- php-src/sapi/isapi/config.m4:1.17.4.1 Sun Jun 3 20:27:16 2007 +++ php-src/sapi/isapi/config.m4Sun Jun 3 21:54:35 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.17.4.1 2007/06/03 20:27:16 sniper Exp $ +dnl $Id: config.m4,v 1.17.4.2 2007/06/03 21:54:35 sniper Exp $ dnl RESULT=no @@ -24,7 +24,7 @@ PHP_SELECT_SAPI(isapi, shared, php5isapi.c) INSTALL_IT=\$(SHELL) \$(srcdir)/install-sh -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$ZEUSPATH/web/bin/ RESULT=yes -]) +fi AC_MSG_RESULT($RESULT) dnl ## Local Variables: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/phttpd config.m4
sniper Sun Jun 3 21:57:31 2007 UTC Modified files: /php-src/sapi/phttpdconfig.m4 Log: another missed ]) http://cvs.php.net/viewvc.cgi/php-src/sapi/phttpd/config.m4?r1=1.8r2=1.9diff_format=u Index: php-src/sapi/phttpd/config.m4 diff -u php-src/sapi/phttpd/config.m4:1.8 php-src/sapi/phttpd/config.m4:1.9 --- php-src/sapi/phttpd/config.m4:1.8 Sun Jun 3 20:26:45 2007 +++ php-src/sapi/phttpd/config.m4 Sun Jun 3 21:57:31 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.8 2007/06/03 20:26:45 sniper Exp $ +dnl $Id: config.m4,v 1.9 2007/06/03 21:57:31 sniper Exp $ dnl RESULT=no @@ -21,7 +21,7 @@ PHP_SELECT_SAPI(phttpd, shared, phttpd.c) INSTALL_IT=\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_PHTTPD/modules/ RESULT=yes -]) +fi AC_MSG_RESULT($RESULT) dnl ## Local Variables: -- 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) /sapi/phttpd config.m4
sniper Sun Jun 3 21:57:35 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/phttpdconfig.m4 Log: MFH http://cvs.php.net/viewvc.cgi/php-src/sapi/phttpd/config.m4?r1=1.7.22.1r2=1.7.22.2diff_format=u Index: php-src/sapi/phttpd/config.m4 diff -u php-src/sapi/phttpd/config.m4:1.7.22.1 php-src/sapi/phttpd/config.m4:1.7.22.2 --- php-src/sapi/phttpd/config.m4:1.7.22.1 Sun Jun 3 20:27:16 2007 +++ php-src/sapi/phttpd/config.m4 Sun Jun 3 21:57:35 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.7.22.1 2007/06/03 20:27:16 sniper Exp $ +dnl $Id: config.m4,v 1.7.22.2 2007/06/03 21:57:35 sniper Exp $ dnl RESULT=no @@ -21,7 +21,7 @@ PHP_SELECT_SAPI(phttpd, shared, phttpd.c) INSTALL_IT=\$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)$PHP_PHTTPD/modules/ RESULT=yes -]) +fi AC_MSG_RESULT($RESULT) dnl ## Local Variables: -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /sapi/cgi/tests 009.phpt
sniper Sun Jun 3 22:50:08 2007 UTC Modified files: /php-src/sapi/cgi/tests 009.phpt Log: add missing test http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/009.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/sapi/cgi/tests/009.phpt diff -u /dev/null php-src/sapi/cgi/tests/009.phpt:1.2 --- /dev/null Sun Jun 3 22:50:08 2007 +++ php-src/sapi/cgi/tests/009.phpt Sun Jun 3 22:50:08 2007 @@ -0,0 +1,30 @@ +--TEST-- +path info request without exported PATH_INFO +--SKIPIF-- +?php include skipif.inc; ? +--FILE-- +?php + +include include.inc; + +$php = get_cgi_path(); +reset_env_vars(); + +$f = tempnam(sys_get_temp_dir(), 'cgitest'); + +putenv(TRANSLATED_PATH=.$f./x); +putenv(SCRIPT_FILENAME=.$f./x); +file_put_contents($f, '?php var_dump($_SERVER[TRANSLATED_PATH]); ?'); + +echo (`$php -n $f`); + +echo Done\n; + [EMAIL PROTECTED]($f); +? +--EXPECTF-- +X-Powered-By: PHP/%s +Content-type: text/html + +string(%d) %s/x +Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /sapi/cgi/tests 009.phpt
sniper Sun Jun 3 22:50:19 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/cgi/tests 009.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/009.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/sapi/cgi/tests/009.phpt diff -u php-src/sapi/cgi/tests/009.phpt:1.1.2.1 php-src/sapi/cgi/tests/009.phpt:1.1.2.2 --- php-src/sapi/cgi/tests/009.phpt:1.1.2.1 Sun May 20 15:56:10 2007 +++ php-src/sapi/cgi/tests/009.phpt Sun Jun 3 22:50:19 2007 @@ -14,11 +14,13 @@ putenv(TRANSLATED_PATH=.$f./x); putenv(SCRIPT_FILENAME=.$f./x); -file_put_contents($f, '?php var_dump($_SERVER[TRANSLATED_PATH]); '); +file_put_contents($f, '?php var_dump($_SERVER[TRANSLATED_PATH]); ?'); -echo (`$php $f`); +echo (`$php -n $f`); echo Done\n; + [EMAIL PROTECTED]($f); ? --EXPECTF-- X-Powered-By: PHP/%s -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /tests/basic 027.phpt
bjori Sun Jun 3 23:40:01 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/tests/basic027.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/tests/basic/027.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/tests/basic/027.phpt diff -u php-src/tests/basic/027.phpt:1.1.2.2 php-src/tests/basic/027.phpt:1.1.2.3 --- php-src/tests/basic/027.phpt:1.1.2.2Sun Jun 3 16:54:06 2007 +++ php-src/tests/basic/027.phptSun Jun 3 23:40:01 2007 @@ -32,4 +32,4 @@ } } } -string(124) Unknown: Input variable nesting level exceeded 10. To increase the level change max_input_nesting_level in php.ini. +string(115) Unknown: Input variable nesting level exceeded 10. To increase the limit change max_input_nesting_level in php.ini. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/basic 027.phpt
bjori Mon Jun 4 00:11:12 2007 UTC Modified files: /php-src/tests/basic027.phpt Log: Fix the expected results # This test still fails though http://cvs.php.net/viewvc.cgi/php-src/tests/basic/027.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/tests/basic/027.phpt diff -u php-src/tests/basic/027.phpt:1.3 php-src/tests/basic/027.phpt:1.4 --- php-src/tests/basic/027.phpt:1.3Sun Jun 3 16:53:37 2007 +++ php-src/tests/basic/027.phptMon Jun 4 00:11:11 2007 @@ -32,4 +32,4 @@ } } } -string(124) Unknown: Input variable nesting level exceeded 10. To increase the level change max_input_nesting_level in php.ini. +string(115) Unknown: Input variable nesting level exceeded 10. To increase the limit change max_input_nesting_level in php.ini. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array bug35014_64bit.phpt /ext/standard/tests/strings bug23894.phpt bug26973.phpt printf_64bit.phpt sprintf_f_2.phpt
shire Mon Jun 4 01:23:07 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array bug35014_64bit.phpt /php-src/ext/standard/tests/strings bug23894.phpt bug26973.phpt printf_64bit.phpt sprintf_f_2.phpt Log: fix sprintf/printf %u tests so they work correctly on both 32-bit and 64-bit. (broken in previous fix) # just made these EXPECTREGEX expressions, if there's a prefered way to comply with both 32/64 bit let me know. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug35014_64bit.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/standard/tests/array/bug35014_64bit.phpt diff -u php-src/ext/standard/tests/array/bug35014_64bit.phpt:1.1.2.1 php-src/ext/standard/tests/array/bug35014_64bit.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/array/bug35014_64bit.phpt:1.1.2.1Fri Dec 16 15:52:09 2005 +++ php-src/ext/standard/tests/array/bug35014_64bit.phptMon Jun 4 01:23:07 2007 @@ -32,5 +32,5 @@ int(9) float(1) int(99980001) -float(2.8404260053903E+20) -int(8589934590) +float(1.219953680145E+30) +float(3.6893488147419E+19) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug23894.phpt?r1=1.1r2=1.1.8.1diff_format=u Index: php-src/ext/standard/tests/strings/bug23894.phpt diff -u php-src/ext/standard/tests/strings/bug23894.phpt:1.1 php-src/ext/standard/tests/strings/bug23894.phpt:1.1.8.1 --- php-src/ext/standard/tests/strings/bug23894.phpt:1.1Fri May 30 13:48:14 2003 +++ php-src/ext/standard/tests/strings/bug23894.phptMon Jun 4 01:23:07 2007 @@ -8,8 +8,8 @@ $test = sprintf(% 13u, $a); var_dump($test, bin2hex($test)); ? ---EXPECT-- -string(4) -012 -string(8) 2d303132 -string(13)4294967284 -string(26) 20202034323934393637323834 +--EXPECTREGEX-- +string\(4\) \-012\ +string\(8\) \2d303132\ +(string\(13\) \ 4294967284\|string\(20\) \18446744073709551604\) +(string\(26\) \20202034323934393637323834\|string\(40\) \3138343436373434303733373039353531363034\) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug26973.phpt?r1=1.3r2=1.3.6.1diff_format=u Index: php-src/ext/standard/tests/strings/bug26973.phpt diff -u php-src/ext/standard/tests/strings/bug26973.phpt:1.3 php-src/ext/standard/tests/strings/bug26973.phpt:1.3.6.1 --- php-src/ext/standard/tests/strings/bug26973.phpt:1.3Mon May 17 20:58:57 2004 +++ php-src/ext/standard/tests/strings/bug26973.phptMon Jun 4 01:23:07 2007 @@ -18,17 +18,17 @@ printf(%05u\n, -200); ? ---EXPECT-- -+0200 --0200 -+200.00 --200.00 +--EXPECTREGEX-- +\+0200 +\-0200 +\+200\.00 +\-200\.00 00200 -4294967096 +(4294967096|18446744073709551416) --- 00200 --0200 -200.00 --200.00 +\-0200 +200\.00 +\-200\.00 00200 -4294967096 +(4294967096|18446744073709551416) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/printf_64bit.phpt?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/ext/standard/tests/strings/printf_64bit.phpt diff -u php-src/ext/standard/tests/strings/printf_64bit.phpt:1.1.2.3 php-src/ext/standard/tests/strings/printf_64bit.phpt:1.1.2.4 --- php-src/ext/standard/tests/strings/printf_64bit.phpt:1.1.2.3Mon May 7 21:38:42 2007 +++ php-src/ext/standard/tests/strings/printf_64bit.phptMon Jun 4 01:23:07 2007 @@ -531,11 +531,11 @@ 0 1 -4294967295 +18446744073709551615 2 -4294967294 +18446744073709551614 2333 -4271633963 +18446744073686218283 1234 *** Output for octal type *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_f_2.phpt?r1=1.1.2.5r2=1.1.2.6diff_format=u Index: php-src/ext/standard/tests/strings/sprintf_f_2.phpt diff -u php-src/ext/standard/tests/strings/sprintf_f_2.phpt:1.1.2.5 php-src/ext/standard/tests/strings/sprintf_f_2.phpt:1.1.2.6 --- php-src/ext/standard/tests/strings/sprintf_f_2.phpt:1.1.2.5 Mon May 7 22:30:16 2007 +++ php-src/ext/standard/tests/strings/sprintf_f_2.phpt Mon Jun 4 01:23:07 2007 @@ -80,37 +80,37 @@ var_dump(sprintf(%.3e, $number)); // outputs 3.63e+8 ? ---EXPECT-- -string(7) 100.426 -string(6) 100.43 -string(3) 100 -string(3) 100 -string(3) 144 -string(3) 144 -string(34) There are 100 monkeys in the world -string(28) The 100.1 contains 0 monkeys -string(30) The world contains 100 monkeys -string(76) The world contains 100 monkeys. -That's a nice world full of 100 monkeys. -string(33) %b = '1010001010011010101101' -string(8) %c = 'A' -string(15) %d = '43951789' -string(18) %e = '4.395179e+7' -string(15) %u = '43951789' -string(17) %u = '4251015507' -string(22) %f = '43951789.00' -string(16) %o = '247523255' -string(15) %s = '43951789' -string(14) %x = '29ea6ad' -string(14) %X = '29EA6AD' -string(17) %+d = '+43951789' -string(17) %+d = '-43951789' -string(8) [monkey] -string(12) [monkey] -string(12) [monkey] -string(12) [monkey] -string(12)
[PHP-CVS] cvs: php-src /ext/standard/tests/array bug35014_64bit.phpt /ext/standard/tests/strings bug23894.phpt bug26973.phpt printf_64bit.phpt sprintf_f_2.phpt
shire Mon Jun 4 01:23:22 2007 UTC Modified files: /php-src/ext/standard/tests/array bug35014_64bit.phpt /php-src/ext/standard/tests/strings bug23894.phpt bug26973.phpt printf_64bit.phpt sprintf_f_2.phpt Log: MFB: fix sprintf/printf %u tests so they work correctly on both 32-bit and 64-bit. (broken in previous fix) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug35014_64bit.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/standard/tests/array/bug35014_64bit.phpt diff -u php-src/ext/standard/tests/array/bug35014_64bit.phpt:1.3 php-src/ext/standard/tests/array/bug35014_64bit.phpt:1.4 --- php-src/ext/standard/tests/array/bug35014_64bit.phpt:1.3Tue Aug 8 20:17:31 2006 +++ php-src/ext/standard/tests/array/bug35014_64bit.phptMon Jun 4 01:23:22 2007 @@ -42,5 +42,5 @@ int(9) float(1) int(99980001) -float(2.8404260053903E+20) -int(8589934590) +float(1.219953680145E+30) +float(3.6893488147419E+19) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug23894.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/standard/tests/strings/bug23894.phpt diff -u php-src/ext/standard/tests/strings/bug23894.phpt:1.3 php-src/ext/standard/tests/strings/bug23894.phpt:1.4 --- php-src/ext/standard/tests/strings/bug23894.phpt:1.3Mon Dec 25 11:16:05 2006 +++ php-src/ext/standard/tests/strings/bug23894.phptMon Jun 4 01:23:22 2007 @@ -8,13 +8,13 @@ $test = sprintf(% 13u, $a); var_dump($test, bin2hex((binary)$test)); ? ---EXPECT-- -string(4) -012 -string(8) 2d303132 -string(13)4294967284 -string(26) 20202034323934393637323834 ---UEXPECT-- -unicode(4) -012 -unicode(8) 2d303132 -unicode(13)4294967284 -unicode(26) 20202034323934393637323834 +--EXPECTREGEX-- +string\(4\) \-012\ +string\(8\) \2d303132\ +(string\(13\) \ 4294967284\|string\(20\) \18446744073709551604\) +(string\(26\) \20202034323934393637323834\|string\(40\) \3138343436373434303733373039353531363034\) +--UEXPECTREGEX-- +unicode\(4\) \-012\ +unicode\(8\) \2d303132\ +(unicode\(13\) \ 4294967284\|unicode\(20\) \18446744073709551604\) +(unicode\(26\) \20202034323934393637323834\|unicode\(40\) \3138343436373434303733373039353531363034\) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug26973.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/standard/tests/strings/bug26973.phpt diff -u php-src/ext/standard/tests/strings/bug26973.phpt:1.3 php-src/ext/standard/tests/strings/bug26973.phpt:1.4 --- php-src/ext/standard/tests/strings/bug26973.phpt:1.3Mon May 17 20:58:57 2004 +++ php-src/ext/standard/tests/strings/bug26973.phptMon Jun 4 01:23:22 2007 @@ -18,17 +18,17 @@ printf(%05u\n, -200); ? ---EXPECT-- -+0200 --0200 -+200.00 --200.00 +--EXPECTREGEX-- +\+0200 +\-0200 +\+200\.00 +\-200\.00 00200 -4294967096 +(4294967096|18446744073709551416) --- 00200 --0200 -200.00 --200.00 +\-0200 +200\.00 +\-200\.00 00200 -4294967096 +(4294967096|18446744073709551416) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/printf_64bit.phpt?r1=1.4r2=1.5diff_format=u Index: php-src/ext/standard/tests/strings/printf_64bit.phpt diff -u php-src/ext/standard/tests/strings/printf_64bit.phpt:1.4 php-src/ext/standard/tests/strings/printf_64bit.phpt:1.5 --- php-src/ext/standard/tests/strings/printf_64bit.phpt:1.4Mon May 7 21:38:35 2007 +++ php-src/ext/standard/tests/strings/printf_64bit.phptMon Jun 4 01:23:22 2007 @@ -531,11 +531,11 @@ 0 1 -4294967295 +18446744073709551615 2 -4294967294 +18446744073709551614 2333 -4271633963 +18446744073686218283 1234 *** Output for octal type *** http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/sprintf_f_2.phpt?r1=1.4r2=1.5diff_format=u Index: php-src/ext/standard/tests/strings/sprintf_f_2.phpt diff -u php-src/ext/standard/tests/strings/sprintf_f_2.phpt:1.4 php-src/ext/standard/tests/strings/sprintf_f_2.phpt:1.5 --- php-src/ext/standard/tests/strings/sprintf_f_2.phpt:1.4 Mon May 7 22:33:39 2007 +++ php-src/ext/standard/tests/strings/sprintf_f_2.phpt Mon Jun 4 01:23:22 2007 @@ -80,71 +80,71 @@ var_dump(sprintf(%.3e, $number)); // outputs 3.63e+8 ? ---EXPECT-- -string(7) 100.426 -string(6) 100.43 -string(3) 100 -string(3) 100 -string(3) 144 -string(3) 144 -string(34) There are 100 monkeys in the world -string(28) The 100.1 contains 0 monkeys -string(30) The world contains 100 monkeys -string(76) The world contains 100 monkeys. -That's a nice world full of 100 monkeys. -string(33) %b = '1010001010011010101101' -string(8) %c = 'A' -string(15) %d = '43951789' -string(18) %e = '4.395179e+7' -string(15) %u = '43951789' -string(17) %u = '4251015507' -string(22) %f = '43951789.00' -string(16) %o = '247523255' -string(15) %s = '43951789' -string(14) %x = '29ea6ad' -string(14) %X = '29EA6AD' -string(17) %+d =
Re: [PHP-CVS] cvs: php-src /ext/standard formatted_print.c
Yep, I think tests/strings/printf_64bit.phpt should actually cover this one though (once I commit the changes to fix these tests I broke). Let me know if you need any more specific tests though, basically printf(%u, -1) is now 18446744073709551615 rather than 4294967295 on 64-bit. On Jun 3, 2007, at 8:06 AM, Ilia Alshanetsky wrote: Brian, Can you please add a test case. Thanks, Ilia -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php - Shire [EMAIL PROTECTED] [EMAIL PROTECTED] -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: CVSROOT / avail
philip Mon Jun 4 05:12:54 2007 UTC Modified files: /CVSROOTavail Log: New accounts for Gwynne Raskind and Alexander Songe, with phpdoc karma. Welcome! http://cvs.php.net/viewvc.cgi/CVSROOT/avail?r1=1.1275r2=1.1276diff_format=u Index: CVSROOT/avail diff -u CVSROOT/avail:1.1275 CVSROOT/avail:1.1276 --- CVSROOT/avail:1.1275Fri Jun 1 17:20:41 2007 +++ CVSROOT/avail Mon Jun 4 05:12:53 2007 @@ -40,7 +40,7 @@ # The PHP Documentation Group maintains the documentation and its # translations. -avail|jmertic,bobby,takagi,gcc,cem,mfp,ansriniv,jsgoupil,mazzanet,dbs,frogger,coldocean,alan_k,fleaslob,torben,lynch,kk,ted,paul,mbritton,coar,joey,bibi,mrobinso,perugini,tzwenny,hirokawa,drews,paulsen,hartmann,leon,jonen,tschuer,tfromm,manuel,stas,danbeck,sli,jmcastagnetto,mohrt,goba,samesch,jon,soneca,ronabop,glace,latoserver,rafael,jan,jcmeloni,chrullrich,mk,sebastian,troels,mathieu,phaethon,mj,corean,pandach,cycle98,vizvil,regina,cynic,jpm,dams,karoora,pcraft,suvia,zak,zimt,jmoore,ftfuture,ag315,bbonev,afortaleza,neotron,cg,delrom,jkj,hellekin,kgergely,cnewbill,fuzzy74,bjoern,fams,smasiello,dim,lucasr,cpereira,ernani,theseer,noribsd,subjective,ufux,hadar_p,asautins,dbenson,aleczapka,tom,amiller,cortesi,rarruda,betz,philip,alindeman,thyla,cucinato,zyprexia,tpug,mitja,conni,sts,georg,nmav,subbie,leszek,spheroid,slawek,alan_dangelo,ae,nohn,kaser01,visualmind,kurtz,luk,tronic,moh,bernd,yohgaki,fujimoto,gerzson,webler,spooky,cece,daniel,boo,nhoizey,joerg,imajes,hakan,chief97! 7,shlomi,raful,yuval,tomer,barak,ido,mork,lior,gal,adiju,cr_depend,florian,kappu,muricaru,dt,critix,ck,costra,fancao0515,tibee,eriksson,wenz,bs,anderson,tal,sander,matroz,ave,adu,mmeier,wentzel,scaro,aspinei,lmaxcar,manuzhai,darvina,peter,maxim,romakhin,n0nick,attila,sagi,kai,microbrain,rhheo,shimi,k.schroeder,djworld,emil,lboshell,netholic,dmitry83,progcom,verdana,yincheng,surfmax,nicos,chregu,msopacua,bbd,cyril,gregory,hudzilla,klean,mignoni,wiesemann,xqi,mersal,zruya,sean,staybyte,aber_sabeel,alzahrani,thomaslio,sfox,jippie,antonio,ahxiao,akcakayaa,allhibi,aner,black,class007,digo,dima,dorons,eshare,hpop1,itay,juppie,mrmatrix,saad,thomasgm,xbite,tobsn,jome,analytik,outsider,heymarcel,asmodean,bader,elmaystro,sp,truelight,gnuhacker,_batman_,sachat,dallas,dejan,zer0fill,steve3d,lm92,bradmssw,tahani,victor,erica,simonh,phpman,mrphp,notarius,joseph,mmkhajah,mohammed,proton,klootz,takashima,leoca,ahmad,abobader,fboudot,wurm,hakawy,felix,ahmedss,mahrous2020,yorgo,gal_ga,abodiv! e,ama,andras,hassen,jkhdk,okamura,popov,xman,fernandoc,avenger,hwin,ti x,alrehawi_,liuming,ramysaweres,astone,shiflett,jaenecke,bdensley,adamchan,jingfs,murphy,potatotsang,the_q,jsheets,xelis,equerci,phpcatala,tofanini,umut,kriga,ray,royhuggins,logician,almanar,alexws,gonik,haiaw,lkwang_cn,shadowwulf,telecart,pongsakorn,naveed,shivas,tularis,angela,decorj,hitcho,kevinkee,nmee,thx1140,crotalus,didou,novotnyr,sil,traduim,gui,mgf,ivanr,michal,tsirman,momo,cysoft,firefox,kouber,mipac,muslem,tomysk,vemarkov,garth,lord_lele,stone,laacz,retnug,ernestyang,hatem,house,luisdaniel,nizar,nvivo,seth,tomh,danguer,adam,nio,wassago,beeven,colacino,zvaranka,cesarguru,chubu,dark2907,portoban,reven,wizzard,sywr,koendw83,rylin,webstudio,jsjohnst,dmanusset,et,pitiphan,mbr,cdalar,alrashoudi,hafid,enough,zhouhao007,jnorbi,lorenzohgh,denisr,coder03,jcclaros,thomas,freeman,rioter,jschultz,davey,belleto,jtacon,yuw,ohill,elfyn,noam,nathan,salman,cheezy,ene,rezaiqbal,purnomo,dufiga_php,ftp_geo,udhien,prio,luckyguy354,maf,handi,meme,satiri,maddankara,rildo,hd,ali,lpj,adhit! ama,engkongs,preilly,dave,marcelo,curt,fd,javi,mrmaster,fa,nlopess,vrana,apaxx,pjotrik,marduk,narcotia1234,enloma,trizo,xmadda,redshift,alifikri,coder,dodol_maniac,eflorin,adywarna,kyokpae,milans,lovchy,spermwhale,phaze,baoengb,derek,yannick,daan,xxiengb,ott,mg,kennyt,tomsommer,poz,zamolxe,bishmila,ph1,irchtml,rogamer,bortolini,sapfir,guru,ahmed,robinhood,sohli,amt,romain,hlecuanda,thessoro,nforbes,jolan,laze,bagilevi,young,shakaali,chokobo,portalufpa,teecee,blindman,holst,schst,mnv,sodhi,aidan,jellybob,lauer,shenkong,jad,robert,peterhuewe,ogre,techtonik,narigone,realtebo,krid,mclay,dasch,miwaniec,abdshomad,sammywg,aeoris,mez,jed,hsc,luckec,dmytton,choudesh,phpvcn,simp,michael,grantc,atex,katja,sthulbourn,mikl,kevinsz,roast,lsmith,tessus,gavinfo,rant,colder,ramsey,arkadius,bjori,erinet,omar,sixd,oliver,rquadling,timo,shadda,joeaccord,ezyang,ljbuesch,knut|phpdoc,phpdoc-ar,phpdoc-bg,phpdoc-cs,phpdoc-da,phpdoc-de,phpdoc-el,phpdoc-es,phpdoc-fa_IR,phpdoc-fi,phpdoc-fr,phpdoc-he,p! hpdoc-hk,phpdoc-hu,phpdoc-id,phpdoc-it,phpdoc-ja,phpdoc-kr,phpdoc-lt,p hpdoc-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
