[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/bug60611.phpt branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/tests/bug60611.phpt trunk/Zend/zend_compile.c
laruence Wed, 28 Dec 2011 06:46:12 +
Revision: http://svn.php.net/viewvc?view=revision&revision=321458
Log:
Fix #60613 (Segmentation fault with $cls->{expr}() syntax)
#now the behavior is like 5.3, a COMPILER_ERROR will be triggered
Bug: https://bugs.php.net/60613 (Assigned) Segmentation fault with
$cls->{expr}() syntax
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/tests/bug60611.phpt
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U php/php-src/trunk/Zend/tests/bug60611.phpt
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_4/Zend/tests/bug60611.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/bug60611.phpt 2011-12-28
04:31:21 UTC (rev 321457)
+++ php/php-src/branches/PHP_5_4/Zend/tests/bug60611.phpt 2011-12-28
06:46:12 UTC (rev 321458)
@@ -9,12 +9,6 @@
}
}
-Cls::{0}();
-Cls::{1.0}();
-Cls::{true}();
-Cls::{false}();
-Cls::{null}();
-
$cls = new Cls;
$cls->{0}();
$cls->{1.0}();
@@ -22,7 +16,12 @@
$cls->{false}();
$cls->{null}();
-echo "done";
+Cls::{0}();
+Cls::{1.0}();
+Cls::{true}();
+Cls::{false}();
+Cls::{null}();
+
?>
---EXPECT--
-done
+--EXPECTF--
+Fatal error: Method name must be a string in %sbug60611.php on line %d
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-12-28 04:31:21 UTC
(rev 321457)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-12-28 06:46:12 UTC
(rev 321458)
@@ -1975,8 +1975,9 @@
zval name;
name = CONSTANT(last_op->op2.constant);
if (Z_TYPE(name) != IS_STRING) {
- convert_to_string(&name);
- } else if (!IS_INTERNED(Z_STRVAL(name))) {
+ zend_error(E_COMPILE_ERROR, "Method name must
be a string");
+ }
+ if (!IS_INTERNED(Z_STRVAL(name))) {
Z_STRVAL(name) = estrndup(Z_STRVAL(name),
Z_STRLEN(name));
}
FREE_POLYMORPHIC_CACHE_SLOT(last_op->op2.constant);
@@ -2369,8 +2370,8 @@
if (method_name->op_type == IS_CONST) {
char *lcname;
- if (Z_TYPE(method_name->u.constant) != IS_STRING) {
- convert_to_string(&method_name->u.constant);
+ if (Z_TYPE(method_name->u.constant) != IS_STRING) {
+ zend_error(E_COMPILE_ERROR, "Method name must be a
string");
}
lcname =
zend_str_tolower_dup(Z_STRVAL(method_name->u.constant),
Z_STRLEN(method_name->u.constant));
if ((sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) ==
Z_STRLEN(method_name->u.constant) &&
Modified: php/php-src/trunk/Zend/tests/bug60611.phpt
===
--- php/php-src/trunk/Zend/tests/bug60611.phpt 2011-12-28 04:31:21 UTC (rev
321457)
+++ php/php-src/trunk/Zend/tests/bug60611.phpt 2011-12-28 06:46:12 UTC (rev
321458)
@@ -9,12 +9,6 @@
}
}
-Cls::{0}();
-Cls::{1.0}();
-Cls::{true}();
-Cls::{false}();
-Cls::{null}();
-
$cls = new Cls;
$cls->{0}();
$cls->{1.0}();
@@ -22,7 +16,12 @@
$cls->{false}();
$cls->{null}();
-echo "done";
+Cls::{0}();
+Cls::{1.0}();
+Cls::{true}();
+Cls::{false}();
+Cls::{null}();
+
?>
---EXPECT--
-done
+--EXPECTF--
+Fatal error: Method name must be a string in %sbug60611.php on line %d
Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c 2011-12-28 04:31:21 UTC (rev
321457)
+++ php/php-src/trunk/Zend/zend_compile.c 2011-12-28 06:46:12 UTC (rev
321458)
@@ -1975,8 +1975,9 @@
zval name;
name = CONSTANT(last_op->op2.constant);
if (Z_TYPE(name) != IS_STRING) {
- convert_to_string(&name);
- } else if (!IS_INTERNED(Z_STRVAL(name))) {
+ zend_error(E_COMPILE_ERROR, "Method name must
be a string");
+ }
+ if (!IS_INTERNED(Z_STRVAL(name))) {
Z_STRVAL(name) = estrndup(Z_STRVAL(name),
Z_STRLEN(name));
}
FREE_POLYMORPHIC_CACHE_SLOT(last_op->op2.constant);
@@ -2369,8 +2370,8 @@
if (method_name->op_type == IS_CONST) {
char *lcname;
- if (Z_TYPE(method_name->u.constant) != IS_STRING) {
- convert_to_string(&method_name->u.constant);
+ if (Z_TYPE(method_name->u.constant) != IS_STRING) {
+ zend_error(E_COMPILE_ERR
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/date/tests/ DateTime_sub-fall-type2-type2.phpt
danielc Tue, 27 Dec 2011 15:20:16 + Revision: http://svn.php.net/viewvc?view=revision&revision=321437 Log: Another xfail resolved since Bug 55253 was fixed. Bug: https://bugs.php.net/55253 (Closed) DateTime::add() and sub() result -1 hour on objects with time zone type 2 Changed paths: U php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_sub-fall-type2-type2.phpt Modified: php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_sub-fall-type2-type2.phpt === --- php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_sub-fall-type2-type2.phpt 2011-12-27 14:29:32 UTC (rev 321436) +++ php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_sub-fall-type2-type2.phpt 2011-12-27 15:20:16 UTC (rev 321437) @@ -2,8 +2,6 @@ DateTime::sub() -- fall type2 type2 --CREDITS-- Daniel Convissor ---XFAIL-- -Various bugs exist --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/ext/date/tests/DateTime_diff-fall-type2-type2.phpt branches/PHP_5_3/ext/date/tests/DateTime_diff-spring-type2-type2.phpt branches/PHP_5_4/ext/date/tests/D
danielc Wed, 28 Dec 2011 01:13:12 + Revision: http://svn.php.net/viewvc?view=revision&revision=321456 Log: Resolve the last of the xfails from Bug 55253. Bug: https://bugs.php.net/55253 (Closed) DateTime::add() and sub() result -1 hour on objects with time zone type 2 Changed paths: U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-fall-type2-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-spring-type2-type2.phpt U php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff-fall-type2-type2.phpt U php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_diff-spring-type2-type2.phpt U php/php-src/trunk/ext/date/tests/DateTime_diff-fall-type2-type2.phpt U php/php-src/trunk/ext/date/tests/DateTime_diff-spring-type2-type2.phpt Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-fall-type2-type2.phpt === --- php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-fall-type2-type2.phpt 2011-12-27 23:44:03 UTC (rev 321455) +++ php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_diff-fall-type2-type2.phpt 2011-12-28 01:13:12 UTC (rev 321456) @@ -2,8 +2,6 @@ DateTime::diff() -- fall type2 type2 --CREDITS-- Daniel Convissor ---XFAIL-- -Various bugs exist --FILE-- ---XFAIL-- -Various bugs exist --FILE-- ---XFAIL-- -Various bugs exist --FILE-- ---XFAIL-- -Various bugs exist --FILE-- ---XFAIL-- -Various bugs exist --FILE-- ---XFAIL-- -Various bugs exist --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/acinclude.m4 trunk/acinclude.m4
On Tue, Dec 27, 2011 at 18:02, Nuno Lopes wrote: Uhm, I don't think this change makes much sense (nor does the previous behaviour on Mac).. Extensions that use C++ should pull in the required libraries themselves. We shouldn't be linking PHP everytime with libstdc++ if that is not needed. Then what is the idea behind PHP_REQUIRE_CXX? As I see it, it should pull in everything needed for the extension to use c++. Ah, sorry, I was fooled by your commit message.. I didn't noticed your change was in PHP_REQUIRE_CXX. Anyway, pulling libstdc++ is a bit too gcc centric. If I use, say, clang, then I may want to use libc++ instead. The right fix, I believe, is to change the link command to use $CXX instead of $CC, since the c++ compiler knows which libraries it needs. For example, it seems that PHP_SHARED_MODULE is doing the right thing. Nuno -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/acinclude.m4 trunk/acinclude.m4
On Tue, Dec 27, 2011 at 18:02, Nuno Lopes wrote: > Uhm, I don't think this change makes much sense (nor does the previous > behaviour on Mac).. > Extensions that use C++ should pull in the required libraries themselves. We > shouldn't be linking PHP everytime with libstdc++ if that is not needed. Then what is the idea behind PHP_REQUIRE_CXX? As I see it, it should pull in everything needed for the extension to use c++. -Hannes -- 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/date/tests/DateTime_sub-spring-type2-type2.phpt branches/PHP_5_4/ext/date/tests/DateTime_sub-spring-type2-type2.phpt trunk/ext/date/tests/DateTime_sub
danielc Tue, 27 Dec 2011 19:44:13 + Revision: http://svn.php.net/viewvc?view=revision&revision=321447 Log: Resolve more xfails due to Bug 55253 being fixed. Bug: https://bugs.php.net/55253 (Closed) DateTime::add() and sub() result -1 hour on objects with time zone type 2 Changed paths: U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-spring-type2-type2.phpt U php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_sub-spring-type2-type2.phpt U php/php-src/trunk/ext/date/tests/DateTime_sub-spring-type2-type2.phpt Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-spring-type2-type2.phpt === --- php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-spring-type2-type2.phpt 2011-12-27 19:32:56 UTC (rev 321446) +++ php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-spring-type2-type2.phpt 2011-12-27 19:44:13 UTC (rev 321447) @@ -2,8 +2,6 @@ DateTime::sub() -- spring type2 type2 --CREDITS-- Daniel Convissor ---XFAIL-- -Various bugs exist --FILE-- ---XFAIL-- -Various bugs exist --FILE-- ---XFAIL-- -Various bugs exist --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/acinclude.m4 trunk/acinclude.m4
Uhm, I don't think this change makes much sense (nor does the previous behaviour on Mac).. Extensions that use C++ should pull in the required libraries themselves. We shouldn't be linking PHP everytime with libstdc++ if that is not needed. Nuno - Original Message - bjoriTue, 27 Dec 2011 13:53:11 + Revision: http://svn.php.net/viewvc?view=revision&revision=321435 Log: Looks like we need to explicity add libstdc++ on recent linux' too, like fedora 14 and ubuntu 11 This fixes build failures for ext/intl and several pecl exts Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/acinclude.m4 U php/php-src/trunk/acinclude.m4 Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-12-27 11:05:58 UTC (rev 321434) +++ php/php-src/branches/PHP_5_4/NEWS 2011-12-27 13:53:11 UTC (rev 321435) @@ -7,6 +7,10 @@ - CLI SAPI: . Fixed bug #60591 (Memory leak when access a non-exists file). (Laruence) +- Intl: + . Fixed build on Fedora 15 / Ubuntu 11. (Hannes) + + 22 Dec 2011, PHP 5.4.0 RC4 - Core: . Added max_input_vars directive to prevent attacks based on hash collisions Modified: php/php-src/branches/PHP_5_4/acinclude.m4 === --- php/php-src/branches/PHP_5_4/acinclude.m4 2011-12-27 11:05:58 UTC (rev 321434) +++ php/php-src/branches/PHP_5_4/acinclude.m4 2011-12-27 13:53:11 UTC (rev 321435) @@ -762,11 +762,7 @@ if test -z "$php_cxx_done"; then AC_PROG_CXX AC_PROG_CXXCPP -case $host_alias in - *darwin*) -PHP_ADD_LIBRARY(stdc++) - ;; -esac +PHP_ADD_LIBRARY(stdc++) php_cxx_done=yes fi ]) Modified: php/php-src/trunk/acinclude.m4 === --- php/php-src/trunk/acinclude.m4 2011-12-27 11:05:58 UTC (rev 321434) +++ php/php-src/trunk/acinclude.m4 2011-12-27 13:53:11 UTC (rev 321435) @@ -762,11 +762,7 @@ if test -z "$php_cxx_done"; then AC_PROG_CXX AC_PROG_CXXCPP -case $host_alias in - *darwin*) -PHP_ADD_LIBRARY(stdc++) - ;; -esac +PHP_ADD_LIBRARY(stdc++) php_cxx_done=yes fi ]) -- 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/date/tests/DateTime_add-fall-type2-type2.phpt branches/PHP_5_3/ext/date/tests/DateTime_add-spring-type2-type2.phpt branches/PHP_5_3/ext/date/tests/Dat
danielc Tue, 27 Dec 2011 16:57:36 + Revision: http://svn.php.net/viewvc?view=revision&revision=321442 Log: Resolve some xfails due to Bug 55253 being fixed. (merged from 54) Bug: https://bugs.php.net/55253 (Closed) DateTime::add() and sub() result -1 hour on objects with time zone type 2 Changed paths: U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-fall-type2-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-spring-type2-type2.phpt U php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_sub-fall-type2-type2.phpt U php/php-src/trunk/ext/date/tests/DateTime_add-fall-type2-type2.phpt U php/php-src/trunk/ext/date/tests/DateTime_add-spring-type2-type2.phpt U php/php-src/trunk/ext/date/tests/DateTime_sub-fall-type2-type2.phpt Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-fall-type2-type2.phpt === --- php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-fall-type2-type2.phpt 2011-12-27 16:50:16 UTC (rev 321441) +++ php/php-src/branches/PHP_5_3/ext/date/tests/DateTime_add-fall-type2-type2.phpt 2011-12-27 16:57:36 UTC (rev 321442) @@ -2,8 +2,6 @@ DateTime::add() -- fall type2 type2 --CREDITS-- Daniel Convissor ---XFAIL-- -Various bugs exist --FILE-- ---XFAIL-- -Various bugs exist --FILE-- ---XFAIL-- -Various bugs exist --FILE-- ---XFAIL-- -Various bugs exist --FILE-- ---XFAIL-- -Various bugs exist --FILE-- ---XFAIL-- -Various bugs exist --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_4/ext/date/tests/ DateTime_add-spring-type2-type2.phpt
danielc Tue, 27 Dec 2011 16:50:16 + Revision: http://svn.php.net/viewvc?view=revision&revision=321441 Log: Another xfail resolved since Bug 55253 was fixed. Bug: https://bugs.php.net/55253 (Closed) DateTime::add() and sub() result -1 hour on objects with time zone type 2 Changed paths: U php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-spring-type2-type2.phpt Modified: php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-spring-type2-type2.phpt === --- php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-spring-type2-type2.phpt 2011-12-27 16:49:34 UTC (rev 321440) +++ php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-spring-type2-type2.phpt 2011-12-27 16:50:16 UTC (rev 321441) @@ -2,8 +2,6 @@ DateTime::add() -- spring type2 type2 --CREDITS-- Daniel Convissor ---XFAIL-- -Various bugs exist --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/ext/pdo_firebird/firebird_driver.c branches/PHP_5_4/ext/pdo_firebird/firebird_driver.c trunk/ext/pdo_firebird/firebird_driver.c
mariuz Tue, 27 Dec 2011 16:49:00 +
Revision: http://svn.php.net/viewvc?view=revision&revision=321439
Log:
http://gcov.php.net/viewer.php?version=PHP_5_3&func=tests&file=ext%2Fpdo_firebird%2Ftests%2Fbug_43130.phpt
fix failure for bug 43130
Bug: https://bugs.php.net/43130 (Wont fix) bind parameter cannot contain dashes
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c
U php/php-src/branches/PHP_5_4/ext/pdo_firebird/firebird_driver.c
U php/php-src/trunk/ext/pdo_firebird/firebird_driver.c
Modified: php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c
===
--- php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c
2011-12-27 16:38:23 UTC (rev 321438)
+++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c
2011-12-27 16:49:00 UTC (rev 321439)
@@ -440,8 +440,10 @@
continue;
}
} else {
- if ((in_param &= (sql[l] == '_') || (sql[l] >=
'A' && sql[l] <= 'Z')
- || (sql[l] >= 'a' && sql[l] <=
'z') || (sql[l] >= '0' && sql[l] <= '9'))) {
+if ((in_param &= ((sql[l] >= 'A' && sql[l] <=
'Z') || (sql[l] >= 'a' && sql[l] <= 'z')
+|| (sql[l] >= '0' && sql[l] <= '9') ||
sql[l] == '_' || sql[l] == '-'))) {
+
+
*ppname++ = sql[l];
continue;
} else {
Modified: php/php-src/branches/PHP_5_4/ext/pdo_firebird/firebird_driver.c
===
--- php/php-src/branches/PHP_5_4/ext/pdo_firebird/firebird_driver.c
2011-12-27 16:38:23 UTC (rev 321438)
+++ php/php-src/branches/PHP_5_4/ext/pdo_firebird/firebird_driver.c
2011-12-27 16:49:00 UTC (rev 321439)
@@ -440,8 +440,10 @@
continue;
}
} else {
- if ((in_param &= (sql[l] == '_') || (sql[l] >=
'A' && sql[l] <= 'Z')
- || (sql[l] >= 'a' && sql[l] <=
'z') || (sql[l] >= '0' && sql[l] <= '9'))) {
+if ((in_param &= ((sql[l] >= 'A' && sql[l] <=
'Z') || (sql[l] >= 'a' && sql[l] <= 'z')
+|| (sql[l] >= '0' && sql[l] <= '9') ||
sql[l] == '_' || sql[l] == '-'))) {
+
+
*ppname++ = sql[l];
continue;
} else {
Modified: php/php-src/trunk/ext/pdo_firebird/firebird_driver.c
===
--- php/php-src/trunk/ext/pdo_firebird/firebird_driver.c2011-12-27
16:38:23 UTC (rev 321438)
+++ php/php-src/trunk/ext/pdo_firebird/firebird_driver.c2011-12-27
16:49:00 UTC (rev 321439)
@@ -440,8 +440,10 @@
continue;
}
} else {
- if ((in_param &= (sql[l] == '_') || (sql[l] >=
'A' && sql[l] <= 'Z')
- || (sql[l] >= 'a' && sql[l] <=
'z') || (sql[l] >= '0' && sql[l] <= '9'))) {
+if ((in_param &= ((sql[l] >= 'A' && sql[l] <=
'Z') || (sql[l] >= 'a' && sql[l] <= 'z')
+|| (sql[l] >= '0' && sql[l] <= '9') ||
sql[l] == '_' || sql[l] == '-'))) {
+
+
*ppname++ = sql[l];
continue;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/date/tests/ DateTime_add-fall-type2-type2.phpt
On Tue, 27 Dec 2011, Daniel Convissor wrote: > > Why are you only changing this in the 5.4 branch? > > There are still more changes to be made and I'll merge them all to > trunk and 5.3. Please make those changes in *one* commit in the future. Right now there are inconsistencies between tests (again). cheers, Derick -- http://derickrethans.nl | http://xdebug.org Like Xdebug? Consider a donation: http://xdebug.org/donate.php twitter: @derickr and @xdebug -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/date/tests/ DateTime_add-fall-type2-type2.phpt
Hi Derick: > Why are you only changing this in the 5.4 branch? There are still more changes to be made and I'll merge them all to trunk and 5.3. Thanks, --Dan -- T H E A N A L Y S I S A N D S O L U T I O N S C O M P A N Y data intensive web and database programming http://www.AnalysisAndSolutions.com/ 4015 7th Ave #4, Brooklyn NY 11232 v: 718-854-0335 f: 718-854-0409 -- 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_4/NEWS branches/PHP_5_4/acinclude.m4 trunk/acinclude.m4
bjoriTue, 27 Dec 2011 13:53:11 + Revision: http://svn.php.net/viewvc?view=revision&revision=321435 Log: Looks like we need to explicity add libstdc++ on recent linux' too, like fedora 14 and ubuntu 11 This fixes build failures for ext/intl and several pecl exts Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/acinclude.m4 U php/php-src/trunk/acinclude.m4 Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-12-27 11:05:58 UTC (rev 321434) +++ php/php-src/branches/PHP_5_4/NEWS 2011-12-27 13:53:11 UTC (rev 321435) @@ -7,6 +7,10 @@ - CLI SAPI: . Fixed bug #60591 (Memory leak when access a non-exists file). (Laruence) +- Intl: + . Fixed build on Fedora 15 / Ubuntu 11. (Hannes) + + 22 Dec 2011, PHP 5.4.0 RC4 - Core: . Added max_input_vars directive to prevent attacks based on hash collisions Modified: php/php-src/branches/PHP_5_4/acinclude.m4 === --- php/php-src/branches/PHP_5_4/acinclude.m4 2011-12-27 11:05:58 UTC (rev 321434) +++ php/php-src/branches/PHP_5_4/acinclude.m4 2011-12-27 13:53:11 UTC (rev 321435) @@ -762,11 +762,7 @@ if test -z "$php_cxx_done"; then AC_PROG_CXX AC_PROG_CXXCPP -case $host_alias in - *darwin*) -PHP_ADD_LIBRARY(stdc++) - ;; -esac +PHP_ADD_LIBRARY(stdc++) php_cxx_done=yes fi ]) Modified: php/php-src/trunk/acinclude.m4 === --- php/php-src/trunk/acinclude.m4 2011-12-27 11:05:58 UTC (rev 321434) +++ php/php-src/trunk/acinclude.m4 2011-12-27 13:53:11 UTC (rev 321435) @@ -762,11 +762,7 @@ if test -z "$php_cxx_done"; then AC_PROG_CXX AC_PROG_CXXCPP -case $host_alias in - *darwin*) -PHP_ADD_LIBRARY(stdc++) - ;; -esac +PHP_ADD_LIBRARY(stdc++) php_cxx_done=yes fi ]) -- 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/ NEWS
mariuz Tue, 27 Dec 2011 11:05:58 +
Revision: http://svn.php.net/viewvc?view=revision&revision=321434
Log:
Forgot to add the Pdo Firebird related bug to the News
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-12-27 10:54:47 UTC (rev 321433)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-12-27 11:05:58 UTC (rev 321434)
@@ -15,6 +15,11 @@
. Fixed bug #60455 (stream_get_line misbehaves if EOF is not detected
together
with the last read). (Gustavo)
+- Pdo Firebird:
+ . Fixed bug #48877 ("bindValue" and "bindParam" do not work for PDO
Firebird).
+(Mariuz)
+
+
08 Dec 2011, PHP 5.3.9RC3
- Filter:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/pdo_firebird/ firebird_driver.c
On Tue, Dec 13, 2011 at 11:22 PM, Pierre Joye wrote: > do a sparse checkout and commit all branches at once from php-src, see > https://wiki.php.net/vcs/svnfaq :) > > 2011/12/13 marius adrian popa : >> 2011/12/13 Johannes Schlüter : >>> Hi. >>> >>> Is there a test? >> I will add one to the tree >>> >>> And btw. Usually we commit to all branches at once, which makes it >>> simpler to see if a patch is applied to all branches. >> I will try to do that in the future , any tip ? I have added the testcase , but no sparse yet Thanks i will try to commit my next svn patches using the sparse 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/pdo_firebird/tests/ bug_48877.phpt
mariuz Tue, 27 Dec 2011 10:54:47 +
Revision: http://svn.php.net/viewvc?view=revision&revision=321433
Log:
PDO_Firebird: bug 48877 test
Bug: https://bugs.php.net/48877 (Closed) "bindValue" and "bindParam" do not
work for PDO Firebird
Changed paths:
A php/php-src/trunk/ext/pdo_firebird/tests/bug_48877.phpt
Added: php/php-src/trunk/ext/pdo_firebird/tests/bug_48877.phpt
===
--- php/php-src/trunk/ext/pdo_firebird/tests/bug_48877.phpt
(rev 0)
+++ php/php-src/trunk/ext/pdo_firebird/tests/bug_48877.phpt 2011-12-27
10:54:47 UTC (rev 321433)
@@ -0,0 +1,42 @@
+--TEST--
+PDO_Firebird: bug 48877 test
+--SKIPIF--
+
+--FILE--
+exec('DROP TABLE testz');
+$dbh->exec('CREATE TABLE testz (A integer)');
+$dbh->exec("INSERT INTO testz VALUES ('1')");
+$dbh->exec("INSERT INTO testz VALUES ('2')");
+$dbh->exec("INSERT INTO testz VALUES ('3')");
+$dbh->commit();
+
+$query = "SELECT * FROM testz WHERE A = :paramno";
+
+$stmt = $dbh->prepare($query);
+$stmt->bindParam(':paramno', $value, PDO::PARAM_STR);
+$stmt->execute();
+$rows = $stmt->fetch();
+var_dump($stmt->fetch());
+var_dump($stmt->rowCount());
+
+
+$stmt = $dbh->prepare('DELETE FROM testz');
+$stmt->execute();
+
+$dbh->commit();
+
+$dbh->exec('DROP TABLE testz');
+
+unset($stmt);
+unset($dbh);
+
+?>
+--EXPECT--
+bool(false)
+int(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_4/ext/pdo_firebird/tests/ bug_48877.phpt
mariuz Tue, 27 Dec 2011 10:49:03 +
Revision: http://svn.php.net/viewvc?view=revision&revision=321432
Log:
added test for PDO_Firebird: bug 48877
Bug: https://bugs.php.net/48877 (Closed) "bindValue" and "bindParam" do not
work for PDO Firebird
Changed paths:
A php/php-src/branches/PHP_5_4/ext/pdo_firebird/tests/bug_48877.phpt
Added: php/php-src/branches/PHP_5_4/ext/pdo_firebird/tests/bug_48877.phpt
===
--- php/php-src/branches/PHP_5_4/ext/pdo_firebird/tests/bug_48877.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/ext/pdo_firebird/tests/bug_48877.phpt
2011-12-27 10:49:03 UTC (rev 321432)
@@ -0,0 +1,42 @@
+--TEST--
+PDO_Firebird: bug 48877 test
+--SKIPIF--
+
+--FILE--
+exec('DROP TABLE testz');
+$dbh->exec('CREATE TABLE testz (A integer)');
+$dbh->exec("INSERT INTO testz VALUES ('1')");
+$dbh->exec("INSERT INTO testz VALUES ('2')");
+$dbh->exec("INSERT INTO testz VALUES ('3')");
+$dbh->commit();
+
+$query = "SELECT * FROM testz WHERE A = :paramno";
+
+$stmt = $dbh->prepare($query);
+$stmt->bindParam(':paramno', $value, PDO::PARAM_STR);
+$stmt->execute();
+$rows = $stmt->fetch();
+var_dump($stmt->fetch());
+var_dump($stmt->rowCount());
+
+
+$stmt = $dbh->prepare('DELETE FROM testz');
+$stmt->execute();
+
+$dbh->commit();
+
+$dbh->exec('DROP TABLE testz');
+
+unset($stmt);
+unset($dbh);
+
+?>
+--EXPECT--
+bool(false)
+int(1)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/date/tests/ DateTime_add-fall-type2-type2.phpt
On Tue, 27 Dec 2011, Daniel Convissor wrote: > danielc Tue, 27 Dec 2011 02:13:55 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=321419 > > Log: > One less xfail since Bug 55253 was fixed. > > Bug: https://bugs.php.net/55253 (Closed) DateTime::add() and sub() result -1 > hour on objects with time zone type 2 > > Changed paths: > U > php/php-src/branches/PHP_5_4/ext/date/tests/DateTime_add-fall-type2-type2.phpt Why are you only changing this in the 5.4 branch? Derick -- http://derickrethans.nl | http://xdebug.org Like Xdebug? Consider a donation: http://xdebug.org/donate.php twitter: @derickr and @xdebug -- 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_4/NEWS branches/PHP_5_4/Zend/tests/bug60611.phpt branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/tests/bug60611.phpt trunk/Zend/zend_compile.c
laruence Tue, 27 Dec 2011 08:38:18 +
Revision: http://svn.php.net/viewvc?view=revision&revision=321429
Log:
Fix bug #60611 (Segmentation fault with Cls::{expr}() syntax)
Bug: https://bugs.php.net/60611 (Open) Segmentation fault with Cls::{expr}()
syntax
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
A php/php-src/branches/PHP_5_4/Zend/tests/bug60611.phpt
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
A php/php-src/trunk/Zend/tests/bug60611.phpt
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2011-12-27 06:24:33 UTC (rev 321428)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-12-27 08:38:18 UTC (rev 321429)
@@ -1,6 +1,9 @@
PHPNEWS
|||
?? Jan 2012, PHP 5.4.0 RC5
+- Core:
+ . Fixed bug #60611 (Segmentation fault with Cls::{expr}() syntax). (Laruence)
+
- CLI SAPI:
. Fixed bug #60591 (Memory leak when access a non-exists file). (Laruence)
Added: php/php-src/branches/PHP_5_4/Zend/tests/bug60611.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/bug60611.phpt
(rev 0)
+++ php/php-src/branches/PHP_5_4/Zend/tests/bug60611.phpt 2011-12-27
08:38:18 UTC (rev 321429)
@@ -0,0 +1,28 @@
+--TEST--
+Bug #60611 (Segmentation fault with Cls::{expr}() syntax)
+--FILE--
+{0}();
+$cls->{1.0}();
+$cls->{true}();
+$cls->{false}();
+$cls->{null}();
+
+echo "done";
+?>
+--EXPECT--
+done
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-12-27 06:24:33 UTC
(rev 321428)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c2011-12-27 08:38:18 UTC
(rev 321429)
@@ -1973,9 +1973,10 @@
if (last_op->opcode == ZEND_FETCH_OBJ_R) {
if (last_op->op2_type == IS_CONST) {
zval name;
-
name = CONSTANT(last_op->op2.constant);
- if (!IS_INTERNED(Z_STRVAL(name))) {
+ if (Z_TYPE(name) != IS_STRING) {
+ convert_to_string(&name);
+ } else if (!IS_INTERNED(Z_STRVAL(name))) {
Z_STRVAL(name) = estrndup(Z_STRVAL(name),
Z_STRLEN(name));
}
FREE_POLYMORPHIC_CACHE_SLOT(last_op->op2.constant);
@@ -2367,7 +2368,11 @@
zend_op *opline;
if (method_name->op_type == IS_CONST) {
- char *lcname =
zend_str_tolower_dup(Z_STRVAL(method_name->u.constant),
Z_STRLEN(method_name->u.constant));
+ char *lcname;
+ if (Z_TYPE(method_name->u.constant) != IS_STRING) {
+ convert_to_string(&method_name->u.constant);
+ }
+ lcname =
zend_str_tolower_dup(Z_STRVAL(method_name->u.constant),
Z_STRLEN(method_name->u.constant));
if ((sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) ==
Z_STRLEN(method_name->u.constant) &&
memcmp(lcname, ZEND_CONSTRUCTOR_FUNC_NAME,
sizeof(ZEND_CONSTRUCTOR_FUNC_NAME)-1) == 0) {
zval_dtor(&method_name->u.constant);
Added: php/php-src/trunk/Zend/tests/bug60611.phpt
===
--- php/php-src/trunk/Zend/tests/bug60611.phpt (rev 0)
+++ php/php-src/trunk/Zend/tests/bug60611.phpt 2011-12-27 08:38:18 UTC (rev
321429)
@@ -0,0 +1,28 @@
+--TEST--
+Bug #60611 (Segmentation fault with Cls::{expr}() syntax)
+--FILE--
+{0}();
+$cls->{1.0}();
+$cls->{true}();
+$cls->{false}();
+$cls->{null}();
+
+echo "done";
+?>
+--EXPECT--
+done
Modified: php/php-src/trunk/Zend/zend_compile.c
===
--- php/php-src/trunk/Zend/zend_compile.c 2011-12-27 06:24:33 UTC (rev
321428)
+++ php/php-src/trunk/Zend/zend_compile.c 2011-12-27 08:38:18 UTC (rev
321429)
@@ -1973,9 +1973,10 @@
if (last_op->opcode == ZEND_FETCH_OBJ_R) {
if (last_op->op2_type == IS_CONST) {
zval name;
-
name = CONSTANT(last_op->op2.constant);
- if (!IS_INTERNED(Z_STRVAL(name))) {
+ if (Z_TYPE(name) != IS_STRING) {
+ convert_to_string(&name);
+ } else if (!IS_INTERNED(Z_STRVAL(name))) {
Z_STRVAL(name) = estrndup(Z_STRVAL(name),
Z_STRLEN(name));
}
FREE_POLYMORPHIC_CACHE_SLOT(last_op->op2.constant);
@@
