[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/standard/http_fopen_wrapper.c branches/PHP_5_3/ext/standard/http_fopen_wrapper.c trunk/ext/standard/http_fopen_wrapper.c
tony2001 Tue, 04 Aug 2009 09:24:48 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286790
Log:
fix memleak and possible segfault in HTTP fopen wrapper
Changed paths:
U php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c
U php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
U php/php-src/trunk/ext/standard/http_fopen_wrapper.c
Modified: php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c
2009-08-04 06:07:46 UTC (rev 286789)
+++ php/php-src/branches/PHP_5_2/ext/standard/http_fopen_wrapper.c
2009-08-04 09:24:48 UTC (rev 286790)
@@ -347,7 +347,10 @@
}
smart_str_0(tmpstr);
/* Remove newlines and spaces from start and end.
there's at least one extra \r\n at the end that needs to go. */
- tmp = php_trim(tmpstr.c, strlen(tmpstr.c), NULL, 0,
NULL, 3 TSRMLS_CC);
+ if (tmpstr.c) {
+ tmp = php_trim(tmpstr.c, strlen(tmpstr.c),
NULL, 0, NULL, 3 TSRMLS_CC);
+ smart_str_free(tmpstr);
+ }
}
if (Z_TYPE_PP(tmpzval) == IS_STRING Z_STRLEN_PP(tmpzval)) {
/* Remove newlines and spaces from start and end
php_trim will estrndup() */
Modified: php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
2009-08-04 06:07:46 UTC (rev 286789)
+++ php/php-src/branches/PHP_5_3/ext/standard/http_fopen_wrapper.c
2009-08-04 09:24:48 UTC (rev 286790)
@@ -348,7 +348,10 @@
}
smart_str_0(tmpstr);
/* Remove newlines and spaces from start and end.
there's at least one extra \r\n at the end that needs to go. */
- tmp = php_trim(tmpstr.c, strlen(tmpstr.c), NULL, 0,
NULL, 3 TSRMLS_CC);
+ if (tmpstr.c) {
+ tmp = php_trim(tmpstr.c, strlen(tmpstr.c),
NULL, 0, NULL, 3 TSRMLS_CC);
+ smart_str_free(tmpstr);
+ }
}
if (Z_TYPE_PP(tmpzval) == IS_STRING Z_STRLEN_PP(tmpzval)) {
/* Remove newlines and spaces from start and end
php_trim will estrndup() */
Modified: php/php-src/trunk/ext/standard/http_fopen_wrapper.c
===
--- php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2009-08-04 06:07:46 UTC
(rev 286789)
+++ php/php-src/trunk/ext/standard/http_fopen_wrapper.c 2009-08-04 09:24:48 UTC
(rev 286790)
@@ -391,7 +391,10 @@
}
smart_str_0(tmpstr);
/* Remove newlines and spaces from start and end.
there's at least one extra \r\n at the end that needs to go. */
- tmp = php_trim(tmpstr.c, strlen(tmpstr.c), NULL, 0,
NULL, 3 TSRMLS_CC);
+ if (tmpstr.c) {
+ tmp = php_trim(tmpstr.c, strlen(tmpstr.c),
NULL, 0, NULL, 3 TSRMLS_CC);
+ smart_str_free(tmpstr);
+ }
}
if (Z_TYPE_PP(tmpzval) == IS_STRING Z_STRLEN_PP(tmpzval)) {
/* Remove newlines and spaces from start and end
php_trim will estrndup() */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/standard/tests/http/bug43510.phpt branches/PHP_5_3/ext/standard/tests/http/bug43510.phpt trunk/ext/standard/tests/http/bug43510.phpt
tony2001 Tue, 04 Aug 2009 09:27:15 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286791
Log:
cosmetic fix
Changed paths:
U php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug43510.phpt
U php/php-src/branches/PHP_5_3/ext/standard/tests/http/bug43510.phpt
U php/php-src/trunk/ext/standard/tests/http/bug43510.phpt
Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug43510.phpt
===
--- php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug43510.phpt
2009-08-04 09:24:48 UTC (rev 286790)
+++ php/php-src/branches/PHP_5_2/ext/standard/tests/http/bug43510.phpt
2009-08-04 09:27:15 UTC (rev 286791)
@@ -1,5 +1,5 @@
--TEST--
-Bug #43510: stream_get_meta_data() does not return same mode as used in fopen
+Bug #43510 (stream_get_meta_data() does not return same mode as used in fopen)
--SKIPIF--
?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?
--FILE--
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/http/bug43510.phpt
===
--- php/php-src/branches/PHP_5_3/ext/standard/tests/http/bug43510.phpt
2009-08-04 09:24:48 UTC (rev 286790)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/http/bug43510.phpt
2009-08-04 09:27:15 UTC (rev 286791)
@@ -1,5 +1,5 @@
--TEST--
-Bug #43510: stream_get_meta_data() does not return same mode as used in fopen
+Bug #43510 (stream_get_meta_data() does not return same mode as used in fopen)
--SKIPIF--
?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?
--FILE--
Modified: php/php-src/trunk/ext/standard/tests/http/bug43510.phpt
===
--- php/php-src/trunk/ext/standard/tests/http/bug43510.phpt 2009-08-04
09:24:48 UTC (rev 286790)
+++ php/php-src/trunk/ext/standard/tests/http/bug43510.phpt 2009-08-04
09:27:15 UTC (rev 286791)
@@ -1,5 +1,5 @@
--TEST--
-Bug #43510: stream_get_meta_data() does not return same mode as used in fopen
+Bug #43510 (stream_get_meta_data() does not return same mode as used in fopen)
--SKIPIF--
?php require 'server.inc'; http_server_skipif('tcp://127.0.0.1:12342'); ?
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/tests/security/ open_basedir_file.phpt
tony2001 Tue, 04 Aug 2009 10:22:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286793
Log:
fix test
Changed paths:
U php/php-src/trunk/tests/security/open_basedir_file.phpt
Modified: php/php-src/trunk/tests/security/open_basedir_file.phpt
===
--- php/php-src/trunk/tests/security/open_basedir_file.phpt 2009-08-04
10:19:03 UTC (rev 286792)
+++ php/php-src/trunk/tests/security/open_basedir_file.phpt 2009-08-04
10:22:18 UTC (rev 286793)
@@ -70,19 +70,19 @@
bool(false)
array(1) {
[0]=
- string(12) Hello World!
+ unicode(12) Hello World!
}
array(1) {
[0]=
- string(12) Hello World!
+ unicode(12) Hello World!
}
array(1) {
[0]=
- string(12) Hello World!
+ unicode(12) Hello World!
}
array(1) {
[0]=
- string(12) Hello World!
+ unicode(12) Hello World!
}
*** Finished testing open_basedir configuration [file] ***
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/Zend/ zend_ini_scanner.c
jani Tue, 04 Aug 2009 11:15:37 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286795
Log:
- Retouch without my path in the #line directives
Changed paths:
U php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c
Modified: php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c
===
--- php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c 2009-08-04 10:51:21 UTC (rev 286794)
+++ php/php-src/branches/PHP_5_3/Zend/zend_ini_scanner.c 2009-08-04 11:15:37 UTC (rev 286795)
@@ -1,5 +1,5 @@
-/* Generated by re2c 0.13.5 on Tue Aug 4 05:44:36 2009 */
-#line 1 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+/* Generated by re2c 0.13.5 on Tue Aug 4 14:09:33 2009 */
+#line 1 Zend/zend_ini_scanner.l
/*
+--+
| Zend Engine |
@@ -430,7 +430,7 @@
yy3:
YYDEBUG(3, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 389 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 389 Zend/zend_ini_scanner.l
{ /* Get option name */
RETURN_TOKEN(TC_LABEL, yytext, yyleng);
}
@@ -443,7 +443,7 @@
yy5:
YYDEBUG(5, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 474 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 474 Zend/zend_ini_scanner.l
{
/* eat whitespace */
goto restart;
@@ -455,7 +455,7 @@
yy7:
YYDEBUG(7, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 479 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 479 Zend/zend_ini_scanner.l
{
SCNG(lineno)++;
return END_OF_LINE;
@@ -471,7 +471,7 @@
++YYCURSOR;
YYDEBUG(10, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 429 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 429 Zend/zend_ini_scanner.l
{ /* Disallow these chars outside option values */
return yytext[0];
}
@@ -492,7 +492,7 @@
goto yy51;
YYDEBUG(14, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 502 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 502 Zend/zend_ini_scanner.l
{
return 0;
}
@@ -505,7 +505,7 @@
yy16:
YYDEBUG(16, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 393 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 393 Zend/zend_ini_scanner.l
{ /* Start option value */
if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
yy_push_state(ST_RAW TSRMLS_CC);
@@ -570,7 +570,7 @@
++YYCURSOR;
YYDEBUG(23, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 327 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 327 Zend/zend_ini_scanner.l
{ /* Section start */
/* Enter section data lookup state */
if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
@@ -610,7 +610,7 @@
}
YYDEBUG(29, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 352 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 352 Zend/zend_ini_scanner.l
{ /* Start of option with offset */
/* Eat trailing whitespace and [ */
EAT_TRAILING_WHITESPACE_EX('[');
@@ -661,7 +661,7 @@
yy31:
YYDEBUG(31, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 381 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 381 Zend/zend_ini_scanner.l
{ /* TRUE value (when used outside option value/offset this causes parse error!) */
RETURN_TOKEN(BOOL_TRUE, 1, 1);
}
@@ -731,7 +731,7 @@
yy38:
YYDEBUG(38, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 385 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 385 Zend/zend_ini_scanner.l
{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
RETURN_TOKEN(BOOL_FALSE, , 0);
}
@@ -850,7 +850,7 @@
yy53:
YYDEBUG(53, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 484 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 484 Zend/zend_ini_scanner.l
{ /* Comment */
BEGIN(INITIAL);
SCNG(lineno)++;
@@ -936,7 +936,7 @@
yy62:
YYDEBUG(62, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 490 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 490 Zend/zend_ini_scanner.l
{ /* #Comment */
zend_error(E_DEPRECATED, Comments starting with '#' are deprecated in %s on line %d, zend_ini_scanner_get_filename(TSRMLS_C), SCNG(lineno));
BEGIN(INITIAL);
@@ -1040,7 +1040,7 @@
yy71:
YYDEBUG(71, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 456 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 456 Zend/zend_ini_scanner.l
{ /* Escape double quoted string contents */
if(yyleng 1 yytext[yyleng-1] == '' yytext[yyleng-2] == '\\') {
yyless(yyleng-1);
@@ -1058,7 +1058,7 @@
yy73:
YYDEBUG(73, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 465 /home/jani/src/php-5.3/Zend/zend_ini_scanner.l
+#line 465 Zend/zend_ini_scanner.l
{ /* Double quoted '' string ends */
yy_pop_state(TSRMLS_C);
return '';
@@ -1078,7 +1078,7 @@
yy75:
YYDEBUG(75, *YYCURSOR);
yyleng = YYCURSOR - SCNG(yy_text);
-#line 502
[PHP-CVS] svn: /php/php-src/trunk/ext/gd/ gd.c
kalleTue, 04 Aug 2009 11:19:07 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286796
Log:
Revert and correct previous fix, this does not loose precision and convert back
to int
Changed paths:
U php/php-src/trunk/ext/gd/gd.c
Modified: php/php-src/trunk/ext/gd/gd.c
===
--- php/php-src/trunk/ext/gd/gd.c 2009-08-04 11:15:37 UTC (rev 286795)
+++ php/php-src/trunk/ext/gd/gd.c 2009-08-04 11:19:07 UTC (rev 286796)
@@ -3956,10 +3956,10 @@
bg_al = gdImageAlpha(bg_img, _bg);
for (i = 0; i aa_steps; i++) {
- rd = bg_rd + (int) (fg_rd - bg_rd) / aa_steps * (i + 1);
- gr = bg_gr + (int) (fg_gr - bg_gr) / aa_steps * (i + 1);
- bl = bg_bl + (int) (fg_bl - bg_bl) / aa_steps * (i + 1);
- al = bg_al + (int) (fg_al - bg_al) / aa_steps * (i + 1);
+ rd = (int) (bg_rd + (double) (fg_rd - bg_rd) / aa_steps * (i +
1));
+ gr = (int) (bg_gr + (double) (fg_gr - bg_gr) / aa_steps * (i +
1));
+ bl = (int) (bg_bl + (double) (fg_bl - bg_bl) / aa_steps * (i +
1));
+ al = (int) (bg_al + (double) (fg_al - bg_al) / aa_steps * (i +
1));
aa[i] = gdImageColorResolveAlpha(bg_img, rd, gr, bl, al);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/readline/config.m4 branches/PHP_5_3/NEWS branches/PHP_5_3/ext/readline/config.m4 trunk/ext/readline/config.m4
jani Tue, 04 Aug 2009 11:20:49 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286797 Log: - Fixed bug #48608 (Invalid libreadline version not detected during configure) Bug: http://bugs.php.net/48608 (Assigned) Invalid libreadline version not detected during configure Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/readline/config.m4 U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/readline/config.m4 U php/php-src/trunk/ext/readline/config.m4 Modified: php/php-src/branches/PHP_5_2/NEWS === --- php/php-src/branches/PHP_5_2/NEWS 2009-08-04 11:19:07 UTC (rev 286796) +++ php/php-src/branches/PHP_5_2/NEWS 2009-08-04 11:20:49 UTC (rev 286797) @@ -54,6 +54,8 @@ - Fixed bug #48629 (get_defined_constants() ignores categorize parameter). (Felipe) - Fixed bug #48619 (imap_search ALL segfaults). (Pierre) +- Fixed bug #48608 (Invalid libreadline version not detected during configure). + (Jani) - Fixed bug #48555 (ImageFTBBox() differs from previous versions for texts with new lines) (Takeshi Abe) - Fixed bug #48539 (pdo_dblib fails to connect, throws empty PDOException Modified: php/php-src/branches/PHP_5_2/ext/readline/config.m4 === --- php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-08-04 11:19:07 UTC (rev 286796) +++ php/php-src/branches/PHP_5_2/ext/readline/config.m4 2009-08-04 11:20:49 UTC (rev 286797) @@ -46,6 +46,13 @@ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) + PHP_CHECK_LIBRARY(readline, rl_pending_input, + [], [ +AC_MSG_ERROR([invalid readline installation detected. Try --with-libedit instead.]) + ], [ +-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS + ]) + PHP_CHECK_LIBRARY(readline, rl_callback_read_char, [ AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ]) Modified: php/php-src/branches/PHP_5_3/NEWS === --- php/php-src/branches/PHP_5_3/NEWS 2009-08-04 11:19:07 UTC (rev 286796) +++ php/php-src/branches/PHP_5_3/NEWS 2009-08-04 11:20:49 UTC (rev 286797) @@ -85,6 +85,8 @@ html-entities). (Moriyoshi) - Fixed bug #48637 (file fopen wrapper is overwritten when using --with-curlwrappers). (Jani) +- Fixed bug #48608 (Invalid libreadline version not detected during configure). + (Jani) - Fixed bug #48400 (imap crashes when closing stream opened with OP_PROTOTYPE flag). (Jani) - Fixed bug #48377 (error message unclear on converting phar with existing file). Modified: php/php-src/branches/PHP_5_3/ext/readline/config.m4 === --- php/php-src/branches/PHP_5_3/ext/readline/config.m4 2009-08-04 11:19:07 UTC (rev 286796) +++ php/php-src/branches/PHP_5_3/ext/readline/config.m4 2009-08-04 11:20:49 UTC (rev 286797) @@ -46,6 +46,13 @@ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) + PHP_CHECK_LIBRARY(readline, rl_pending_input, + [], [ +AC_MSG_ERROR([invalid readline installation detected. Try --with-libedit instead.]) + ], [ +-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS + ]) + PHP_CHECK_LIBRARY(readline, rl_callback_read_char, [ AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ]) Modified: php/php-src/trunk/ext/readline/config.m4 === --- php/php-src/trunk/ext/readline/config.m42009-08-04 11:19:07 UTC (rev 286796) +++ php/php-src/trunk/ext/readline/config.m42009-08-04 11:20:49 UTC (rev 286797) @@ -46,6 +46,13 @@ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS ]) + PHP_CHECK_LIBRARY(readline, rl_pending_input, + [], [ +AC_MSG_ERROR([invalid readline installation detected. Try --with-libedit instead.]) + ], [ +-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS + ]) + PHP_CHECK_LIBRARY(readline, rl_callback_read_char, [ AC_DEFINE(HAVE_RL_CALLBACK_READ_CHAR, 1, [ ]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/standard/tests/general_functions/bug48660.phpt branches/PHP_5_3/ext/standard/tests/general_functions/bug48660.phpt trunk/ext/standard/tests/general_fu
jani Tue, 04 Aug 2009 12:16:40 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286804
Log:
- Add test (yes, it fails still :)
Changed paths:
A
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/bug48660.phpt
A
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug48660.phpt
A php/php-src/trunk/ext/standard/tests/general_functions/bug48660.phpt
Added:
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/bug48660.phpt
===
---
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/bug48660.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_2/ext/standard/tests/general_functions/bug48660.phpt
2009-08-04 12:16:40 UTC (rev 286804)
@@ -0,0 +1,58 @@
+--TEST--
+Bug #48660 (parse_ini_*(): dollar sign as last character of value fails)
+--FILE--
+?php
+
+$ini_location = dirname(__FILE__) . '/bug48660.tmp';
+
+// Build ini data
+$ini_data = '
+[cases]
+
+Case.a = avalue
+Case.b = $dollar_sign
+Case.c = dollar_sign$
+Case.d = $dollar_sign$
+Case.e = 10
+';
+
+// Save ini data to file
+file_put_contents($ini_location, $ini_data);
+
+var_dump(parse_ini_file($ini_location, true));
+var_dump(parse_ini_file($ini_location, true));
+
+?
+--CLEAN--
+?php @unlink(dirname(__FILE__) . '/bug48660.tmp'); ?
+--EXPECTF--
+array(1) {
+ [cases]=
+ array(5) {
+[Case.a]=
+string(6) avalue
+[Case.b]=
+string(12) $dollar_sign
+[Case.c]=
+string(12) dollar_sign$
+[Case.d]=
+string(13) $dollar_sign$
+[Case.e]=
+string(2) 10
+ }
+}
+array(1) {
+ [cases]=
+ array(5) {
+[Case.a]=
+string(6) avalue
+[Case.b]=
+string(12) $dollar_sign
+[Case.c]=
+string(12) dollar_sign$
+[Case.d]=
+string(13) $dollar_sign$
+[Case.e]=
+string(2) 10
+ }
+}
Added:
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug48660.phpt
===
---
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug48660.phpt
(rev 0)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/bug48660.phpt
2009-08-04 12:16:40 UTC (rev 286804)
@@ -0,0 +1,58 @@
+--TEST--
+Bug #48660 (parse_ini_*(): dollar sign as last character of value fails)
+--FILE--
+?php
+
+$ini_location = dirname(__FILE__) . '/bug48660.tmp';
+
+// Build ini data
+$ini_data = '
+[cases]
+
+Case.a = avalue
+Case.b = $dollar_sign
+Case.c = dollar_sign$
+Case.d = $dollar_sign$
+Case.e = 10
+';
+
+// Save ini data to file
+file_put_contents($ini_location, $ini_data);
+
+var_dump(parse_ini_file($ini_location, true, INI_SCANNER_RAW));
+var_dump(parse_ini_file($ini_location, true, INI_SCANNER_NORMAL));
+
+?
+--CLEAN--
+?php @unlink(dirname(__FILE__) . '/bug48660.tmp'); ?
+--EXPECTF--
+array(1) {
+ [cases]=
+ array(5) {
+[Case.a]=
+string(6) avalue
+[Case.b]=
+string(12) $dollar_sign
+[Case.c]=
+string(12) dollar_sign$
+[Case.d]=
+string(13) $dollar_sign$
+[Case.e]=
+string(2) 10
+ }
+}
+array(1) {
+ [cases]=
+ array(5) {
+[Case.a]=
+string(6) avalue
+[Case.b]=
+string(12) $dollar_sign
+[Case.c]=
+string(12) dollar_sign$
+[Case.d]=
+string(13) $dollar_sign$
+[Case.e]=
+string(2) 10
+ }
+}
Added: php/php-src/trunk/ext/standard/tests/general_functions/bug48660.phpt
===
--- php/php-src/trunk/ext/standard/tests/general_functions/bug48660.phpt
(rev 0)
+++ php/php-src/trunk/ext/standard/tests/general_functions/bug48660.phpt
2009-08-04 12:16:40 UTC (rev 286804)
@@ -0,0 +1,58 @@
+--TEST--
+Bug #48660 (parse_ini_*(): dollar sign as last character of value fails)
+--FILE--
+?php
+
+$ini_location = dirname(__FILE__) . '/bug48660.tmp';
+
+// Build ini data
+$ini_data = '
+[cases]
+
+Case.a = avalue
+Case.b = $dollar_sign
+Case.c = dollar_sign$
+Case.d = $dollar_sign$
+Case.e = 10
+';
+
+// Save ini data to file
+file_put_contents($ini_location, $ini_data);
+
+var_dump(parse_ini_file($ini_location, true, INI_SCANNER_RAW));
+var_dump(parse_ini_file($ini_location, true, INI_SCANNER_NORMAL));
+
+?
+--CLEAN--
+?php @unlink(dirname(__FILE__) . '/bug48660.tmp'); ?
+--EXPECTF--
+array(1) {
+ [cases]=
+ array(5) {
+[Case.a]=
+string(6) avalue
+[Case.b]=
+string(12) $dollar_sign
+[Case.c]=
+string(12) dollar_sign$
+[Case.d]=
+string(13) $dollar_sign$
+[Case.e]=
+string(2) 10
+ }
+}
+array(1) {
+ [cases]=
+ array(5) {
+[Case.a]=
+string(6) avalue
+[Case.b]=
+string(12) $dollar_sign
+[Case.c]=
+string(12) dollar_sign$
+[Case.d]=
+string(13) $dollar_sign$
+[Case.e]=
+string(2) 10
+ }
+}
--
PHP CVS Mailing List (http://www.php.net/)
To
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ image.c
iliaaTue, 04 Aug 2009 14:34:44 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286806 Log: Added missing handling for ICO support Changed paths: U php/php-src/trunk/ext/standard/image.c Modified: php/php-src/trunk/ext/standard/image.c === --- php/php-src/trunk/ext/standard/image.c 2009-08-04 14:22:05 UTC (rev 286805) +++ php/php-src/trunk/ext/standard/image.c 2009-08-04 14:34:44 UTC (rev 286806) @@ -1409,6 +1409,9 @@ case IMAGE_FILETYPE_XBM: result = php_handle_xbm(stream TSRMLS_CC); break; + case IMAGE_FILETYPE_ICO: + result = php_handle_ico(stream TSRMLS_CC); + break; default: case IMAGE_FILETYPE_UNKNOWN: break; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/mysqli/ mysqli_api.c
jani Tue, 04 Aug 2009 14:49:33 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286807
Log:
- Revert bad fix for bug #49122 and only enable this when mysqlnd is used
Bug: http://bugs.php.net/49122 (Assigned) undefined reference to
mysqlnd_stmt_next_result on compile with --with-mysqli
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2009-08-04
14:34:44 UTC (rev 286806)
+++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c2009-08-04
14:49:33 UTC (rev 286807)
@@ -1483,8 +1483,7 @@
}
/* }}} */
-
-#ifdef HAVE_STMT_NEXT_RESULT
+#if defined(HAVE_STMT_NEXT_RESULT) defined(MYSQLI_USE_MYSQLND)
/* {{{ proto bool mysqli_stmt_next_result(object link)
check if there any more query results from a multi query */
PHP_FUNCTION(mysqli_stmt_more_results)
@@ -1497,7 +1496,7 @@
}
MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, mysql_stmt, mysqli_stmt,
MYSQLI_STATUS_VALID);
- RETURN_BOOL(mysql_stmt_more_results(stmt-stmt));
+ RETURN_BOOL(mysqlnd_stmt_more_results(stmt-stmt));
}
/* }}} */
@@ -1513,7 +1512,7 @@
}
MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, mysql_stmt, mysqli_stmt,
MYSQLI_STATUS_VALID);
- if (!mysql_stmt_more_results(stmt-stmt)) {
+ if (!mysqlnd_stmt_more_results(stmt-stmt)) {
php_error_docref(NULL TSRMLS_CC, E_STRICT, There is no next
result set.
Please, call
mysqli_stmt_more_results()/mysqli_stmt::more_results() to check
whether to call this
function/method);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/mysqli/ mysqli_api.c
jani Tue, 04 Aug 2009 14:51:29 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286808
Log:
Merge from PHP_5_3
Changed paths:
U php/php-src/trunk/ext/mysqli/mysqli_api.c
Modified: php/php-src/trunk/ext/mysqli/mysqli_api.c
===
--- php/php-src/trunk/ext/mysqli/mysqli_api.c 2009-08-04 14:49:33 UTC (rev
286807)
+++ php/php-src/trunk/ext/mysqli/mysqli_api.c 2009-08-04 14:51:29 UTC (rev
286808)
@@ -1537,7 +1537,7 @@
/* }}} */
-#ifdef HAVE_STMT_NEXT_RESULT
+#if defined(HAVE_STMT_NEXT_RESULT) defined(MYSQLI_USE_MYSQLND)
/* {{{ proto bool mysqli_stmt_next_result(object link)
check if there any more query results from a multi query */
PHP_FUNCTION(mysqli_stmt_more_results)
@@ -1550,7 +1550,7 @@
}
MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, mysql_stmt, mysqli_stmt,
MYSQLI_STATUS_VALID);
- RETURN_BOOL(mysql_stmt_more_results(stmt-stmt));
+ RETURN_BOOL(mysqlnd_stmt_more_results(stmt-stmt));
}
/* }}} */
@@ -1566,7 +1566,7 @@
}
MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, mysql_stmt, mysqli_stmt,
MYSQLI_STATUS_VALID);
- if (!mysql_stmt_more_results(stmt-stmt)) {
+ if (!mysqlnd_stmt_more_results(stmt-stmt)) {
php_error_docref(NULL TSRMLS_CC, E_STRICT, There is no next
result set.
Please, call
mysqli_stmt_more_results()/mysqli_stmt::more_results() to check
whether to call this
function/method);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/date/ php_date.c
kalleTue, 04 Aug 2009 21:11:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286816
Log:
Fix compiler warnings in ext/date
Changed paths:
U php/php-src/trunk/ext/date/php_date.c
Modified: php/php-src/trunk/ext/date/php_date.c
===
--- php/php-src/trunk/ext/date/php_date.c 2009-08-04 19:59:06 UTC (rev
286815)
+++ php/php-src/trunk/ext/date/php_date.c 2009-08-04 21:11:35 UTC (rev
286816)
@@ -3393,7 +3393,7 @@
{
zval*object, *element;
php_timezone_obj*tzobj;
- int i, begin = 0, found;
+ unsigned int i, begin = 0, found;
long timestamp_begin = LONG_MIN, timestamp_end =
LONG_MAX;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
O|ll, object, date_ce_timezone, timestamp_begin, timestamp_end) ==
FAILURE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/phpruntests/trunk/src/testcase/ rtPhpTest.php rtTestResults.php sections/configurationsections/rtDeflatePostSection.php sections/configurationsections/rtGzipPostSection.php section
zoe Tue, 04 Aug 2009 21:46:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286820
Log:
Change to the way POST section files are created
Changed paths:
U php/phpruntests/trunk/src/testcase/rtPhpTest.php
U php/phpruntests/trunk/src/testcase/rtTestResults.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtDeflatePostSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGzipPostSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostRawSection.php
U
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostSection.php
U php/phpruntests/trunk/src/testcase/sections/rtSection.php
Modified: php/phpruntests/trunk/src/testcase/rtPhpTest.php
===
--- php/phpruntests/trunk/src/testcase/rtPhpTest.php2009-08-04 21:43:16 UTC
(rev 286819)
+++ php/phpruntests/trunk/src/testcase/rtPhpTest.php2009-08-04 21:46:19 UTC
(rev 286820)
@@ -62,7 +62,7 @@
if($this-isFileSection($sectionKey)) {
$tempArray = $this-removeDone($tempArray);
}
-$testSection = rtSection::getInstance($sectionKey,
$tempArray);
+$testSection = rtSection::getInstance($sectionKey,
$tempArray, $this-testName);
$this-sections[$sectionKey] = $testSection;
break;
} else {
@@ -72,7 +72,7 @@
}
}
-$testSection = rtSection::getInstance($lastSection, $tempArray);
+$testSection = rtSection::getInstance($lastSection, $tempArray,
$this-testName);
$this-sections[$lastSection] = $testSection;
Modified: php/phpruntests/trunk/src/testcase/rtTestResults.php
===
--- php/phpruntests/trunk/src/testcase/rtTestResults.php2009-08-04
21:43:16 UTC (rev 286819)
+++ php/phpruntests/trunk/src/testcase/rtTestResults.php2009-08-04
21:46:19 UTC (rev 286820)
@@ -64,6 +64,13 @@
@unlink($this-testName . '.mem');
}
}
+
+//always delete temporary files used in POST sections
+if(file_exists($this-testName . '.post')) {
+@unlink($this-testName . '.post');
+}
+
+
}
/**
Modified:
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtDeflatePostSection.php
===
---
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtDeflatePostSection.php
2009-08-04 21:43:16 UTC (rev 286819)
+++
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtDeflatePostSection.php
2009-08-04 21:46:19 UTC (rev 286820)
@@ -26,7 +26,7 @@
$this-postVariables['CONTENT_LENGTH'] = strlen($compressedPostString);
$this-postVariables['REQUEST_METHOD'] = 'POST';
-$this-postFileName = tempnam(sys_get_temp_dir(), 'post');
+$this-postFileName = $this-testName . .post;
file_put_contents($this-postFileName, $compressedPostString);
}
Modified:
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGzipPostSection.php
===
---
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGzipPostSection.php
2009-08-04 21:43:16 UTC (rev 286819)
+++
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtGzipPostSection.php
2009-08-04 21:46:19 UTC (rev 286820)
@@ -26,7 +26,7 @@
$this-postVariables['CONTENT_LENGTH'] = strlen($gzipPostString);
$this-postVariables['REQUEST_METHOD'] = 'POST';
-$this-postFileName = tempnam(sys_get_temp_dir(), 'post');
+$this-postFileName = $this-testName . .post;
file_put_contents($this-postFileName, $gzipPostString);
}
Modified:
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostRawSection.php
===
---
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostRawSection.php
2009-08-04 21:43:16 UTC (rev 286819)
+++
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostRawSection.php
2009-08-04 21:46:19 UTC (rev 286820)
@@ -36,8 +36,8 @@
$this-postVariables['CONTENT_LENGTH'] = strlen($postString);
$this-postVariables['REQUEST_METHOD'] = 'POST';
-$this-postFileName = tempnam(sys_get_temp_dir(), 'post');
-
+$this-postFileName = $this-testName . .post;
+
file_put_contents($this-postFileName, $postString);
}
Modified:
php/phpruntests/trunk/src/testcase/sections/configurationsections/rtPostSection.php
===
[PHP-CVS] svn: /php/phpruntests/trunk/tests/testcase/ rtTestConfigurationTest.php rtTestDifferenceTest.php sections/configurationsections/rtArgsSectionTest.php sections/configurationsections/rtCookieS
zoe Tue, 04 Aug 2009 21:47:03 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286821
Log:
Change to the way POST section files are created
Changed paths:
U php/phpruntests/trunk/tests/testcase/rtTestConfigurationTest.php
U php/phpruntests/trunk/tests/testcase/rtTestDifferenceTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtArgsSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtCookieSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtDeflatePostSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtEnvSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtGetSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtGzipPostSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtIniSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostRawSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtPostSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/executablesections/rtCleanSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/executablesections/rtFileExternalSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/executablesections/rtFileSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/executablesections/rtSkipIfSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/informationsections/rtCreditsSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/informationsections/rtTestHeaderSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/informationsections/rtXfailSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectFSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectHeadersSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectRegexSectionTest.php
U
php/phpruntests/trunk/tests/testcase/sections/outputsections/rtExpectSectionTest.php
U php/phpruntests/trunk/tests/testcase/sections/rtSectionTest.php
Modified: php/phpruntests/trunk/tests/testcase/rtTestConfigurationTest.php
===
--- php/phpruntests/trunk/tests/testcase/rtTestConfigurationTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/rtTestConfigurationTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -11,10 +11,10 @@
{
$this-php = $this-php = trim(shell_exec(which php));
-$this-sections['ARGS'] = rtArgsSection::getInstance('ARGS', array('-vvv -a value - -2 -v'));
-$this-sections['ENV'] = rtEnvSection::getInstance('ENV', array('env1 = ENV1', 'env2=ENV2'));
-$this-sections['INI'] = rtIniSection::getInstance('INI', array('error_reporting=E_ALL | E_STRICT | E_DEPRECATED', 'assert.active = 1'));
-$this-sections['FILE'] = rtFileSection::getInstance('FILE', array('blah'));
+$this-sections['ARGS'] = rtArgsSection::getInstance('ARGS', array('-vvv -a value - -2 -v'), 'testname');
+$this-sections['ENV'] = rtEnvSection::getInstance('ENV', array('env1 = ENV1', 'env2=ENV2'), 'testname');
+$this-sections['INI'] = rtIniSection::getInstance('INI', array('error_reporting=E_ALL | E_STRICT | E_DEPRECATED', 'assert.active = 1'), 'testname');
+$this-sections['FILE'] = rtFileSection::getInstance('FILE', array('blah'), 'testname');
}
Modified: php/phpruntests/trunk/tests/testcase/rtTestDifferenceTest.php
===
--- php/phpruntests/trunk/tests/testcase/rtTestDifferenceTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/rtTestDifferenceTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public function testTestDifference()
{
-$expectSection = rtExpectSection::getInstance('EXPECT', array('Hello World'));
+$expectSection = rtExpectSection::getInstance('EXPECT', array('Hello World'), 'testname');
$testDifference = new rtTestDifference($expectSection, 'Hello Dolly');
$difference = $testDifference-getDifference();
Modified: php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtArgsSectionTest.php
===
--- php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtArgsSectionTest.php 2009-08-04 21:46:19 UTC (rev 286820)
+++ php/phpruntests/trunk/tests/testcase/sections/configurationsections/rtArgsSectionTest.php 2009-08-04 21:47:03 UTC (rev 286821)
@@ -7,7 +7,7 @@
{
public
[PHP-CVS] svn: /php/php-src/branches/ PHP_5_2/ext/standard/tests/strings/chunk_split_variation2.phpt PHP_5_3/ext/standard/tests/strings/chunk_split_variation2.phpt
wharmby Tue, 04 Aug 2009 23:16:25 + Revision: http://svn.php.net/viewvc?view=revisionrevision=286822 Log: Fix tests Changed paths: U php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation2.phpt U php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation2.phpt Modified: php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation2.phpt === --- php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation2.phpt 2009-08-04 21:47:03 UTC (rev 286821) +++ php/php-src/branches/PHP_5_2/ext/standard/tests/strings/chunk_split_variation2.phpt 2009-08-04 23:16:25 UTC (rev 286822) @@ -83,12 +83,11 @@ var_dump( chunk_split($str, $values[$count], $ending) ); } -echo Done; - //closing resource fclose($fp); ? +===DONE=== --EXPECTF-- *** Testing chunk_split() : with unexpected values for 'chunklen' argument *** -- Iteration 1 -- @@ -170,5 +169,5 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 24 -- -string(30) This *is ch*uklen* vari*ation* -Done +string(%d) %s +===DONE=== Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation2.phpt === --- php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation2.phpt 2009-08-04 21:47:03 UTC (rev 286821) +++ php/php-src/branches/PHP_5_3/ext/standard/tests/strings/chunk_split_variation2.phpt 2009-08-04 23:16:25 UTC (rev 286822) @@ -83,12 +83,11 @@ var_dump( chunk_split($str, $values[$count], $ending) ); } -echo Done; - //closing resource fclose($fp); ? +===DONE=== --EXPECTF-- *** Testing chunk_split() : with unexpected values for 'chunklen' argument *** -- Iteration 1 -- @@ -170,5 +169,5 @@ Warning: chunk_split(): Chunk length should be greater than zero in %schunk_split_variation2.php on line %d bool(false) -- Iteration 24 -- -string(30) This *is ch*uklen* vari*ation* -Done +string(%d) %s +===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/trunk/ext/date/ php_date.c
On Tue, 4 Aug 2009, Kalle Sommer Nielsen wrote:
kalleTue, 04 Aug 2009 21:11:35 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=286816
Log:
Fix compiler warnings in ext/date
Please do keep all branches up to date.
regards,
Derick
Changed paths:
U php/php-src/trunk/ext/date/php_date.c
Modified: php/php-src/trunk/ext/date/php_date.c
===
--- php/php-src/trunk/ext/date/php_date.c 2009-08-04 19:59:06 UTC (rev
286815)
+++ php/php-src/trunk/ext/date/php_date.c 2009-08-04 21:11:35 UTC (rev
286816)
@@ -3393,7 +3393,7 @@
{
zval*object, *element;
php_timezone_obj*tzobj;
- int i, begin = 0, found;
+ unsigned int i, begin = 0, found;
long timestamp_begin = LONG_MIN, timestamp_end =
LONG_MAX;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
O|ll, object, date_ce_timezone, timestamp_begin, timestamp_end) ==
FAILURE) {
--
http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org
twitter: @derickr
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
