[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Tue Dec 4 01:31:51 2007 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1205r2=1.1206diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1205 ZendEngine2/ChangeLog:1.1206 --- ZendEngine2/ChangeLog:1.1205Sat Nov 24 01:31:37 2007 +++ ZendEngine2/ChangeLog Tue Dec 4 01:31:51 2007 @@ -1,3 +1,18 @@ +2007-12-03 Dmitry Stogov [EMAIL PROTECTED] + +* zend_compile.c + zend_compile.c + tests/bug43332_1.phpt + tests/bug43332_2.phpt: + Fixed bug #43332 (self and parent as type hint in namespace) + +* tests/bug43332_1.phpt + tests/bug43332_1.phpt + tests/bug43332_2.phpt + tests/bug43332_2.phpt: + + file bug43332_1.phpt was initially added on branch PHP_5_3. + 2007-11-23 Dmitry Stogov [EMAIL PROTECTED] * zend.h @@ -20284,7 +20299,7 @@ 2003-06-10 Jani Taskinen [EMAIL PROTECTED] * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1205 2007/11/24 01:31:37 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1206 2007/12/04 01:31:51 changelog Exp $ tag 2003-06-10 James Cox [EMAIL PROTECTED] @@ -22008,7 +22023,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1205 2007/11/24 01:31:37 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1206 2007/12/04 01:31:51 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky [EMAIL PROTECTED]
[PHP-CVS] cvs: php-src(PHP_5_3) /sapi/cgi cgi_main.c
dmitry Mon Dec 3 09:38:12 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/sapi/cgi cgi_main.c
Log:
The -f option is fixed to work in the same way as in CLI sapi
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.50.2.9r2=1.267.2.15.2.50.2.10diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.9
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.10
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.50.2.9 Fri Nov 9 16:27:43 2007
+++ php-src/sapi/cgi/cgi_main.c Mon Dec 3 09:38:12 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.9 2007/11/09 16:27:43 jani Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.50.2.10 2007/12/03 09:38:12 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -1690,12 +1690,12 @@
}
script_file =
estrdup(php_optarg);
no_headers = 1;
- /* arguments after the
file are considered script args */
- SG(request_info).argc =
argc - (php_optind - 1);
- SG(request_info).argv =
argv[php_optind - 1];
break;
case 'i': /* php info quit */
+ if (script_file) {
+
efree(script_file);
+ }
if
(php_request_startup(TSRMLS_C) == FAILURE) {
SG(server_context) = NULL;
php_module_shutdown(TSRMLS_C);
@@ -1716,6 +1716,9 @@
break;
case 'm': /* list compiled in
modules */
+ if (script_file) {
+
efree(script_file);
+ }
php_output_startup();
php_output_activate(TSRMLS_C);
SG(headers_sent) = 1;
@@ -1739,6 +1742,9 @@
break;
case 'v': /* show php version
quit */
+ if (script_file) {
+
efree(script_file);
+ }
no_headers = 1;
if
(php_request_startup(TSRMLS_C) == FAILURE) {
SG(server_context) = NULL;
@@ -1775,6 +1781,18 @@
/* override path_translated if -f on
command line */
STR_FREE(SG(request_info).path_translated);
SG(request_info).path_translated =
script_file;
+ /* before registering argv to module
exchange the *new* argv[0] */
+ /* we can achieve this without
allocating more memory */
+ SG(request_info).argc = argc -
(php_optind - 1);
+ SG(request_info).argv =
argv[php_optind - 1];
+ SG(request_info).argv[0] = script_file;
+ } else if (argc php_optind) {
+ /* file is on command line, but not in
-f opt */
+
STR_FREE(SG(request_info).path_translated);
+ SG(request_info).path_translated =
estrdup(argv[php_optind++]);
+ /* arguments after the file are
considered script args */
+ SG(request_info).argc = argc -
php_optind;
+ SG(request_info).argv =
argv[php_optind];
}
if (no_headers) {
@@ -1782,14 +1800,6 @@
SG(request_info).no_headers = 1;
[PHP-CVS] cvs: php-src /sapi/cgi cgi_main.c
dmitry Mon Dec 3 09:38:25 2007 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c
Log:
The -f option is fixed to work in the same way as in CLI sapi
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.346r2=1.347diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.346 php-src/sapi/cgi/cgi_main.c:1.347
--- php-src/sapi/cgi/cgi_main.c:1.346 Fri Nov 9 16:02:50 2007
+++ php-src/sapi/cgi/cgi_main.c Mon Dec 3 09:38:25 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.346 2007/11/09 16:02:50 jani Exp $ */
+/* $Id: cgi_main.c,v 1.347 2007/12/03 09:38:25 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -1697,12 +1697,12 @@
}
script_file =
estrdup(php_optarg);
no_headers = 1;
- /* arguments after the
file are considered script args */
- SG(request_info).argc =
argc - (php_optind - 1);
- SG(request_info).argv =
argv[php_optind - 1];
break;
case 'i': /* php info quit */
+ if (script_file) {
+
efree(script_file);
+ }
if
(php_request_startup(TSRMLS_C) == FAILURE) {
SG(server_context) = NULL;
php_module_shutdown(TSRMLS_C);
@@ -1723,6 +1723,9 @@
break;
case 'm': /* list compiled in
modules */
+ if (script_file) {
+
efree(script_file);
+ }
SG(headers_sent) = 1;
php_printf([PHP
Modules]\n);
print_modules(TSRMLS_C);
@@ -1744,6 +1747,9 @@
break;
case 'v': /* show php version
quit */
+ if (script_file) {
+
efree(script_file);
+ }
no_headers = 1;
if
(php_request_startup(TSRMLS_C) == FAILURE) {
SG(server_context) = NULL;
@@ -1780,6 +1786,18 @@
/* override path_translated if -f on
command line */
STR_FREE(SG(request_info).path_translated);
SG(request_info).path_translated =
script_file;
+ /* before registering argv to module
exchange the *new* argv[0] */
+ /* we can achieve this without
allocating more memory */
+ SG(request_info).argc = argc -
(php_optind - 1);
+ SG(request_info).argv =
argv[php_optind - 1];
+ SG(request_info).argv[0] = script_file;
+ } else if (argc php_optind) {
+ /* file is on command line, but not in
-f opt */
+
STR_FREE(SG(request_info).path_translated);
+ SG(request_info).path_translated =
estrdup(argv[php_optind++]);
+ /* arguments after the file are
considered script args */
+ SG(request_info).argc = argc -
php_optind;
+ SG(request_info).argv =
argv[php_optind];
}
if (no_headers) {
@@ -1787,14 +1805,6 @@
SG(request_info).no_headers = 1;
}
- if (!SG(request_info).path_translated argc
php_optind) {
-
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array array_pad_basic.phpt array_pad_error.phpt array_pad_variation1.phpt array_pad_variation2.phpt array_pad_variation3.phpt array_pad_variation4.p
kraghubaMon Dec 3 11:53:04 2007 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array array_pad_basic.phpt array_pad_variation1.phpt array_pad_variation2.phpt array_pad_variation3.phpt array_pad_variation4.phpt array_pad_variation5.phpt array_pad_variation6.phpt array_pad_variation7.phpt array_pad_error.phpt Log: New testcases for array_pad() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_basic.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_basic.phpt +++ php-src/ext/standard/tests/array/array_pad_basic.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation1.phpt +++ php-src/ext/standard/tests/array/array_pad_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation2.phpt +++ php-src/ext/standard/tests/array/array_pad_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation3.phpt +++ php-src/ext/standard/tests/array/array_pad_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation4.phpt +++ php-src/ext/standard/tests/array/array_pad_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation5.phpt +++ php-src/ext/standard/tests/array/array_pad_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation6.phpt +++ php-src/ext/standard/tests/array/array_pad_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation7.phpt +++ php-src/ext/standard/tests/array/array_pad_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_error.phpt +++ php-src/ext/standard/tests/array/array_pad_error.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings vsprintf_variation1.phpt vsprintf_variation2.phpt
kraghubaMon Dec 3 12:02:29 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings vsprintf_variation1.phpt vsprintf_variation2.phpt Log: fix tests: better float values http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation1.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/strings/vsprintf_variation1.phpt diff -u php-src/ext/standard/tests/strings/vsprintf_variation1.phpt:1.1.4.2 php-src/ext/standard/tests/strings/vsprintf_variation1.phpt:1.1.4.3 --- php-src/ext/standard/tests/strings/vsprintf_variation1.phpt:1.1.4.2 Fri Oct 5 18:09:31 2007 +++ php-src/ext/standard/tests/strings/vsprintf_variation1.phpt Mon Dec 3 12:02:29 2007 @@ -45,8 +45,8 @@ // float data 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array data @@ -120,10 +120,10 @@ string(5) -10.5 -- Iteration 7 -- -string(12) 1050 +string(12) 101234567000 -- Iteration 8 -- -string(7) 1.06E-9 +string(13) 1.07654321E-9 -- Iteration 9 -- string(3) 0.5 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation2.phpt?r1=1.1.4.3r2=1.1.4.4diff_format=u Index: php-src/ext/standard/tests/strings/vsprintf_variation2.phpt diff -u php-src/ext/standard/tests/strings/vsprintf_variation2.phpt:1.1.4.3 php-src/ext/standard/tests/strings/vsprintf_variation2.phpt:1.1.4.4 --- php-src/ext/standard/tests/strings/vsprintf_variation2.phpt:1.1.4.3 Tue Oct 9 11:04:17 2007 +++ php-src/ext/standard/tests/strings/vsprintf_variation2.phpt Mon Dec 3 12:02:29 2007 @@ -45,8 +45,8 @@ // float data 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // null data @@ -115,10 +115,10 @@ string(5) -10.5 -- Iteration 7 -- -string(12) 1050 +string(12) 101234567000 -- Iteration 8 -- -string(7) 1.06E-9 +string(13) 1.07654321E-9 -- Iteration 9 -- string(3) 0.5 @@ -174,4 +174,4 @@ -- Iteration 23 -- string(%d) Resource id #%d -Done +Done \ No newline at end of file -- 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/strings vsprintf_variation1.phpt vsprintf_variation2.phpt
kraghubaMon Dec 3 12:04:26 2007 UTC Modified files: /php-src/ext/standard/tests/strings vsprintf_variation2.phpt vsprintf_variation1.phpt Log: fix tests: better float values http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation2.phpt?r1=1.3r2=1.4diff_format=u Index: php-src/ext/standard/tests/strings/vsprintf_variation2.phpt diff -u php-src/ext/standard/tests/strings/vsprintf_variation2.phpt:1.3 php-src/ext/standard/tests/strings/vsprintf_variation2.phpt:1.4 --- php-src/ext/standard/tests/strings/vsprintf_variation2.phpt:1.3 Tue Oct 9 11:51:48 2007 +++ php-src/ext/standard/tests/strings/vsprintf_variation2.phpt Mon Dec 3 12:04:26 2007 @@ -45,8 +45,8 @@ // float data 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // null data @@ -115,10 +115,10 @@ string(5) -10.5 -- Iteration 7 -- -string(12) 1050 +string(12) 101234567000 -- Iteration 8 -- -string(7) 1.06E-9 +string(13) 1.07654321E-9 -- Iteration 9 -- string(3) 0.5 @@ -175,7 +175,6 @@ -- Iteration 23 -- string(%d) Resource id #%d Done - --UEXPECTF-- *** Testing vsprintf() : with unexpected values for args argument *** @@ -198,10 +197,10 @@ unicode(5) -10.5 -- Iteration 7 -- -unicode(12) 1050 +unicode(12) 101234567000 -- Iteration 8 -- -unicode(7) 1.06E-9 +unicode(13) 1.07654321E-9 -- Iteration 9 -- unicode(3) 0.5 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation1.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/strings/vsprintf_variation1.phpt diff -u php-src/ext/standard/tests/strings/vsprintf_variation1.phpt:1.2 php-src/ext/standard/tests/strings/vsprintf_variation1.phpt:1.3 --- php-src/ext/standard/tests/strings/vsprintf_variation1.phpt:1.2 Fri Oct 5 18:12:35 2007 +++ php-src/ext/standard/tests/strings/vsprintf_variation1.phpt Mon Dec 3 12:04:26 2007 @@ -45,8 +45,8 @@ // float data 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array data @@ -120,10 +120,10 @@ string(5) -10.5 -- Iteration 7 -- -string(12) 1050 +string(12) 101234567000 -- Iteration 8 -- -string(7) 1.06E-9 +string(13) 1.07654321E-9 -- Iteration 9 -- string(3) 0.5 @@ -189,7 +189,6 @@ -- Iteration 26 -- string(%d) Resource id #%d Done - --UEXPECTF-- *** Testing vsprintf() : with unexpected values for format argument *** @@ -212,10 +211,10 @@ unicode(5) -10.5 -- Iteration 7 -- -unicode(12) 1050 +unicode(12) 101234567000 -- Iteration 8 -- -unicode(7) 1.06E-9 +unicode(13) 1.07654321E-9 -- Iteration 9 -- unicode(3) 0.5 -- 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/strings vsprintf_variation1.phpt vsprintf_variation2.phpt
kraghubaMon Dec 3 11:59:55 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings vsprintf_variation1.phpt vsprintf_variation2.phpt Log: fix tests: better float values http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/strings/vsprintf_variation1.phpt diff -u php-src/ext/standard/tests/strings/vsprintf_variation1.phpt:1.1.2.1 php-src/ext/standard/tests/strings/vsprintf_variation1.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/vsprintf_variation1.phpt:1.1.2.1 Fri Oct 5 18:07:27 2007 +++ php-src/ext/standard/tests/strings/vsprintf_variation1.phpt Mon Dec 3 11:59:55 2007 @@ -45,8 +45,8 @@ // float data 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array data @@ -120,10 +120,10 @@ string(5) -10.5 -- Iteration 7 -- -string(12) 1050 +string(12) 101234567000 -- Iteration 8 -- -string(7) 1.06E-9 +string(13) 1.07654321E-9 -- Iteration 9 -- string(3) 0.5 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/vsprintf_variation2.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/strings/vsprintf_variation2.phpt diff -u php-src/ext/standard/tests/strings/vsprintf_variation2.phpt:1.1.2.2 php-src/ext/standard/tests/strings/vsprintf_variation2.phpt:1.1.2.3 --- php-src/ext/standard/tests/strings/vsprintf_variation2.phpt:1.1.2.2 Tue Oct 9 10:56:45 2007 +++ php-src/ext/standard/tests/strings/vsprintf_variation2.phpt Mon Dec 3 11:59:55 2007 @@ -45,8 +45,8 @@ // float data 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // null data @@ -115,10 +115,10 @@ string(5) -10.5 -- Iteration 7 -- -string(12) 1050 +string(12) 101234567000 -- Iteration 8 -- -string(7) 1.06E-9 +string(13) 1.07654321E-9 -- Iteration 9 -- string(3) 0.5 @@ -174,4 +174,4 @@ -- Iteration 23 -- string(%d) Resource id #%d -Done +Done \ No newline at end of file -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/strings wordwrap_variation1.phpt wordwrap_variation3.phpt
kraghubaMon Dec 3 13:03:31 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/strings wordwrap_variation1.phpt wordwrap_variation3.phpt Log: fix tests : better float values http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/wordwrap_variation1.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/standard/tests/strings/wordwrap_variation1.phpt diff -u php-src/ext/standard/tests/strings/wordwrap_variation1.phpt:1.1.2.1 php-src/ext/standard/tests/strings/wordwrap_variation1.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/strings/wordwrap_variation1.phpt:1.1.2.1 Fri Sep 14 18:53:38 2007 +++ php-src/ext/standard/tests/strings/wordwrap_variation1.phpt Mon Dec 3 13:03:31 2007 @@ -36,8 +36,8 @@ // float values 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array values @@ -143,17 +143,17 @@ string(5) -10.5 string(13) -10br /\n.5 -- Iteration 7 -- -string(12) 1050 -string(12) 1050 -string(12) 1050 -string(12) 1050 -string(36) 105br /\n000br /\n000br /\n000 +string(12) 101234567000 +string(12) 101234567000 +string(12) 101234567000 +string(12) 101234567000 +string(36) 101br /\n234br /\n567br /\n000 -- Iteration 8 -- -string(7) 1.06E-9 -string(7) 1.06E-9 -string(7) 1.06E-9 -string(7) 1.06E-9 -string(23) 1.0br /\n6E-br /\n9 +string(13) 1.07654321E-9 +string(13) 1.07654321E-9 +string(13) 1.07654321E-9 +string(13) 1.07654321E-9 +string(45) 1.0br /\n765br /\n432br /\n1E-br /\n9 -- Iteration 9 -- string(3) 0.5 string(3) 0.5 @@ -332,4 +332,4 @@ string(0) string(0) string(0) -Done +Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/wordwrap_variation3.phpt?r1=1.1.2.1r2=1.1.2.1.2.1diff_format=u Index: php-src/ext/standard/tests/strings/wordwrap_variation3.phpt diff -u php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.1.2.1 php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.1.2.1.2.1 --- php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.1.2.1 Fri Sep 14 18:53:38 2007 +++ php-src/ext/standard/tests/strings/wordwrap_variation3.phpt Mon Dec 3 13:03:31 2007 @@ -37,8 +37,8 @@ // float values 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array values @@ -130,13 +130,13 @@ string(33) testing-10.5wordwrap-10.5function string(33) testing-10.5wordwrap-10.5function -- Iteration 7 -- -string(47) testing1050wordwrap1050function -string(47) testing1050wordwrap1050function -string(47) testing1050wordwrap1050function +string(47) testing101234567000wordwrap101234567000function +string(47) testing101234567000wordwrap101234567000function +string(47) testing101234567000wordwrap101234567000function -- Iteration 8 -- -string(37) testing1.06E-9wordwrap1.06E-9function -string(37) testing1.06E-9wordwrap1.06E-9function -string(37) testing1.06E-9wordwrap1.06E-9function +string(49) testing1.07654321E-9wordwrap1.07654321E-9function +string(49) testing1.07654321E-9wordwrap1.07654321E-9function +string(49) testing1.07654321E-9wordwrap1.07654321E-9function -- Iteration 9 -- string(29) testing0.5wordwrap0.5function string(29) testing0.5wordwrap0.5function -- 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/strings wordwrap_variation1.phpt wordwrap_variation3.phpt
kraghubaMon Dec 3 13:02:11 2007 UTC Modified files: /php-src/ext/standard/tests/strings wordwrap_variation1.phpt wordwrap_variation3.phpt Log: fix tests : better float values http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/wordwrap_variation1.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/strings/wordwrap_variation1.phpt diff -u php-src/ext/standard/tests/strings/wordwrap_variation1.phpt:1.2 php-src/ext/standard/tests/strings/wordwrap_variation1.phpt:1.3 --- php-src/ext/standard/tests/strings/wordwrap_variation1.phpt:1.2 Fri Sep 14 19:09:11 2007 +++ php-src/ext/standard/tests/strings/wordwrap_variation1.phpt Mon Dec 3 13:02:11 2007 @@ -36,8 +36,8 @@ // float values 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array values @@ -143,17 +143,17 @@ string(5) -10.5 string(13) -10br /\n.5 -- Iteration 7 -- -string(12) 1050 -string(12) 1050 -string(12) 1050 -string(12) 1050 -string(36) 105br /\n000br /\n000br /\n000 +string(12) 101234567000 +string(12) 101234567000 +string(12) 101234567000 +string(12) 101234567000 +string(36) 101br /\n234br /\n567br /\n000 -- Iteration 8 -- -string(7) 1.06E-9 -string(7) 1.06E-9 -string(7) 1.06E-9 -string(7) 1.06E-9 -string(23) 1.0br /\n6E-br /\n9 +string(13) 1.07654321E-9 +string(13) 1.07654321E-9 +string(13) 1.07654321E-9 +string(13) 1.07654321E-9 +string(45) 1.0br /\n765br /\n432br /\n1E-br /\n9 -- Iteration 9 -- string(3) 0.5 string(3) 0.5 @@ -333,3 +333,234 @@ string(0) string(0) Done +--UEXPECTF-- +*** Testing wordwrap() : usage variations *** + +--- Testing wordwrap() by supplying different values for 'str' argument --- +-- Iteration 1 -- +string(1) 0 +string(1) 0 +string(1) 0 +string(1) 0 +string(1) 0 +-- Iteration 2 -- +string(1) 1 +string(1) 1 +string(1) 1 +string(1) 1 +string(1) 1 +-- Iteration 3 -- +string(5) 12345 +string(5) 12345 +string(5) 12345 +string(5) 12345 +string(13) 123br /\n45 +-- Iteration 4 -- +string(5) -2345 +string(5) -2345 +string(5) -2345 +string(5) -2345 +string(13) -23br /\n45 +-- Iteration 5 -- +string(4) 10.5 +string(4) 10.5 +string(4) 10.5 +string(4) 10.5 +string(12) 10.br /\n5 +-- Iteration 6 -- +string(5) -10.5 +string(5) -10.5 +string(5) -10.5 +string(5) -10.5 +string(13) -10br /\n.5 +-- Iteration 7 -- +string(12) 101234567000 +string(12) 101234567000 +string(12) 101234567000 +string(12) 101234567000 +string(36) 101br /\n234br /\n567br /\n000 +-- Iteration 8 -- +string(13) 1.07654321E-9 +string(13) 1.07654321E-9 +string(13) 1.07654321E-9 +string(13) 1.07654321E-9 +string(45) 1.0br /\n765br /\n432br /\n1E-br /\n9 +-- Iteration 9 -- +string(3) 0.5 +string(3) 0.5 +string(3) 0.5 +string(3) 0.5 +string(3) 0.5 +-- Iteration 10 -- + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL +-- Iteration 11 -- + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL +-- Iteration 12 -- + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL +-- Iteration 13 -- + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL + +Warning: wordwrap() expects parameter 1 to be binary string, array given in %s on line %d +NULL +-- Iteration 14 -- + +Warning: wordwrap() expects parameter 1 to be binary
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard/tests/array array_pad_error.phpt array_pad_variation1.phpt array_pad_variation2.phpt array_pad_variation3.phpt array_pad_variation4.phpt array_pad_variati
kraghubaMon Dec 3 12:51:57 2007 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array array_pad_variation1.phpt array_pad_variation2.phpt array_pad_variation3.phpt array_pad_variation4.phpt array_pad_variation5.phpt array_pad_variation6.phpt array_pad_variation7.phpt array_pad_error.phpt Log: New testcases for array_pad() function http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation1.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation1.phpt +++ php-src/ext/standard/tests/array/array_pad_variation1.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation2.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation2.phpt +++ php-src/ext/standard/tests/array/array_pad_variation2.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation3.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation3.phpt +++ php-src/ext/standard/tests/array/array_pad_variation3.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation4.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation4.phpt +++ php-src/ext/standard/tests/array/array_pad_variation4.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation5.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation5.phpt +++ php-src/ext/standard/tests/array/array_pad_variation5.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation6.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation6.phpt +++ php-src/ext/standard/tests/array/array_pad_variation6.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_variation7.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_variation7.phpt +++ php-src/ext/standard/tests/array/array_pad_variation7.phpt http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/array_pad_error.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/array_pad_error.phpt +++ php-src/ext/standard/tests/array/array_pad_error.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings wordwrap_variation1.phpt wordwrap_variation3.phpt
kraghubaMon Dec 3 13:04:45 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings wordwrap_variation1.phpt wordwrap_variation3.phpt Log: fix tests : better float values http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/wordwrap_variation1.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/strings/wordwrap_variation1.phpt diff -u php-src/ext/standard/tests/strings/wordwrap_variation1.phpt:1.1.2.1 php-src/ext/standard/tests/strings/wordwrap_variation1.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/wordwrap_variation1.phpt:1.1.2.1 Fri Sep 14 18:53:38 2007 +++ php-src/ext/standard/tests/strings/wordwrap_variation1.phpt Mon Dec 3 13:04:45 2007 @@ -36,8 +36,8 @@ // float values 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array values @@ -143,17 +143,17 @@ string(5) -10.5 string(13) -10br /\n.5 -- Iteration 7 -- -string(12) 1050 -string(12) 1050 -string(12) 1050 -string(12) 1050 -string(36) 105br /\n000br /\n000br /\n000 +string(12) 101234567000 +string(12) 101234567000 +string(12) 101234567000 +string(12) 101234567000 +string(36) 101br /\n234br /\n567br /\n000 -- Iteration 8 -- -string(7) 1.06E-9 -string(7) 1.06E-9 -string(7) 1.06E-9 -string(7) 1.06E-9 -string(23) 1.0br /\n6E-br /\n9 +string(13) 1.07654321E-9 +string(13) 1.07654321E-9 +string(13) 1.07654321E-9 +string(13) 1.07654321E-9 +string(45) 1.0br /\n765br /\n432br /\n1E-br /\n9 -- Iteration 9 -- string(3) 0.5 string(3) 0.5 @@ -332,4 +332,4 @@ string(0) string(0) string(0) -Done +Done \ No newline at end of file http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/wordwrap_variation3.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/strings/wordwrap_variation3.phpt diff -u php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.1.2.1 php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.1.2.2 --- php-src/ext/standard/tests/strings/wordwrap_variation3.phpt:1.1.2.1 Fri Sep 14 18:53:38 2007 +++ php-src/ext/standard/tests/strings/wordwrap_variation3.phpt Mon Dec 3 13:04:45 2007 @@ -37,8 +37,8 @@ // float values 10.5, -10.5, - 10.5e10, - 10.6E-10, + 10.1234567e10, + 10.7654321E-10, .5, // array values @@ -130,13 +130,13 @@ string(33) testing-10.5wordwrap-10.5function string(33) testing-10.5wordwrap-10.5function -- Iteration 7 -- -string(47) testing1050wordwrap1050function -string(47) testing1050wordwrap1050function -string(47) testing1050wordwrap1050function +string(47) testing101234567000wordwrap101234567000function +string(47) testing101234567000wordwrap101234567000function +string(47) testing101234567000wordwrap101234567000function -- Iteration 8 -- -string(37) testing1.06E-9wordwrap1.06E-9function -string(37) testing1.06E-9wordwrap1.06E-9function -string(37) testing1.06E-9wordwrap1.06E-9function +string(49) testing1.07654321E-9wordwrap1.07654321E-9function +string(49) testing1.07654321E-9wordwrap1.07654321E-9function +string(49) testing1.07654321E-9wordwrap1.07654321E-9function -- Iteration 9 -- string(29) testing0.5wordwrap0.5function string(29) testing0.5wordwrap0.5function -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard array.c
iliaa Mon Dec 3 14:13:27 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c
Log:
MFB: Fixed bug #43482 (array_pad() does not warn on very small pad
numbers).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.9r2=1.308.2.21.2.37.2.10diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.9
php-src/ext/standard/array.c:1.308.2.21.2.37.2.10
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.9Sun Nov 25 15:56:07 2007
+++ php-src/ext/standard/array.cMon Dec 3 14:13:27 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.9 2007/11/25 15:56:07 iliaa Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.10 2007/12/03 14:13:27 iliaa Exp $ */
#include php.h
#include php_ini.h
@@ -2473,6 +2473,11 @@
/* Do some initial calculations */
input_size = zend_hash_num_elements(Z_ARRVAL_P(input));
pad_size_abs = abs(pad_size);
+ if (pad_size_abs 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, You may only pad
up to 1048576 elements at a time);
+ zval_dtor(return_value);
+ RETURN_FALSE;
+ }
do_pad = (input_size = pad_size_abs) ? 0 : 1;
/* Copy the original array */
--
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 array.c
iliaa Mon Dec 3 14:11:09 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard array.c
/php-srcNEWS
Log:
Fixed bug #43482 (array_pad() does not warn on very small pad numbers).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.43r2=1.308.2.21.2.44diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.43
php-src/ext/standard/array.c:1.308.2.21.2.44
--- php-src/ext/standard/array.c:1.308.2.21.2.43Sun Nov 25 15:56:47 2007
+++ php-src/ext/standard/array.cMon Dec 3 14:11:08 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.43 2007/11/25 15:56:47 iliaa Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.44 2007/12/03 14:11:08 iliaa Exp $ */
#include php.h
#include php_ini.h
@@ -2655,6 +2655,11 @@
/* Do some initial calculations */
input_size = zend_hash_num_elements(Z_ARRVAL_PP(input));
pad_size_abs = abs(Z_LVAL_PP(pad_size));
+ if (pad_size_abs 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, You may only pad
up to 1048576 elements at a time);
+ zval_dtor(return_value);
+ RETURN_FALSE;
+ }
do_pad = (input_size = pad_size_abs) ? 0 : 1;
/* Copy the original array */
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1022r2=1.2027.2.547.2.1023diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1022 php-src/NEWS:1.2027.2.547.2.1023
--- php-src/NEWS:1.2027.2.547.2.1022Sun Dec 2 21:00:06 2007
+++ php-src/NEWSMon Dec 3 14:11:09 2007
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2008, PHP 5.2.6
+- Fixed bug #43482 (array_pad() does not warn on very small pad numbers).
+ (Ilia)
- Fixed bug #43457 (Prepared statement with incorrect parms doens't
throw exception with pdo_pgsql driver). (Ilia)
- Fixed bug #43386 (array_globals not reset to 0 properly on init). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard array.c
iliaa Mon Dec 3 14:13:45 2007 UTC
Modified files:
/php-src/ext/standard array.c
Log:
MFB: Fixed bug #43482 (array_pad() does not warn on very small pad
numbers).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.430r2=1.431diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.430 php-src/ext/standard/array.c:1.431
--- php-src/ext/standard/array.c:1.430 Sun Nov 25 15:56:58 2007
+++ php-src/ext/standard/array.cMon Dec 3 14:13:45 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.430 2007/11/25 15:56:58 iliaa Exp $ */
+/* $Id: array.c,v 1.431 2007/12/03 14:13:45 iliaa Exp $ */
#include php.h
#include php_ini.h
@@ -2684,6 +2684,11 @@
/* Do some initial calculations */
input_size = zend_hash_num_elements(Z_ARRVAL_P(input));
pad_size_abs = abs(pad_size);
+ if (pad_size_abs 0) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, You may only pad
up to 1048576 elements at a time);
+ zval_dtor(return_value);
+ RETURN_FALSE;
+ }
do_pad = (input_size = pad_size_abs) ? 0 : 1;
/* Copy the original array */
--
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/date/lib timezonedb.h
derick Mon Dec 3 15:16:41 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/date/lib timezonedb.h
Log:
- Updated to version 2007.10
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timezonedb.h?r1=1.4.2.7.2.12r2=1.4.2.7.2.13diff_format=u
Index: php-src/ext/date/lib/timezonedb.h
diff -u php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.12
php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.13
--- php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.12 Mon Nov 5 10:36:50 2007
+++ php-src/ext/date/lib/timezonedb.h Mon Dec 3 15:16:40 2007
@@ -1,4 +1,4 @@
-const timelib_tzdb_index_entry timezonedb_idx_builtin[552] = {
+const timelib_tzdb_index_entry timezonedb_idx_builtin[554] = {
{ Africa/Abidjan, 0x00 },
{ Africa/Accra , 0x49 },
{ Africa/Addis_Ababa, 0xE5 },
@@ -143,417 +143,419 @@
{ America/Maceio, 0x00C67F },
{ America/Managua , 0x00C79D },
{ America/Manaus, 0x00C844 },
- { America/Martinique, 0x00C930 },
- { America/Mazatlan , 0x00C990 },
- { America/Mendoza , 0x00CBC9 },
- { America/Menominee , 0x00CD67 },
- { America/Merida, 0x00D095 },
- { America/Mexico_City , 0x00D2A4 },
- { America/Miquelon , 0x00D4F6 },
- { America/Moncton , 0x00D75C },
- { America/Monterrey , 0x00DBCA },
- { America/Montevideo, 0x00DDCD },
- { America/Montreal , 0x00E0D3 },
- { America/Montserrat, 0x00E5B7 },
- { America/Nassau, 0x00E600 },
- { America/New_York , 0x00E939 },
- { America/Nipigon , 0x00EE2C },
- { America/Nome , 0x00F126 },
- { America/Noronha , 0x00F47F },
- { America/North_Dakota/Center , 0x00F593 },
- { America/North_Dakota/New_Salem, 0x00F8F0 },
- { America/Panama, 0x00FC4D },
- { America/Pangnirtung , 0x00FC96 },
- { America/Paramaribo, 0x00FF9D },
- { America/Phoenix , 0x010023 },
- { America/Port-au-Prince, 0x0100A5 },
- { America/Port_of_Spain , 0x010297 },
- { America/Porto_Acre, 0x0101B5 },
- { America/Porto_Velho , 0x0102E0 },
- { America/Puerto_Rico , 0x0103C2 },
- { America/Rainy_River , 0x010421 },
- { America/Rankin_Inlet , 0x01071B },
- { America/Recife, 0x0109D7 },
- { America/Regina, 0x010AEB },
- { America/Resolute , 0x010C68 },
- { America/Rio_Branco, 0x010DEE },
- { America/Rosario , 0x010ED0 },
- { America/Santiago , 0x011056 },
- { America/Santo_Domingo , 0x0113E5 },
- { America/Sao_Paulo , 0x01149F },
- { America/Scoresbysund , 0x011770 },
- { America/Shiprock , 0x011A33 },
- { America/St_Johns , 0x011DA0 },
- { America/St_Kitts , 0x0122BF },
- { America/St_Lucia , 0x012308 },
- { America/St_Thomas , 0x012351 },
- { America/St_Vincent, 0x01239A },
- { America/Swift_Current , 0x0123E3 },
- { America/Tegucigalpa , 0x0124CA },
- { America/Thule , 0x01253D },
- { America/Thunder_Bay , 0x012768 },
- { America/Tijuana , 0x012A82 },
- { America/Toronto , 0x012DDF },
- { America/Tortola , 0x0132C3 },
- { America/Vancouver , 0x01330C },
- { America/Virgin, 0x013719 },
- { America/Whitehorse, 0x013762 },
- { America/Winnipeg , 0x013A59 },
- { America/Yakutat , 0x013E67 },
- { America/Yellowknife , 0x0141A3 },
- { Antarctica/Casey , 0x01447A },
- { Antarctica/Davis , 0x0144C3 },
- { Antarctica/DumontDUrville , 0x014517 },
- { Antarctica/Mawson , 0x014577 },
- { Antarctica/McMurdo, 0x0145C1 },
- { Antarctica/Palmer , 0x01489B },
- { Antarctica/Rothera, 0x014B8E },
- { Antarctica/South_Pole , 0x014BD8 },
- { Antarctica/Syowa , 0x014EB2 },
- {
[PHP-CVS] cvs: php-src /ext/date/lib timezonedb.h
derick Mon Dec 3 15:16:21 2007 UTC
Modified files:
/php-src/ext/date/lib timezonedb.h
Log:
- Updated to version 2007.10
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timezonedb.h?r1=1.22r2=1.23diff_format=u
Index: php-src/ext/date/lib/timezonedb.h
diff -u php-src/ext/date/lib/timezonedb.h:1.22
php-src/ext/date/lib/timezonedb.h:1.23
--- php-src/ext/date/lib/timezonedb.h:1.22 Mon Nov 5 09:24:17 2007
+++ php-src/ext/date/lib/timezonedb.h Mon Dec 3 15:16:21 2007
@@ -1,4 +1,4 @@
-const timelib_tzdb_index_entry timezonedb_idx_builtin[552] = {
+const timelib_tzdb_index_entry timezonedb_idx_builtin[554] = {
{ Africa/Abidjan, 0x00 },
{ Africa/Accra , 0x49 },
{ Africa/Addis_Ababa, 0xE5 },
@@ -143,417 +143,419 @@
{ America/Maceio, 0x00C67F },
{ America/Managua , 0x00C79D },
{ America/Manaus, 0x00C844 },
- { America/Martinique, 0x00C930 },
- { America/Mazatlan , 0x00C990 },
- { America/Mendoza , 0x00CBC9 },
- { America/Menominee , 0x00CD67 },
- { America/Merida, 0x00D095 },
- { America/Mexico_City , 0x00D2A4 },
- { America/Miquelon , 0x00D4F6 },
- { America/Moncton , 0x00D75C },
- { America/Monterrey , 0x00DBCA },
- { America/Montevideo, 0x00DDCD },
- { America/Montreal , 0x00E0D3 },
- { America/Montserrat, 0x00E5B7 },
- { America/Nassau, 0x00E600 },
- { America/New_York , 0x00E939 },
- { America/Nipigon , 0x00EE2C },
- { America/Nome , 0x00F126 },
- { America/Noronha , 0x00F47F },
- { America/North_Dakota/Center , 0x00F593 },
- { America/North_Dakota/New_Salem, 0x00F8F0 },
- { America/Panama, 0x00FC4D },
- { America/Pangnirtung , 0x00FC96 },
- { America/Paramaribo, 0x00FF9D },
- { America/Phoenix , 0x010023 },
- { America/Port-au-Prince, 0x0100A5 },
- { America/Port_of_Spain , 0x010297 },
- { America/Porto_Acre, 0x0101B5 },
- { America/Porto_Velho , 0x0102E0 },
- { America/Puerto_Rico , 0x0103C2 },
- { America/Rainy_River , 0x010421 },
- { America/Rankin_Inlet , 0x01071B },
- { America/Recife, 0x0109D7 },
- { America/Regina, 0x010AEB },
- { America/Resolute , 0x010C68 },
- { America/Rio_Branco, 0x010DEE },
- { America/Rosario , 0x010ED0 },
- { America/Santiago , 0x011056 },
- { America/Santo_Domingo , 0x0113E5 },
- { America/Sao_Paulo , 0x01149F },
- { America/Scoresbysund , 0x011770 },
- { America/Shiprock , 0x011A33 },
- { America/St_Johns , 0x011DA0 },
- { America/St_Kitts , 0x0122BF },
- { America/St_Lucia , 0x012308 },
- { America/St_Thomas , 0x012351 },
- { America/St_Vincent, 0x01239A },
- { America/Swift_Current , 0x0123E3 },
- { America/Tegucigalpa , 0x0124CA },
- { America/Thule , 0x01253D },
- { America/Thunder_Bay , 0x012768 },
- { America/Tijuana , 0x012A82 },
- { America/Toronto , 0x012DDF },
- { America/Tortola , 0x0132C3 },
- { America/Vancouver , 0x01330C },
- { America/Virgin, 0x013719 },
- { America/Whitehorse, 0x013762 },
- { America/Winnipeg , 0x013A59 },
- { America/Yakutat , 0x013E67 },
- { America/Yellowknife , 0x0141A3 },
- { Antarctica/Casey , 0x01447A },
- { Antarctica/Davis , 0x0144C3 },
- { Antarctica/DumontDUrville , 0x014517 },
- { Antarctica/Mawson , 0x014577 },
- { Antarctica/McMurdo, 0x0145C1 },
- { Antarctica/Palmer , 0x01489B },
- { Antarctica/Rothera, 0x014B8E },
- { Antarctica/South_Pole , 0x014BD8 },
- { Antarctica/Syowa , 0x014EB2 },
- { Antarctica/Vostok , 0x014EFC },
- {
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /sapi/cgi cgi_main.c
dmitry Mon Dec 3 15:08:02 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/sapi/cgi cgi_main.c
Log:
Fixed weired behavior in CGI parameter parsing
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1023r2=1.2027.2.547.2.1024diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1023 php-src/NEWS:1.2027.2.547.2.1024
--- php-src/NEWS:1.2027.2.547.2.1023Mon Dec 3 14:11:09 2007
+++ php-src/NEWSMon Dec 3 15:08:01 2007
@@ -1,6 +1,8 @@
PHPNEWS
|||
?? ??? 2008, PHP 5.2.6
+- Fixed weired behavior in CGI parameter parsing. (Dmitry, Hannes Magnusson)
+
- Fixed bug #43482 (array_pad() does not warn on very small pad numbers).
(Ilia)
- Fixed bug #43457 (Prepared statement with incorrect parms doens't
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.52r2=1.267.2.15.2.53diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.52
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.53
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.52 Thu Nov 1 15:23:14 2007
+++ php-src/sapi/cgi/cgi_main.c Mon Dec 3 15:08:01 2007
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.52 2007/11/01 15:23:14 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.53 2007/12/03 15:08:01 dmitry Exp $ */
#include php.h
#include php_globals.h
@@ -1661,12 +1661,12 @@
}
script_file =
estrdup(php_optarg);
no_headers = 1;
- /* arguments after the file are
considered script args */
- SG(request_info).argc = argc -
(php_optind - 1);
- SG(request_info).argv =
argv[php_optind - 1];
break;
case 'i': /* php info quit */
+ if (script_file) {
+ efree(script_file);
+ }
if
(php_request_startup(TSRMLS_C) == FAILURE) {
SG(server_context) =
NULL;
php_module_shutdown(TSRMLS_C);
@@ -1687,6 +1687,9 @@
break;
case 'm': /* list compiled in modules */
+ if (script_file) {
+ efree(script_file);
+ }
php_output_startup();
php_output_activate(TSRMLS_C);
SG(headers_sent) = 1;
@@ -1710,6 +1713,9 @@
break;
case 'v': /* show php version quit */
+ if (script_file) {
+ efree(script_file);
+ }
no_headers = 1;
if
(php_request_startup(TSRMLS_C) == FAILURE) {
SG(server_context) =
NULL;
@@ -1746,6 +1752,18 @@
/* override path_translated if -f on command
line */
STR_FREE(SG(request_info).path_translated);
SG(request_info).path_translated = script_file;
+ /* before registering argv to module exchange
the *new* argv[0] */
+ /* we can achieve this without allocating more
memory */
+ SG(request_info).argc = argc - (php_optind - 1);
+ SG(request_info).argv = argv[php_optind - 1];
+ SG(request_info).argv[0] = script_file;
+ } else if (argc php_optind) {
+ /* file is on command line, but not in -f opt */
+ STR_FREE(SG(request_info).path_translated);
+ SG(request_info).path_translated =
estrdup(argv[php_optind++]);
+ /* arguments after the file are considered
script args */
+ SG(request_info).argc = argc - php_optind;
+
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/lib timezonedb.h
derick Mon Dec 3 15:16:33 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/date/lib timezonedb.h
Log:
- Updated to version 2007.10
http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timezonedb.h?r1=1.4.2.7.2.10.2.2r2=1.4.2.7.2.10.2.3diff_format=u
Index: php-src/ext/date/lib/timezonedb.h
diff -u php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.10.2.2
php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.10.2.3
--- php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.10.2.2 Mon Nov 5 09:38:51 2007
+++ php-src/ext/date/lib/timezonedb.h Mon Dec 3 15:16:32 2007
@@ -1,4 +1,4 @@
-const timelib_tzdb_index_entry timezonedb_idx_builtin[552] = {
+const timelib_tzdb_index_entry timezonedb_idx_builtin[554] = {
{ Africa/Abidjan, 0x00 },
{ Africa/Accra , 0x49 },
{ Africa/Addis_Ababa, 0xE5 },
@@ -143,417 +143,419 @@
{ America/Maceio, 0x00C67F },
{ America/Managua , 0x00C79D },
{ America/Manaus, 0x00C844 },
- { America/Martinique, 0x00C930 },
- { America/Mazatlan , 0x00C990 },
- { America/Mendoza , 0x00CBC9 },
- { America/Menominee , 0x00CD67 },
- { America/Merida, 0x00D095 },
- { America/Mexico_City , 0x00D2A4 },
- { America/Miquelon , 0x00D4F6 },
- { America/Moncton , 0x00D75C },
- { America/Monterrey , 0x00DBCA },
- { America/Montevideo, 0x00DDCD },
- { America/Montreal , 0x00E0D3 },
- { America/Montserrat, 0x00E5B7 },
- { America/Nassau, 0x00E600 },
- { America/New_York , 0x00E939 },
- { America/Nipigon , 0x00EE2C },
- { America/Nome , 0x00F126 },
- { America/Noronha , 0x00F47F },
- { America/North_Dakota/Center , 0x00F593 },
- { America/North_Dakota/New_Salem, 0x00F8F0 },
- { America/Panama, 0x00FC4D },
- { America/Pangnirtung , 0x00FC96 },
- { America/Paramaribo, 0x00FF9D },
- { America/Phoenix , 0x010023 },
- { America/Port-au-Prince, 0x0100A5 },
- { America/Port_of_Spain , 0x010297 },
- { America/Porto_Acre, 0x0101B5 },
- { America/Porto_Velho , 0x0102E0 },
- { America/Puerto_Rico , 0x0103C2 },
- { America/Rainy_River , 0x010421 },
- { America/Rankin_Inlet , 0x01071B },
- { America/Recife, 0x0109D7 },
- { America/Regina, 0x010AEB },
- { America/Resolute , 0x010C68 },
- { America/Rio_Branco, 0x010DEE },
- { America/Rosario , 0x010ED0 },
- { America/Santiago , 0x011056 },
- { America/Santo_Domingo , 0x0113E5 },
- { America/Sao_Paulo , 0x01149F },
- { America/Scoresbysund , 0x011770 },
- { America/Shiprock , 0x011A33 },
- { America/St_Johns , 0x011DA0 },
- { America/St_Kitts , 0x0122BF },
- { America/St_Lucia , 0x012308 },
- { America/St_Thomas , 0x012351 },
- { America/St_Vincent, 0x01239A },
- { America/Swift_Current , 0x0123E3 },
- { America/Tegucigalpa , 0x0124CA },
- { America/Thule , 0x01253D },
- { America/Thunder_Bay , 0x012768 },
- { America/Tijuana , 0x012A82 },
- { America/Toronto , 0x012DDF },
- { America/Tortola , 0x0132C3 },
- { America/Vancouver , 0x01330C },
- { America/Virgin, 0x013719 },
- { America/Whitehorse, 0x013762 },
- { America/Winnipeg , 0x013A59 },
- { America/Yakutat , 0x013E67 },
- { America/Yellowknife , 0x0141A3 },
- { Antarctica/Casey , 0x01447A },
- { Antarctica/Davis , 0x0144C3 },
- { Antarctica/DumontDUrville , 0x014517 },
- { Antarctica/Mawson , 0x014577 },
- { Antarctica/McMurdo, 0x0145C1 },
- { Antarctica/Palmer , 0x01489B },
- { Antarctica/Rothera, 0x014B8E },
- { Antarctica/South_Pole , 0x014BD8 },
- { Antarctica/Syowa , 0x014EB2 },
-
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS /main SAPI.c
dmitry Mon Dec 3 16:04:27 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS /php-src/main SAPI.c Log: Fixed crash because of uninitialized SG(sapi_headers).mimetype http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1024r2=1.2027.2.547.2.1025diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1024 php-src/NEWS:1.2027.2.547.2.1025 --- php-src/NEWS:1.2027.2.547.2.1024Mon Dec 3 15:08:01 2007 +++ php-src/NEWSMon Dec 3 16:04:26 2007 @@ -1,6 +1,7 @@ PHPNEWS ||| ?? ??? 2008, PHP 5.2.6 +- Fixed crash because of uninitialized SG(sapi_headers).minetype (Dmitry) - Fixed weired behavior in CGI parameter parsing. (Dmitry, Hannes Magnusson) - Fixed bug #43482 (array_pad() does not warn on very small pad numbers). http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.c?r1=1.202.2.7.2.15r2=1.202.2.7.2.16diff_format=u Index: php-src/main/SAPI.c diff -u php-src/main/SAPI.c:1.202.2.7.2.15 php-src/main/SAPI.c:1.202.2.7.2.16 --- php-src/main/SAPI.c:1.202.2.7.2.15 Fri May 25 09:20:01 2007 +++ php-src/main/SAPI.c Mon Dec 3 16:04:26 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: SAPI.c,v 1.202.2.7.2.15 2007/05/25 09:20:01 rasmus Exp $ */ +/* $Id: SAPI.c,v 1.202.2.7.2.16 2007/12/03 16:04:26 dmitry Exp $ */ #include ctype.h #include sys/stat.h @@ -301,6 +301,7 @@ /* SG(sapi_headers).http_response_code = 200; */ SG(sapi_headers).http_status_line = NULL; + SG(sapi_headers).mimetype = NULL; SG(read_post_bytes) = 0; SG(request_info).post_data = NULL; SG(request_info).raw_post_data = NULL; @@ -340,6 +341,7 @@ SG(sapi_headers).http_response_code = 200; */ SG(sapi_headers).http_status_line = NULL; + SG(sapi_headers).mimetype = NULL; SG(headers_sent) = 0; SG(read_post_bytes) = 0; SG(request_info).post_data = NULL; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) /main SAPI.c
dmitry Mon Dec 3 16:04:37 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/main SAPI.c Log: Fixed crash because of uninitialized SG(sapi_headers).mimetype http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.c?r1=1.202.2.7.2.15r2=1.202.2.7.2.15.2.1diff_format=u Index: php-src/main/SAPI.c diff -u php-src/main/SAPI.c:1.202.2.7.2.15 php-src/main/SAPI.c:1.202.2.7.2.15.2.1 --- php-src/main/SAPI.c:1.202.2.7.2.15 Fri May 25 09:20:01 2007 +++ php-src/main/SAPI.c Mon Dec 3 16:04:36 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: SAPI.c,v 1.202.2.7.2.15 2007/05/25 09:20:01 rasmus Exp $ */ +/* $Id: SAPI.c,v 1.202.2.7.2.15.2.1 2007/12/03 16:04:36 dmitry Exp $ */ #include ctype.h #include sys/stat.h @@ -301,6 +301,7 @@ /* SG(sapi_headers).http_response_code = 200; */ SG(sapi_headers).http_status_line = NULL; + SG(sapi_headers).mimetype = NULL; SG(read_post_bytes) = 0; SG(request_info).post_data = NULL; SG(request_info).raw_post_data = NULL; @@ -340,6 +341,7 @@ SG(sapi_headers).http_response_code = 200; */ SG(sapi_headers).http_status_line = NULL; + SG(sapi_headers).mimetype = NULL; SG(headers_sent) = 0; SG(read_post_bytes) = 0; SG(request_info).post_data = NULL; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main SAPI.c
dmitry Mon Dec 3 16:04:47 2007 UTC Modified files: /php-src/main SAPI.c Log: Fixed crash because of uninitialized SG(sapi_headers).mimetype http://cvs.php.net/viewvc.cgi/php-src/main/SAPI.c?r1=1.226r2=1.227diff_format=u Index: php-src/main/SAPI.c diff -u php-src/main/SAPI.c:1.226 php-src/main/SAPI.c:1.227 --- php-src/main/SAPI.c:1.226 Mon Jul 16 12:58:23 2007 +++ php-src/main/SAPI.c Mon Dec 3 16:04:47 2007 @@ -18,7 +18,7 @@ +--+ */ -/* $Id: SAPI.c,v 1.226 2007/07/16 12:58:23 jani Exp $ */ +/* $Id: SAPI.c,v 1.227 2007/12/03 16:04:47 dmitry Exp $ */ #include ctype.h #include sys/stat.h @@ -324,6 +324,7 @@ /* SG(sapi_headers).http_response_code = 200; */ SG(sapi_headers).http_status_line = NULL; + SG(sapi_headers).mimetype = NULL; SG(read_post_bytes) = 0; SG(request_info).post_data = NULL; SG(request_info).raw_post_data = NULL; @@ -363,6 +364,7 @@ SG(sapi_headers).http_response_code = 200; */ SG(sapi_headers).http_status_line = NULL; + SG(sapi_headers).mimetype = NULL; SG(headers_sent) = 0; SG(read_post_bytes) = 0; SG(request_info).post_data = NULL; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS
tony2001Mon Dec 3 16:33:38 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: fix typos use the earliest bug report in the description http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1026r2=1.2027.2.547.2.1027diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1026 php-src/NEWS:1.2027.2.547.2.1027 --- php-src/NEWS:1.2027.2.547.2.1026Mon Dec 3 16:20:55 2007 +++ php-src/NEWSMon Dec 3 16:33:37 2007 @@ -5,10 +5,8 @@ - Fixed bug #43482 (array_pad() does not warn on very small pad numbers). (Ilia) -- Fixed bug #43476 (Fixed crash because of uninitialized - SG(sapi_headers).minetype). (Dmitry) -- Fixed bug #43457 (Prepared statement with incorrect parms doens't - throw exception with pdo_pgsql driver). (Ilia) +- Fixed bug #43457 (Prepared statement with incorrect parms doesn't throw + exception with pdo_pgsql driver). (Ilia) - Fixed bug #43386 (array_globals not reset to 0 properly on init). (Ilia) - Fixed bug #43377 (PHP crashes with invalid argument for DateTimeZone). (Ilia) - Fixed bug #43373 (pcntl_fork() should not raise E_ERROR on error). (Ilia) @@ -18,8 +16,8 @@ (Jani) - Fixed bug #43301 (mb_ereg*_replace() crashes when replacement string is invalid PHP expression and 'e' option is used). (Jani) -- Fixed bug #43295 (Fixed crash because of uninitialized - SG(sapi_headers).minetype). (Dmitry) +- Fixed bug #43295 (crash because of uninitialized SG(sapi_headers).mimetype). + (Dmitry) - Fixed bug #43293 (Multiple segfaults in getopt()). (Hannes) - Fixed bug #43279 (pg_send_query_params() converts all elements in 'params' to strings). (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
dmitry Mon Dec 3 16:20:56 2007 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: bug numbers http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1025r2=1.2027.2.547.2.1026diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1025 php-src/NEWS:1.2027.2.547.2.1026 --- php-src/NEWS:1.2027.2.547.2.1025Mon Dec 3 16:04:26 2007 +++ php-src/NEWSMon Dec 3 16:20:55 2007 @@ -1,11 +1,12 @@ PHPNEWS ||| ?? ??? 2008, PHP 5.2.6 -- Fixed crash because of uninitialized SG(sapi_headers).minetype (Dmitry) - Fixed weired behavior in CGI parameter parsing. (Dmitry, Hannes Magnusson) - Fixed bug #43482 (array_pad() does not warn on very small pad numbers). (Ilia) +- Fixed bug #43476 (Fixed crash because of uninitialized + SG(sapi_headers).minetype). (Dmitry) - Fixed bug #43457 (Prepared statement with incorrect parms doens't throw exception with pdo_pgsql driver). (Ilia) - Fixed bug #43386 (array_globals not reset to 0 properly on init). (Ilia) @@ -17,6 +18,8 @@ (Jani) - Fixed bug #43301 (mb_ereg*_replace() crashes when replacement string is invalid PHP expression and 'e' option is used). (Jani) +- Fixed bug #43295 (Fixed crash because of uninitialized + SG(sapi_headers).minetype). (Dmitry) - Fixed bug #43293 (Multiple segfaults in getopt()). (Hannes) - Fixed bug #43279 (pg_send_query_params() converts all elements in 'params' to strings). (Ilia) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
