[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date php_date.c /ext/date/tests date_constants.phpt
bjori Fri Jul 28 16:32:31 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date php_date.c
/php-src/ext/date/tests date_constants.phpt
Log:
Fix DateTime::RSS
Update tests
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.19&r2=1.43.2.45.2.20&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.19
php-src/ext/date/php_date.c:1.43.2.45.2.20
--- php-src/ext/date/php_date.c:1.43.2.45.2.19 Thu Jul 20 15:49:02 2006
+++ php-src/ext/date/php_date.c Fri Jul 28 16:32:31 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.19 2006/07/20 15:49:02 derick Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.20 2006/07/28 16:32:31 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1448,7 +1448,7 @@
REGISTER_DATE_CLASS_CONST_STRING("RFC1123", DATE_FORMAT_RFC1123);
REGISTER_DATE_CLASS_CONST_STRING("RFC2822", DATE_FORMAT_RFC2822);
REGISTER_DATE_CLASS_CONST_STRING("RFC3339", DATE_FORMAT_RFC3339);
- REGISTER_DATE_CLASS_CONST_STRING("RSS", DATE_FORMAT_RFC822);
+ REGISTER_DATE_CLASS_CONST_STRING("RSS", DATE_FORMAT_RFC1123);
REGISTER_DATE_CLASS_CONST_STRING("W3C", DATE_FORMAT_RFC3339);
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_constants.phpt?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/ext/date/tests/date_constants.phpt
diff -u php-src/ext/date/tests/date_constants.phpt:1.1.2.5
php-src/ext/date/tests/date_constants.phpt:1.1.2.6
--- php-src/ext/date/tests/date_constants.phpt:1.1.2.5 Tue May 30 15:14:22 2006
+++ php-src/ext/date/tests/date_constants.phpt Fri Jul 28 16:32:31 2006
@@ -12,6 +12,7 @@
DATE_RFC1036,
DATE_RFC1123,
DATE_RFC2822,
+DATE_RFC3339,
DATE_RSS,
DATE_W3C
);
@@ -20,6 +21,22 @@
var_dump(date($const, strtotime("1 Jul 06 14:27:30 +0200")));
var_dump(date($const, strtotime("2006-05-30T14:32:13+02:00")));
}
+
+print "\n";
+
+var_dump(
+DATE_ATOM== DateTime::ATOM,
+DATE_COOKIE == DateTime::COOKIE,
+DATE_ISO8601 == DateTime::ISO8601,
+DATE_RFC822 == DateTime::RFC822,
+DATE_RFC850 == DateTime::RFC850,
+DATE_RFC1036 == DateTime::RFC1036,
+DATE_RFC1123 == DateTime::RFC1123,
+DATE_RFC2822 == DateTime::RFC2822,
+DATE_RFC3339 == DateTime::RFC3339,
+DATE_RSS == DateTime::RSS,
+DATE_W3C == DateTime::W3C
+);
?>
--EXPECT--
string(25) "2006-07-01T14:27:30+02:00"
@@ -38,7 +55,21 @@
string(31) "Tue, 30 May 2006 14:32:13 +0200"
string(31) "Sat, 01 Jul 2006 14:27:30 +0200"
string(31) "Tue, 30 May 2006 14:32:13 +0200"
+string(25) "2006-07-01T14:27:30+02:00"
+string(25) "2006-05-30T14:32:13+02:00"
string(31) "Sat, 01 Jul 2006 14:27:30 +0200"
string(31) "Tue, 30 May 2006 14:32:13 +0200"
string(25) "2006-07-01T14:27:30+02:00"
string(25) "2006-05-30T14:32:13+02:00"
+
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/date/tests date_constants.phpt
bjori Fri Jul 28 16:32:54 2006 UTC
Modified files:
/php-src/ext/date/tests date_constants.phpt
Log:
MFB: Update test
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_constants.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/date/tests/date_constants.phpt
diff -u php-src/ext/date/tests/date_constants.phpt:1.5
php-src/ext/date/tests/date_constants.phpt:1.6
--- php-src/ext/date/tests/date_constants.phpt:1.5 Fri Jun 2 22:22:40 2006
+++ php-src/ext/date/tests/date_constants.phpt Fri Jul 28 16:32:54 2006
@@ -12,6 +12,7 @@
DATE_RFC1036,
DATE_RFC1123,
DATE_RFC2822,
+DATE_RFC3339,
DATE_RSS,
DATE_W3C
);
@@ -20,6 +21,22 @@
var_dump(date($const, strtotime("1 Jul 06 14:27:30 +0200")));
var_dump(date($const, strtotime("2006-05-30T14:32:13+02:00")));
}
+
+print "\n";
+
+var_dump(
+DATE_ATOM== DateTime::ATOM,
+DATE_COOKIE == DateTime::COOKIE,
+DATE_ISO8601 == DateTime::ISO8601,
+DATE_RFC822 == DateTime::RFC822,
+DATE_RFC850 == DateTime::RFC850,
+DATE_RFC1036 == DateTime::RFC1036,
+DATE_RFC1123 == DateTime::RFC1123,
+DATE_RFC2822 == DateTime::RFC2822,
+DATE_RFC3339 == DateTime::RFC3339,
+DATE_RSS == DateTime::RSS,
+DATE_W3C == DateTime::W3C
+);
?>
--EXPECT--
string(25) "2006-07-01T14:27:30+02:00"
@@ -38,10 +55,24 @@
string(31) "Tue, 30 May 2006 14:32:13 +0200"
string(31) "Sat, 01 Jul 2006 14:27:30 +0200"
string(31) "Tue, 30 May 2006 14:32:13 +0200"
+string(25) "2006-07-01T14:27:30+02:00"
+string(25) "2006-05-30T14:32:13+02:00"
string(31) "Sat, 01 Jul 2006 14:27:30 +0200"
string(31) "Tue, 30 May 2006 14:32:13 +0200"
string(25) "2006-07-01T14:27:30+02:00"
string(25) "2006-05-30T14:32:13+02:00"
+
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
--UEXPECT--
unicode(25) "2006-07-01T14:27:30+02:00"
unicode(25) "2006-05-30T14:32:13+02:00"
--
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
iliaa Fri Jul 28 14:00:07 2006 UTC
Modified files:
/php-src/ext/zipphp_zip.c
Log:
MFB: Cleanup phpinfo() output
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1 php-src/ext/zip/php_zip.c:1.2
--- php-src/ext/zip/php_zip.c:1.1 Mon Jul 24 16:58:58 2006
+++ php-src/ext/zip/php_zip.c Fri Jul 28 14:00:07 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.1 2006/07/24 16:58:58 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.2 2006/07/28 14:00:07 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1914,12 +1914,12 @@
PHP_MINFO_FUNCTION(zip)
{
php_info_print_table_start();
- {
- php_info_print_table_row(2, "Zip", "enabled");
- php_info_print_table_row(2, "$Id: php_zip.c,v 1.1 2006/07/24
16:58:58 pajoye Exp $", "enabled");
- php_info_print_table_row(2, "Zip version", "1.4.0");
- php_info_print_table_row(2, "Libzip version", "0.7.1");
- }
+
+ php_info_print_table_row(2, "Zip", "enabled");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v 1.2
2006/07/28 14:00:07 iliaa Exp $");
+ php_info_print_table_row(2, "Zip version", "1.4.0");
+ php_info_print_table_row(2, "Libzip version", "0.7.1");
+
php_info_print_table_end();
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file bug24313.phpt
tony2001Fri Jul 28 13:47:56 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filebug24313.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug24313.phpt?r1=1.3.4.1.2.1&r2=1.3.4.1.2.2&diff_format=u Index: php-src/ext/standard/tests/file/bug24313.phpt diff -u php-src/ext/standard/tests/file/bug24313.phpt:1.3.4.1.2.1 php-src/ext/standard/tests/file/bug24313.phpt:1.3.4.1.2.2 --- php-src/ext/standard/tests/file/bug24313.phpt:1.3.4.1.2.1 Tue Jul 11 21:20:20 2006 +++ php-src/ext/standard/tests/file/bug24313.phpt Fri Jul 28 13:47:56 2006 @@ -1,10 +1,10 @@ --TEST-- Bug #24313 (file_exists() throws a warning on nonexistent files when is open_basedir enabled) --INI-- -open_basedir=/bin +open_basedir=/dev --FILE-- --EXPECT-- 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/tests/file bug24313.phpt
tony2001Fri Jul 28 13:47:41 2006 UTC Modified files: /php-src/ext/standard/tests/filebug24313.phpt Log: fix test I really hope there are no systems where /dev is a symlink http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug24313.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/standard/tests/file/bug24313.phpt diff -u php-src/ext/standard/tests/file/bug24313.phpt:1.5 php-src/ext/standard/tests/file/bug24313.phpt:1.6 --- php-src/ext/standard/tests/file/bug24313.phpt:1.5 Tue Jul 11 21:19:56 2006 +++ php-src/ext/standard/tests/file/bug24313.phpt Fri Jul 28 13:47:41 2006 @@ -1,10 +1,10 @@ --TEST-- Bug #24313 (file_exists() throws a warning on nonexistent files when is open_basedir enabled) --INI-- -open_basedir=/bin +open_basedir=/dev --FILE-- --EXPECT-- 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/filter logical_filters.c package.xml /ext/filter/tests bug8315.phpt
pajoye Sat Jul 29 01:27:47 2006 UTC
Modified files:
/php-src/ext/filter logical_filters.c package.xml
/php-src/ext/filter/tests bug8315.phpt
Log:
- MFH: #8315, NULL character stops the validation
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.4
php-src/ext/filter/logical_filters.c:1.5
--- php-src/ext/filter/logical_filters.c:1.4Sat Jul 22 12:54:05 2006
+++ php-src/ext/filter/logical_filters.cSat Jul 29 01:27:47 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: logical_filters.c,v 1.4 2006/07/22 12:54:05 nlopess Exp $ */
+/* $Id: logical_filters.c,v 1.5 2006/07/29 01:27:47 pajoye Exp $ */
#include "php_filter.h"
#include "filter_private.h"
@@ -119,6 +119,7 @@
}
i++;
p[i] = '\0';
+ end = p + i - 1;
}
/* state 0 */
@@ -189,7 +190,7 @@
}
stateT: /* state "tail" */
- if (*p != '\0') {
+ if (*p != '\0' || (p-1) != end) {
goto stateE;
} else {
goto stateR;
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/package.xml?r1=1.23&r2=1.24&diff_format=u
Index: php-src/ext/filter/package.xml
diff -u php-src/ext/filter/package.xml:1.23 php-src/ext/filter/package.xml:1.24
--- php-src/ext/filter/package.xml:1.23 Thu Jul 20 13:08:36 2006
+++ php-src/ext/filter/package.xml Sat Jul 29 01:27:47 2006
@@ -26,10 +26,11 @@
beta
0.10.0
2006-05-14
-- Fixed PECL bug #6136, ini_set should not be able to change the
filter.default (Pierre)
-- Fixed PECL bug #6639: uppercase hexadecimal digits are not supported
+- Fixed PECL bug #8315, NULL character stops the validation (Pierre)
- Fixed PECL bug #7733, Float exponential weird result (Pierre)
- Fixed PECL bug #7715, Input_get float error (Pierre)
+- Fixed PECL bug #6639: uppercase hexadecimal digits are not supported
+- Fixed PECL bug #6136, ini_set should not be able to change the
filter.default (Pierre)
- Implemented PECL req #6641: negative values for hexadecimal and octal
numbers are not supported.
- Added support for php pcre expressions (Pierre)
- Fixed Possible leak in internal sapi_filter (Pierre)
@@ -37,7 +38,7 @@
- Added FILTER_FLAG_SCALAR and FILTER_FLAG_ARRAY , allows or not array values
(Pierre)
- Basic IPv6 (no option yet, only the syntax is verified) (Pierre)
- Add support for custom decimal separator (Pierre)
-- Integer, boolean and float filters trim the values before the validations
(spaces only) (Pierre)
+- INT and Float filters trim the values before the validations (spaces only)
(Pierre)
- input_get and input_get_args returns now FALSE when the validation failed
and NULL when the variable has not been found (Pierre)
- Added JIT support
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/bug8315.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/filter/tests/bug8315.phpt
diff -u /dev/null php-src/ext/filter/tests/bug8315.phpt:1.2
--- /dev/null Sat Jul 29 01:27:47 2006
+++ php-src/ext/filter/tests/bug8315.phpt Sat Jul 29 01:27:47 2006
@@ -0,0 +1,10 @@
+--TEST--
+bug 8315, NULL values halt the validation
+--FILE--
+
+--EXPECTF--
+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/filter logical_filters.c package.xml /ext/filter/tests bug8315.phpt
pajoye Sat Jul 29 01:26:55 2006 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/filter/tests bug8315.phpt
Modified files:
/php-src/ext/filter logical_filters.c package.xml
Log:
- #8315, NULL character stops the validation
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.1.2.3
php-src/ext/filter/logical_filters.c:1.1.2.4
--- php-src/ext/filter/logical_filters.c:1.1.2.3Sat Jul 22 12:49:36 2006
+++ php-src/ext/filter/logical_filters.cSat Jul 29 01:26:55 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: logical_filters.c,v 1.1.2.3 2006/07/22 12:49:36 nlopess Exp $ */
+/* $Id: logical_filters.c,v 1.1.2.4 2006/07/29 01:26:55 pajoye Exp $ */
#include "php_filter.h"
#include "filter_private.h"
@@ -119,6 +119,7 @@
}
i++;
p[i] = '\0';
+ end = p + i - 1;
}
/* state 0 */
@@ -189,7 +190,7 @@
}
stateT: /* state "tail" */
- if (*p != '\0') {
+ if (*p != '\0' || (p-1) != end) {
goto stateE;
} else {
goto stateR;
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/package.xml?r1=1.22&r2=1.22.2.1&diff_format=u
Index: php-src/ext/filter/package.xml
diff -u php-src/ext/filter/package.xml:1.22
php-src/ext/filter/package.xml:1.22.2.1
--- php-src/ext/filter/package.xml:1.22 Sun May 28 01:24:01 2006
+++ php-src/ext/filter/package.xml Sat Jul 29 01:26:55 2006
@@ -26,10 +26,11 @@
beta
0.10.0
2006-05-14
-- Fixed PECL bug #6136, ini_set should not be able to change the
filter.default (Pierre)
-- Fixed PECL bug #6639: uppercase hexadecimal digits are not supported
+- Fixed PECL bug #8315, NULL character stops the validation (Pierre)
- Fixed PECL bug #7733, Float exponential weird result (Pierre)
- Fixed PECL bug #7715, Input_get float error (Pierre)
+- Fixed PECL bug #6639: uppercase hexadecimal digits are not supported
+- Fixed PECL bug #6136, ini_set should not be able to change the
filter.default (Pierre)
- Implemented PECL req #6641: negative values for hexadecimal and octal
numbers are not supported.
- Added support for php pcre expressions (Pierre)
- Fixed Possible leak in internal sapi_filter (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/bug8315.phpt?view=markup&rev=1.1
Index: php-src/ext/filter/tests/bug8315.phpt
+++ php-src/ext/filter/tests/bug8315.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/hash hash.c
iliaa Fri Jul 28 14:27:17 2006 UTC Modified files: /php-src/ext/hash hash.c Log: MFB: cleanup of the phpinfo() output. http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash.c?r1=1.27&r2=1.28&diff_format=u Index: php-src/ext/hash/hash.c diff -u php-src/ext/hash/hash.c:1.27 php-src/ext/hash/hash.c:1.28 --- php-src/ext/hash/hash.c:1.27Sat Jun 17 13:00:21 2006 +++ php-src/ext/hash/hash.c Fri Jul 28 14:27:17 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: hash.c,v 1.27 2006/06/17 13:00:21 bjori Exp $ */ +/* $Id: hash.c,v 1.28 2006/07/28 14:27:17 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -608,8 +608,8 @@ *s = 0; php_info_print_table_start(); - php_info_print_table_header(2, "hash support", "enabled"); - php_info_print_table_header(2, "Hashing Engines", buffer); + php_info_print_table_row(2, "hash support", "enabled"); + php_info_print_table_row(2, "Hashing Engines", buffer); php_info_print_table_end(); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/hash hash.c
iliaa Fri Jul 28 14:27:03 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/hash hash.c Log: cleanup of the phpinfo() output. http://cvs.php.net/viewvc.cgi/php-src/ext/hash/hash.c?r1=1.18.2.5.2.2&r2=1.18.2.5.2.3&diff_format=u Index: php-src/ext/hash/hash.c diff -u php-src/ext/hash/hash.c:1.18.2.5.2.2 php-src/ext/hash/hash.c:1.18.2.5.2.3 --- php-src/ext/hash/hash.c:1.18.2.5.2.2Sat Jun 17 13:06:06 2006 +++ php-src/ext/hash/hash.c Fri Jul 28 14:27:03 2006 @@ -16,7 +16,7 @@ +--+ */ -/* $Id: hash.c,v 1.18.2.5.2.2 2006/06/17 13:06:06 bjori Exp $ */ +/* $Id: hash.c,v 1.18.2.5.2.3 2006/07/28 14:27:03 iliaa Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -590,8 +590,8 @@ *s = 0; php_info_print_table_start(); - php_info_print_table_header(2, "hash support", "enabled"); - php_info_print_table_header(2, "Hashing Engines", buffer); + php_info_print_table_row(2, "hash support", "enabled"); + php_info_print_table_row(2, "Hashing Engines", buffer); php_info_print_table_end(); } /* }}} */ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / run-tests.php
tony2001Fri Jul 28 12:58:59 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcrun-tests.php
Log:
MFH: disable --leak-check
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.8&r2=1.226.2.37.2.9&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.8
php-src/run-tests.php:1.226.2.37.2.9
--- php-src/run-tests.php:1.226.2.37.2.8Wed Jul 26 11:11:11 2006
+++ php-src/run-tests.php Fri Jul 28 12:58:59 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.8 2006/07/26 11:11:11 tony2001 Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.9 2006/07/28 12:58:59 tony2001 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
@@ -397,7 +397,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.8 $'."\n";
+ echo '$Revision: 1.226.2.37.2.9 $'."\n";
exit(1);
default:
echo "Illegal switch '$switch'
specified!\n";
@@ -1328,7 +1328,7 @@
}
if ($leak_check) {
- $cmd = "USE_ZEND_ALLOC=0 valgrind -q --tool=memcheck
--trace-children=yes --leak-check=yes --log-file-exactly=$memcheck_filename
$cmd";
+ $cmd = "USE_ZEND_ALLOC=0 valgrind -q --tool=memcheck
--trace-children=yes --log-file-exactly=$memcheck_filename $cmd";
}
if ($DETAILED) echo "
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src / run-tests.php
tony2001Fri Jul 28 12:58:42 2006 UTC
Modified files:
/php-srcrun-tests.php
Log:
enabling --leak-check was bad idea, since there are way too much false
positives caused by the absence of Zend MM
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.299&r2=1.300&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.299 php-src/run-tests.php:1.300
--- php-src/run-tests.php:1.299 Wed Jul 26 11:11:04 2006
+++ php-src/run-tests.php Fri Jul 28 12:58:42 2006
@@ -23,7 +23,7 @@
+--+
*/
-/* $Id: run-tests.php,v 1.299 2006/07/26 11:11:04 tony2001 Exp $ */
+/* $Id: run-tests.php,v 1.300 2006/07/28 12:58:42 tony2001 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
@@ -400,7 +400,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.299 $'."\n";
+ echo '$Revision: 1.300 $'."\n";
exit(1);
default:
echo "Illegal switch specified!\n";
@@ -1381,7 +1381,7 @@
}
if ($leak_check) {
- $cmd = "USE_ZEND_ALLOC=0 valgrind -q --tool=memcheck
--trace-children=yes --leak-check=yes --log-file-exactly=$memcheck_filename
$cmd";
+ $cmd = "USE_ZEND_ALLOC=0 valgrind -q --tool=memcheck
--trace-children=yes --log-file-exactly=$memcheck_filename $cmd";
}
if ($DETAILED) echo "
--
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 info.c info.h
iliaa Fri Jul 28 14:23:35 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/standard info.c info.h
Log:
ext/standard/info.c ext/standard/info.h
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.160&r2=1.2027.2.547.2.161&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.160 php-src/NEWS:1.2027.2.547.2.161
--- php-src/NEWS:1.2027.2.547.2.160 Fri Jul 28 12:23:18 2006
+++ php-src/NEWSFri Jul 28 14:23:35 2006
@@ -15,6 +15,7 @@
. Fixed bug #37564 (AES privacy encryption not possible due to net-snmp 5.2
compatibility issue). (Patch: scott dot moynes+php at gmail dot com)
+- Fixed phpinfo() cutoff of variables at \0. (Ilia)
- Fixed a bug in the filter extension that prevented magic_quotes_gpc from
being applied when RAW filter is used. (Ilia)
- Fixed bug #38236 (Binary data gets corrupted on multipart/formdata POST).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/info.c?r1=1.249.2.10.2.2&r2=1.249.2.10.2.3&diff_format=u
Index: php-src/ext/standard/info.c
diff -u php-src/ext/standard/info.c:1.249.2.10.2.2
php-src/ext/standard/info.c:1.249.2.10.2.3
--- php-src/ext/standard/info.c:1.249.2.10.2.2 Sun Jun 11 20:47:34 2006
+++ php-src/ext/standard/info.c Fri Jul 28 14:23:35 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: info.c,v 1.249.2.10.2.2 2006/06/11 20:47:34 iliaa Exp $ */
+/* $Id: info.c,v 1.249.2.10.2.3 2006/07/28 14:23:35 iliaa Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -114,7 +114,6 @@
char *string_key;
uint string_len;
ulong num_key;
- char *elem_esc = NULL;
zend_is_auto_global(name, name_length TSRMLS_CC);
@@ -134,11 +133,9 @@
switch (zend_hash_get_current_key_ex(Z_ARRVAL_PP(data),
&string_key, &string_len, &num_key, 0, NULL)) {
case HASH_KEY_IS_STRING:
if (!sapi_module.phpinfo_as_text) {
- elem_esc =
php_info_html_esc(string_key TSRMLS_CC);
- PUTS(elem_esc);
- efree(elem_esc);
+
php_info_html_esc_write(string_key, string_len TSRMLS_CC);
} else {
- PUTS(string_key);
+ PHPWRITE(string_key,
string_len);
}
break;
case HASH_KEY_IS_LONG:
@@ -167,12 +164,10 @@
if (Z_STRLEN(tmp2) == 0) {
PUTS("no value");
} else {
- elem_esc =
php_info_html_esc(Z_STRVAL(tmp2) TSRMLS_CC);
- PUTS(elem_esc);
- efree(elem_esc);
+
php_info_html_esc_write(Z_STRVAL(tmp2), Z_STRLEN(tmp2) TSRMLS_CC);
}
} else {
- PUTS(Z_STRVAL(tmp2));
+ PHPWRITE(Z_STRVAL(tmp2),
Z_STRLEN(tmp2));
}
zval_dtor(&tmp2);
} else {
@@ -180,12 +175,10 @@
if (Z_STRLEN_PP(tmp) == 0) {
PUTS("no value");
} else {
- elem_esc =
php_info_html_esc(Z_STRVAL_PP(tmp) TSRMLS_CC);
- PUTS(elem_esc);
- efree(elem_esc);
+
php_info_html_esc_write(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp) TSRMLS_CC);
}
} else {
- PUTS(Z_STRVAL_PP(tmp));
+ PHPWRITE(Z_STRVAL_PP(tmp),
Z_STRLEN_PP(tmp));
}
}
if (!sapi_module.phpinfo_as_text) {
@@ -209,6 +202,17 @@
}
/* }}} */
+/* {{{ php_info_html_esc_write
+ */
+PHPAPI void php_info_html_esc_write(char *string, int str_len TSRMLS_DC)
+{
+ int new_len;
+ char *ret = php_escape_html_entities(string, str_len, &new_len, 0,
ENT_QUOTES, NULL TSRMLS_CC);
+
+ PHPWRITE(ret, new_len);
+ efree(ret);
+}
+/* }}} */
/* {{{ php_info_html_esc
*/
http://cvs.php.net/viewvc.cgi/php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/zip php_zip.c
iliaa Fri Jul 28 13:59:06 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/zipphp_zip.c
Log:
Cleanup phpinfo() output
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1&r2=1.1.2.1&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1 php-src/ext/zip/php_zip.c:1.1.2.1
--- php-src/ext/zip/php_zip.c:1.1 Mon Jul 24 16:58:58 2006
+++ php-src/ext/zip/php_zip.c Fri Jul 28 13:59:06 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_zip.c,v 1.1 2006/07/24 16:58:58 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.1.2.1 2006/07/28 13:59:06 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1914,12 +1914,12 @@
PHP_MINFO_FUNCTION(zip)
{
php_info_print_table_start();
- {
- php_info_print_table_row(2, "Zip", "enabled");
- php_info_print_table_row(2, "$Id: php_zip.c,v 1.1 2006/07/24
16:58:58 pajoye Exp $", "enabled");
- php_info_print_table_row(2, "Zip version", "1.4.0");
- php_info_print_table_row(2, "Libzip version", "0.7.1");
- }
+
+ php_info_print_table_row(2, "Zip", "enabled");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.1 2006/07/28 13:59:06 iliaa Exp $");
+ php_info_print_table_row(2, "Zip version", "1.4.0");
+ php_info_print_table_row(2, "Libzip version", "0.7.1");
+
php_info_print_table_end();
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/filter filter.c
The raw data is left untouched. On 28-Jul-06, at 4:39 AM, Derick Rethans wrote: On Thu, 27 Jul 2006, Ilia Alshanetsky wrote: Well, that's great, but it should not prevent magic quotes from being applied. Until magic quotes is removed it should work, as the code was implemented before it did not, breaking all kinds of code. RAW is raw, not magic quotes. This means that if I request raw data with the *function* I need to get RAW data... and not escaped or fucked up data. Is that changed with this patch as well? regards, Derick -- 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_2) / NEWS /ext/standard string.c
tony2001Fri Jul 28 12:23:18 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/standard string.c
Log:
MFH: patch for #37846 (wordwrap() wraps incorrectly)
by Dmitry Kononov
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.159&r2=1.2027.2.547.2.160&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.159 php-src/NEWS:1.2027.2.547.2.160
--- php-src/NEWS:1.2027.2.547.2.159 Thu Jul 27 18:14:55 2006
+++ php-src/NEWSFri Jul 28 12:23:18 2006
@@ -36,6 +36,7 @@
names). (Ilia)
- Fixed bug #38047 ("file" and "line" sometimes not set in backtrace from
inside error handler). (Dmitry)
+- Fixed bug #37846 (wordwrap() wraps incorrectly). (ddk at krasn dot ru, Tony)
- Fixed bug #37564 (AES privacy encryption not possible due to net-snmp 5.2
compatibility issue). (Jani, patch by scott dot moynes+php at gmail dot com)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.8&r2=1.445.2.14.2.9&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.8
php-src/ext/standard/string.c:1.445.2.14.2.9
--- php-src/ext/standard/string.c:1.445.2.14.2.8Mon Jul 17 20:36:46 2006
+++ php-src/ext/standard/string.c Fri Jul 28 12:23:18 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.445.2.14.2.8 2006/07/17 20:36:46 mike Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.9 2006/07/28 12:23:18 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -669,7 +669,7 @@
lastspace = current;
} else if (current - laststart >= linelength &&
laststart != lastspace) {
newtext[lastspace] = breakchar[0];
- laststart = lastspace;
+ laststart = lastspace + 1;
}
}
--
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
tony2001Fri Jul 28 12:21:34 2006 UTC
Modified files:
/php-src/ext/standard string.c
Log:
patch for #37846 (wordwrap() wraps incorrectly)
by Dmitry Kononov
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.555&r2=1.556&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.555 php-src/ext/standard/string.c:1.556
--- php-src/ext/standard/string.c:1.555 Mon Jul 17 20:43:07 2006
+++ php-src/ext/standard/string.c Fri Jul 28 12:21:34 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: string.c,v 1.555 2006/07/17 20:43:07 mike Exp $ */
+/* $Id: string.c,v 1.556 2006/07/28 12:21:34 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -872,7 +872,7 @@
lastspace = current;
} else if (current - laststart >= linelength &&
laststart != lastspace) {
newtext[lastspace] = breakchar[0];
- laststart = lastspace;
+ laststart = lastspace + 1;
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/filter filter.c
On 7/28/06, Derick Rethans <[EMAIL PROTECTED]> wrote: On Thu, 27 Jul 2006, Ilia Alshanetsky wrote: > Well, that's great, but it should not prevent magic quotes from being applied. > Until magic quotes is removed it should work, as the code was implemented > before it did not, breaking all kinds of code. RAW is raw, not magic quotes. This means that if I request raw data with the *function* I need to get RAW data... and not escaped or fucked up data. Is that changed with this patch as well? I'm testing the change and will adapt accordingly. The idea here was to do not break BC in the current 5.2.x release or CVS (see #38208 for example). Cheers, --Pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/filter filter.c
On Thu, 27 Jul 2006, Ilia Alshanetsky wrote: > Well, that's great, but it should not prevent magic quotes from being applied. > Until magic quotes is removed it should work, as the code was implemented > before it did not, breaking all kinds of code. RAW is raw, not magic quotes. This means that if I request raw data with the *function* I need to get RAW data... and not escaped or fucked up data. Is that changed with this patch as well? regards, Derick -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/filter filter.c
pajoye Fri Jul 28 08:18:24 2006 UTC
Modified files:
/php-src/ext/filter filter.c
Log:
- HEAD does not suppot magic_gpc
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.61&r2=1.62&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.61 php-src/ext/filter/filter.c:1.62
--- php-src/ext/filter/filter.c:1.61Thu Jul 27 18:15:10 2006
+++ php-src/ext/filter/filter.c Fri Jul 28 08:18:24 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: filter.c,v 1.61 2006/07/27 18:15:10 iliaa Exp $ */
+/* $Id: filter.c,v 1.62 2006/07/28 08:18:24 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -274,7 +274,7 @@
{
php_info_print_table_start();
php_info_print_table_row( 2, "Input Validation and Filtering",
"enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision: 1.61 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.62 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -378,9 +378,13 @@
if (!(IF_G(default_filter) == FILTER_UNSAFE_RAW)) {
Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
php_zval_filter(&new_var, IF_G(default_filter),
IF_G(default_filter_flags), NULL, NULL/*charset*/ TSRMLS_CC);
- } else if (PG(magic_quotes_gpc)) {
+ }
+#if PHP_VERSION_ID<6
+ else if (PG(magic_quotes_gpc)) {
Z_STRVAL(new_var) = php_addslashes(*val,
Z_STRLEN(new_var), &Z_STRLEN(new_var), 0 TSRMLS_CC);
- } else {
+ }
+#endif
+ else {
Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
}
} else { /* empty string */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src /ext/filter filter.c
On 7/28/06, Dmitry Stogov <[EMAIL PROTECTED]> wrote: The patch breaks HEAD. I cannot compile PHP. It should be ifdef'ed. HEAD does not have magic quotes support. I will commit the change asap. --Pierre -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-CVS] cvs: php-src /ext/filter filter.c
The patch breaks HEAD. I cannot compile PHP.
Dmitry.
> -Original Message-
> From: Ilia Alshanetsky [mailto:[EMAIL PROTECTED]
> Sent: Thursday, July 27, 2006 10:15 PM
> To: php-cvs@lists.php.net
> Subject: [PHP-CVS] cvs: php-src /ext/filter filter.c
>
>
> iliaa Thu Jul 27 18:15:10 2006 UTC
>
> Modified files:
> /php-src/ext/filter filter.c
> Log:
> MFB: Fixed a bug in the filter extension that prevented
> magic_quotes_gpc
> from being applied when RAW filter is used.
>
>
> http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1
> .60&r2=1.61&diff_format=u
> Index: php-src/ext/filter/filter.c
> diff -u php-src/ext/filter/filter.c:1.60
> php-src/ext/filter/filter.c:1.61
> --- php-src/ext/filter/filter.c:1.60 Tue Jul 25 10:36:11 2006
> +++ php-src/ext/filter/filter.c Thu Jul 27 18:15:10 2006
> @@ -18,7 +18,7 @@
>
> +-
> -+
> */
>
> -/* $Id: filter.c,v 1.60 2006/07/25 10:36:11 tony2001 Exp $ */
> +/* $Id: filter.c,v 1.61 2006/07/27 18:15:10 iliaa Exp $ */
>
> #ifdef HAVE_CONFIG_H
> #include "config.h"
> @@ -274,7 +274,7 @@
> {
> php_info_print_table_start();
> php_info_print_table_row( 2, "Input Validation and
> Filtering", "enabled" );
> - php_info_print_table_row( 2, "Revision", "$Revision: 1.60 $");
> + php_info_print_table_row( 2, "Revision", "$Revision: 1.61 $");
> php_info_print_table_end();
>
> DISPLAY_INI_ENTRIES();
> @@ -368,17 +368,23 @@
> php_register_variable_ex(var, &raw_var,
> array_ptr TSRMLS_CC);
> }
>
> - /* Register mangled variable */
> - /* FIXME: Should not use php_register_variable_ex as
> that also registers
> - * globals when register_globals is turned on */
> - Z_STRLEN(new_var) = val_len;
> - Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
> - Z_TYPE(new_var) = IS_STRING;
> -
> if (val_len) {
> - if (! (IF_G(default_filter) == FILTER_UNSAFE_RAW)) {
> + /* Register mangled variable */
> + /* FIXME: Should not use
> php_register_variable_ex as that also registers
> + * globals when register_globals is turned on */
> + Z_STRLEN(new_var) = val_len;
> + Z_TYPE(new_var) = IS_STRING;
> +
> + if (!(IF_G(default_filter) == FILTER_UNSAFE_RAW)) {
> + Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
> php_zval_filter(&new_var,
> IF_G(default_filter), IF_G(default_filter_flags), NULL,
> NULL/*charset*/ TSRMLS_CC);
> + } else if (PG(magic_quotes_gpc)) {
> + Z_STRVAL(new_var) =
> php_addslashes(*val, Z_STRLEN(new_var), &Z_STRLEN(new_var), 0
> TSRMLS_CC);
> + } else {
> + Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
> }
> + } else { /* empty string */
> + ZVAL_EMPTY_STRING(&new_var);
> }
>
> if (orig_array_ptr) {
>
> --
> 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
