[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog
changelog Mon May 11 01:33:02 2009 UTC Modified files: /ZendEngine2ChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1480r2=1.1481diff_format=u Index: ZendEngine2/ChangeLog diff -u ZendEngine2/ChangeLog:1.1480 ZendEngine2/ChangeLog:1.1481 --- ZendEngine2/ChangeLog:1.1480Sat May 9 01:33:06 2009 +++ ZendEngine2/ChangeLog Mon May 11 01:33:02 2009 @@ -1,3 +1,16 @@ +2009-05-10 Jani Taskinen jani.taski...@sci.fi + +* (PHP_5_3) + zend_operators.c + zend_operators.h: + sync with HEAD + +* zend_operators.h: + ws + +* zend_operators.h: + MFB: missing part of the GC stuff + 2009-05-08 Matt Wilmas php_li...@realplain.com * (PHP_5_2) @@ -28583,7 +28596,7 @@ 2003-06-10 Jani Taskinen sni...@iki.fi * zend_multiply.h: - - Missing $Id: ChangeLog,v 1.1480 2009/05/09 01:33:06 changelog Exp $ tag + - Missing $Id: ChangeLog,v 1.1481 2009/05/11 01:33:02 changelog Exp $ tag 2003-06-10 James Cox ja...@imajes.info @@ -30307,7 +30320,7 @@ zend_types.h zend_variables.c zend_variables.h: - - Added some missing CVS $Id: ChangeLog,v 1.1480 2009/05/09 01:33:06 changelog Exp $ tags, headers and footers. + - Added some missing CVS $Id: ChangeLog,v 1.1481 2009/05/11 01:33:02 changelog Exp $ tags, headers and footers. 2003-01-30 Ilia Alshanetsky i...@prohost.org
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/idn idn.c
bjori Sun May 10 13:26:39 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/idn idn.c
Log:
fix proto
# Why doesn't this exist in HEAD?
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/idn/idn.c?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/intl/idn/idn.c
diff -u php-src/ext/intl/idn/idn.c:1.1.2.1 php-src/ext/intl/idn/idn.c:1.1.2.2
--- php-src/ext/intl/idn/idn.c:1.1.2.1 Mon Jan 26 22:30:57 2009
+++ php-src/ext/intl/idn/idn.c Sun May 10 13:26:38 2009
@@ -15,7 +15,7 @@
| Author: Pierre A. Joye pie...@php.net |
+--+
*/
-/* $Id: idn.c,v 1.1.2.1 2009/01/26 22:30:57 pajoye Exp $ */
+/* $Id: idn.c,v 1.1.2.2 2009/05/10 13:26:38 bjori Exp $ */
/* {{{ includes */
#ifdef HAVE_CONFIG_H
@@ -121,7 +121,7 @@
RETURN_STRINGL(((char *)converted_utf8), converted_utf8_len, 0);
}
-/* {{{ proto int idn_to_ascii(string domain)
+/* {{{ proto int idn_to_ascii(string domain[, int options [, int status]])
Converts a UTF-8 domain to ASCII, as defined in the IDNA RFC */
PHP_FUNCTION(idn_to_ascii)
{
@@ -130,7 +130,7 @@
/* }}} */
-/* {{{ proto int idn_to_ascii(string domain)
+/* {{{ proto int idn_to_utf8(string domain[, int options[, int status]])
Converts a UTF-8 domain to ASCII, as defined in the IDNA RFC */
PHP_FUNCTION(idn_to_utf8)
{
--
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
iliaa Sun May 10 13:44:14 2009 UTC Modified files: (Branch: PHP_5_2) /php-srcNEWS Log: WS http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1494r2=1.2027.2.547.2.1495diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.1494 php-src/NEWS:1.2027.2.547.2.1495 --- php-src/NEWS:1.2027.2.547.2.1494Sat May 9 20:42:56 2009 +++ php-src/NEWSSun May 10 13:44:13 2009 @@ -60,7 +60,7 @@ - Fixed bug #47598 (FILTER_VALIDATE_EMAIL is locale aware). (Ilia) - Fixed bug #47487 (performance degraded when reading large chunks after fix of bug #44607). (Arnaud) -- Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi). (Jani) +- Fixed bug #47468 (enable cli|cgi-only extensions for embed sapi). (Jani) - Fixed bug #47365 (ip2long() may allow some invalid values on certain 64bit systems). (Ilia) - Fixed bug #47435 (FILTER_FLAG_NO_PRIV_RANGE does not work with ipv6 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/intl/idn idn.c
Hannes Magnusson kirjoitti:
bjori Sun May 10 13:26:39 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl/idn idn.c
Log:
fix proto
# Why doesn't this exist in HEAD?
The whole ext/intl doesn't work properly in HEAD. (not sure if it even compiles)
I think there's even some comment by Stas somewhere about that..either it was in
the sources or in some commit message..can't remember right now. :)
--Jani
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/idn/idn.c?r1=1.1.2.1r2=1.1.2.2diff_format=u
Index: php-src/ext/intl/idn/idn.c
diff -u php-src/ext/intl/idn/idn.c:1.1.2.1 php-src/ext/intl/idn/idn.c:1.1.2.2
--- php-src/ext/intl/idn/idn.c:1.1.2.1 Mon Jan 26 22:30:57 2009
+++ php-src/ext/intl/idn/idn.c Sun May 10 13:26:38 2009
@@ -15,7 +15,7 @@
| Author: Pierre A. Joye pie...@php.net |
+--+
*/
-/* $Id: idn.c,v 1.1.2.1 2009/01/26 22:30:57 pajoye Exp $ */
+/* $Id: idn.c,v 1.1.2.2 2009/05/10 13:26:38 bjori Exp $ */
/* {{{ includes */
#ifdef HAVE_CONFIG_H
@@ -121,7 +121,7 @@
RETURN_STRINGL(((char *)converted_utf8), converted_utf8_len, 0);
}
-/* {{{ proto int idn_to_ascii(string domain)
+/* {{{ proto int idn_to_ascii(string domain[, int options [, int status]])
Converts a UTF-8 domain to ASCII, as defined in the IDNA RFC */
PHP_FUNCTION(idn_to_ascii)
{
@@ -130,7 +130,7 @@
/* }}} */
-/* {{{ proto int idn_to_ascii(string domain)
+/* {{{ proto int idn_to_utf8(string domain[, int options[, int status]])
Converts a UTF-8 domain to ASCII, as defined in the IDNA RFC */
PHP_FUNCTION(idn_to_utf8)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl xsltprocessor.c /ext/xsl/tests bug48221.phpt
felipe Sun May 10 15:12:32 2009 UTC
Added files:
/php-src/ext/xsl/tests bug48221.phpt
Modified files:
/php-src/ext/xslxsltprocessor.c
Log:
- Fixed bug #48221 (memory leak when passing invalid xslt parameter)
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.73r2=1.74diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.73
php-src/ext/xsl/xsltprocessor.c:1.74
--- php-src/ext/xsl/xsltprocessor.c:1.73Tue Mar 10 23:39:52 2009
+++ php-src/ext/xsl/xsltprocessor.c Sun May 10 15:12:32 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.73 2009/03/10 23:39:52 helly Exp $ */
+/* $Id: xsltprocessor.c,v 1.74 2009/05/10 15:12:32 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -154,11 +154,13 @@
if (!xpath_params) {
xpath_expr =
php_xsl_xslt_string_to_xpathexpr(Z_STRVAL_PP(value) TSRMLS_CC);
} else {
- xpath_expr = estrndup(Z_STRVAL_PP(value),
strlen(Z_STRVAL_PP(value)));
+ xpath_expr = estrndup(Z_STRVAL_PP(value),
Z_STRLEN_PP(value));
}
if (xpath_expr) {
params[i++] = string_key.s;
params[i++] = xpath_expr;
+ } else {
+ efree(string_key.s);
}
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/bug48221.phpt?view=markuprev=1.1
Index: php-src/ext/xsl/tests/bug48221.phpt
+++ php-src/ext/xsl/tests/bug48221.phpt
--TEST--
Bug #48221 (memory leak when passing invalid xslt parameter)
--SKIPIF--
?php
if (!extension_loaded('xsl')) die(skip Extension XSL is required\n);
?
--FILE--
?php
$xsl = new DOMDocument;
$xsl-loadXML('html xsl:version=1.0
xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
lang=en
head
titleSales Results By Division/title
/head
body
table border=1
tr
thDivision/th
thRevenue/th
thGrowth/th
thBonus/th
/tr
xsl:for-each select=sales/division
!-- order the result by revenue --
xsl:sort select=revenue
data-type=number
order=descending/
tr
td
emxsl:value-of select=@id//em
/td
td
xsl:value-of select=revenue/
/td
td
!-- highlight negative growth in red --
xsl:if test=growth lt; 0
xsl:attribute name=style
xsl:textcolor:red/xsl:text
/xsl:attribute
/xsl:if
xsl:value-of select=growth/
/td
td
xsl:value-of select=bonus/
/td
/tr
/xsl:for-each
/table
/body
/html');
$dom = new DOMDocument;
$dom-loadXMl('sales
division id=North
revenue10/revenue
growth9/growth
bonus7/bonus
/division
division id=South
revenue4/revenue
growth3/growth
bonus4/bonus
/division
division id=West
revenue6/revenue
growth-1.5/growth
bonus2/bonus
/division
/sales');
$proc = new xsltprocessor;
$proc-importStylesheet($xsl);
$proc-setParameter('', '', '\'');
$proc-transformToXml($dom);
?
--EXPECTF--
Warning: XSLTProcessor::transformToXml(): Cannot create XPath expression
(string contains both quote and double-quotes) in %s on line %d
--
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/xsl xsltprocessor.c /ext/xsl/tests bug48221.phpt
felipe Sun May 10 15:13:05 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/xsl/tests bug48221.phpt
Modified files:
/php-src/ext/xslxsltprocessor.c
Log:
- MFH: Fixed bug #48221 (memory leak when passing invalid xslt parameter)
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.9.2.15r2=1.39.2.2.2.9.2.16diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.15
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.16
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.15 Wed Dec 31 11:15:47 2008
+++ php-src/ext/xsl/xsltprocessor.c Sun May 10 15:13:05 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.15 2008/12/31 11:15:47 sebastian Exp
$ */
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.16 2009/05/10 15:13:05 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -153,11 +153,13 @@
if (!xpath_params) {
xpath_expr =
php_xsl_xslt_string_to_xpathexpr(Z_STRVAL_PP(value) TSRMLS_CC);
} else {
- xpath_expr = estrndup(Z_STRVAL_PP(value),
strlen(Z_STRVAL_PP(value)));
+ xpath_expr = estrndup(Z_STRVAL_PP(value),
Z_STRLEN_PP(value));
}
if (xpath_expr) {
params[i++] = string_key;
params[i++] = xpath_expr;
+ } else {
+ efree(string_key);
}
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/bug48221.phpt?view=markuprev=1.1
Index: php-src/ext/xsl/tests/bug48221.phpt
+++ php-src/ext/xsl/tests/bug48221.phpt
--TEST--
Bug #48221 (memory leak when passing invalid xslt parameter)
--SKIPIF--
?php
if (!extension_loaded('xsl')) die(skip Extension XSL is required\n);
?
--FILE--
?php
$xsl = new DOMDocument;
$xsl-loadXML('html xsl:version=1.0
xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
lang=en
head
titleSales Results By Division/title
/head
body
table border=1
tr
thDivision/th
thRevenue/th
thGrowth/th
thBonus/th
/tr
xsl:for-each select=sales/division
!-- order the result by revenue --
xsl:sort select=revenue
data-type=number
order=descending/
tr
td
emxsl:value-of select=@id//em
/td
td
xsl:value-of select=revenue/
/td
td
!-- highlight negative growth in red --
xsl:if test=growth lt; 0
xsl:attribute name=style
xsl:textcolor:red/xsl:text
/xsl:attribute
/xsl:if
xsl:value-of select=growth/
/td
td
xsl:value-of select=bonus/
/td
/tr
/xsl:for-each
/table
/body
/html');
$dom = new DOMDocument;
$dom-loadXMl('sales
division id=North
revenue10/revenue
growth9/growth
bonus7/bonus
/division
division id=South
revenue4/revenue
growth3/growth
bonus4/bonus
/division
division id=West
revenue6/revenue
growth-1.5/growth
bonus2/bonus
/division
/sales');
$proc = new xsltprocessor;
$proc-importStylesheet($xsl);
$proc-setParameter('', '', '\'');
$proc-transformToXml($dom);
?
--EXPECTF--
Warning: XSLTProcessor::transformToXml(): Cannot create XPath expression
(string contains both quote and double-quotes) in %s on line %d
--
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/xsl xsltprocessor.c /ext/xsl/tests bug48221.phpt
felipe Sun May 10 15:15:48 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/xsl/tests bug48221.phpt
Modified files:
/php-srcNEWS
/php-src/ext/xslxsltprocessor.c
Log:
- MFH: Fixed bug #48221 (memory leak when passing invalid xslt parameter)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1495r2=1.2027.2.547.2.1496diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1495 php-src/NEWS:1.2027.2.547.2.1496
--- php-src/NEWS:1.2027.2.547.2.1495Sun May 10 13:44:13 2009
+++ php-src/NEWSSun May 10 15:15:47 2009
@@ -12,6 +12,7 @@
- Fixed segfault on invalid session.save_path. (Hannes)
- Fixed leaks in imap when a mail_criteria is used. (Pierre)
+- Fixed bug #48221 (memory leak when passing invalid xslt parameter). (Felipe)
- Fixed bug #48206 (Iterating over an invalid data structure
with RecursiveIteratorIterator leads to a segfault). (Scott)
- Fixed bug #48156 (Added support for lcov v1.7). (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.16r2=1.39.2.2.2.17diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.16
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.17
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.16 Wed Dec 31 11:17:47 2008
+++ php-src/ext/xsl/xsltprocessor.c Sun May 10 15:15:47 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.16 2008/12/31 11:17:47 sebastian Exp $ */
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.17 2009/05/10 15:15:47 felipe Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -157,11 +157,13 @@
if (!xpath_params) {
xpath_expr =
php_xsl_xslt_string_to_xpathexpr(Z_STRVAL_PP(value) TSRMLS_CC);
} else {
- xpath_expr = estrndup(Z_STRVAL_PP(value),
strlen(Z_STRVAL_PP(value)));
+ xpath_expr = estrndup(Z_STRVAL_PP(value),
Z_STRLEN_PP(value));
}
if (xpath_expr) {
params[i++] = string_key;
params[i++] = xpath_expr;
+ } else {
+ efree(string_key);
}
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/bug48221.phpt?view=markuprev=1.1
Index: php-src/ext/xsl/tests/bug48221.phpt
+++ php-src/ext/xsl/tests/bug48221.phpt
--TEST--
Bug #48221 (memory leak when passing invalid xslt parameter)
--SKIPIF--
?php
if (!extension_loaded('xsl')) die(skip Extension XSL is required\n);
?
--FILE--
?php
$xsl = new DOMDocument;
$xsl-loadXML('html xsl:version=1.0
xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
lang=en
head
titleSales Results By Division/title
/head
body
table border=1
tr
thDivision/th
thRevenue/th
thGrowth/th
thBonus/th
/tr
xsl:for-each select=sales/division
!-- order the result by revenue --
xsl:sort select=revenue
data-type=number
order=descending/
tr
td
emxsl:value-of select=@id//em
/td
td
xsl:value-of select=revenue/
/td
td
!-- highlight negative growth in red --
xsl:if test=growth lt; 0
xsl:attribute name=style
xsl:textcolor:red/xsl:text
/xsl:attribute
/xsl:if
xsl:value-of select=growth/
/td
td
xsl:value-of select=bonus/
/td
/tr
/xsl:for-each
/table
/body
/html');
$dom = new DOMDocument;
$dom-loadXMl('sales
division id=North
revenue10/revenue
growth9/growth
bonus7/bonus
/division
division id=South
revenue4/revenue
growth3/growth
bonus4/bonus
/division
division id=West
revenue6/revenue
growth-1.5/growth
bonus2/bonus
/division
/sales');
$proc = new xsltprocessor;
$proc-importStylesheet($xsl);
$proc-setParameter('', '', '\'');
$proc-transformToXml($dom);
?
--EXPECTF--
Warning: XSLTProcessor::transformToXml(): Cannot create XPath expression
(string contains both quote and double-quotes) in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To
[PHP-CVS] cvs: php-src /ext/xsl/tests bug48221.phpt
felipe Sun May 10 15:48:25 2009 UTC
Modified files:
/php-src/ext/xsl/tests bug48221.phpt
Log:
- Simplify test (cweiske)
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/bug48221.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/xsl/tests/bug48221.phpt
diff -u php-src/ext/xsl/tests/bug48221.phpt:1.1
php-src/ext/xsl/tests/bug48221.phpt:1.2
--- php-src/ext/xsl/tests/bug48221.phpt:1.1 Sun May 10 15:12:32 2009
+++ php-src/ext/xsl/tests/bug48221.phpt Sun May 10 15:48:25 2009
@@ -6,80 +6,12 @@
?
--FILE--
?php
-
-$xsl = new DOMDocument;
-$xsl-loadXML('html xsl:version=1.0
- xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
- lang=en
-head
-titleSales Results By Division/title
-/head
-body
-table border=1
-tr
-thDivision/th
-thRevenue/th
-thGrowth/th
-thBonus/th
-/tr
-xsl:for-each select=sales/division
-!-- order the result by revenue --
-xsl:sort select=revenue
- data-type=number
- order=descending/
-tr
-td
-emxsl:value-of select=@id//em
-/td
-td
-xsl:value-of select=revenue/
-/td
-td
-!-- highlight negative growth in red --
-xsl:if test=growth lt; 0
- xsl:attribute name=style
- xsl:textcolor:red/xsl:text
- /xsl:attribute
-/xsl:if
-xsl:value-of select=growth/
-/td
-td
-xsl:value-of select=bonus/
-/td
-/tr
-/xsl:for-each
-/table
-/body
-/html');
-
-$dom = new DOMDocument;
-$dom-loadXMl('sales
-
-division id=North
-revenue10/revenue
-growth9/growth
-bonus7/bonus
-/division
-
-division id=South
-revenue4/revenue
-growth3/growth
-bonus4/bonus
-/division
-
-division id=West
-revenue6/revenue
-growth-1.5/growth
-bonus2/bonus
-/division
-
-/sales');
-
-$proc = new xsltprocessor;
+include('prepare.inc');
$proc-importStylesheet($xsl);
$proc-setParameter('', '', '\'');
$proc-transformToXml($dom);
-
-?
--EXPECTF--
Warning: XSLTProcessor::transformToXml(): Cannot create XPath expression
(string contains both quote and double-quotes) in %s on line %d
+--CREDITS--
+Christian Weiske, cwei...@php.net
+PHP Testfest Berlin 2009-05-09
--
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/xsl/tests bug48221.phpt
felipe Sun May 10 15:48:39 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/xsl/tests bug48221.phpt
Log:
- Simplify test (cweiske)
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/bug48221.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/xsl/tests/bug48221.phpt
diff -u php-src/ext/xsl/tests/bug48221.phpt:1.1.2.2
php-src/ext/xsl/tests/bug48221.phpt:1.1.2.3
--- php-src/ext/xsl/tests/bug48221.phpt:1.1.2.2 Sun May 10 15:13:05 2009
+++ php-src/ext/xsl/tests/bug48221.phpt Sun May 10 15:48:39 2009
@@ -6,80 +6,12 @@
?
--FILE--
?php
-
-$xsl = new DOMDocument;
-$xsl-loadXML('html xsl:version=1.0
- xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
- lang=en
-head
-titleSales Results By Division/title
-/head
-body
-table border=1
-tr
-thDivision/th
-thRevenue/th
-thGrowth/th
-thBonus/th
-/tr
-xsl:for-each select=sales/division
-!-- order the result by revenue --
-xsl:sort select=revenue
- data-type=number
- order=descending/
-tr
-td
-emxsl:value-of select=@id//em
-/td
-td
-xsl:value-of select=revenue/
-/td
-td
-!-- highlight negative growth in red --
-xsl:if test=growth lt; 0
- xsl:attribute name=style
- xsl:textcolor:red/xsl:text
- /xsl:attribute
-/xsl:if
-xsl:value-of select=growth/
-/td
-td
-xsl:value-of select=bonus/
-/td
-/tr
-/xsl:for-each
-/table
-/body
-/html');
-
-$dom = new DOMDocument;
-$dom-loadXMl('sales
-
-division id=North
-revenue10/revenue
-growth9/growth
-bonus7/bonus
-/division
-
-division id=South
-revenue4/revenue
-growth3/growth
-bonus4/bonus
-/division
-
-division id=West
-revenue6/revenue
-growth-1.5/growth
-bonus2/bonus
-/division
-
-/sales');
-
-$proc = new xsltprocessor;
+include('prepare.inc');
$proc-importStylesheet($xsl);
$proc-setParameter('', '', '\'');
$proc-transformToXml($dom);
-
-?
--EXPECTF--
Warning: XSLTProcessor::transformToXml(): Cannot create XPath expression
(string contains both quote and double-quotes) in %s on line %d
+--CREDITS--
+Christian Weiske, cwei...@php.net
+PHP Testfest Berlin 2009-05-09
--
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/xsl/tests bug48221.phpt
felipe Sun May 10 15:48:53 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/xsl/tests bug48221.phpt
Log:
- Simplify test (cweiske)
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/bug48221.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u
Index: php-src/ext/xsl/tests/bug48221.phpt
diff -u php-src/ext/xsl/tests/bug48221.phpt:1.1.4.2
php-src/ext/xsl/tests/bug48221.phpt:1.1.4.3
--- php-src/ext/xsl/tests/bug48221.phpt:1.1.4.2 Sun May 10 15:15:47 2009
+++ php-src/ext/xsl/tests/bug48221.phpt Sun May 10 15:48:53 2009
@@ -6,80 +6,12 @@
?
--FILE--
?php
-
-$xsl = new DOMDocument;
-$xsl-loadXML('html xsl:version=1.0
- xmlns:xsl=http://www.w3.org/1999/XSL/Transform;
- lang=en
-head
-titleSales Results By Division/title
-/head
-body
-table border=1
-tr
-thDivision/th
-thRevenue/th
-thGrowth/th
-thBonus/th
-/tr
-xsl:for-each select=sales/division
-!-- order the result by revenue --
-xsl:sort select=revenue
- data-type=number
- order=descending/
-tr
-td
-emxsl:value-of select=@id//em
-/td
-td
-xsl:value-of select=revenue/
-/td
-td
-!-- highlight negative growth in red --
-xsl:if test=growth lt; 0
- xsl:attribute name=style
- xsl:textcolor:red/xsl:text
- /xsl:attribute
-/xsl:if
-xsl:value-of select=growth/
-/td
-td
-xsl:value-of select=bonus/
-/td
-/tr
-/xsl:for-each
-/table
-/body
-/html');
-
-$dom = new DOMDocument;
-$dom-loadXMl('sales
-
-division id=North
-revenue10/revenue
-growth9/growth
-bonus7/bonus
-/division
-
-division id=South
-revenue4/revenue
-growth3/growth
-bonus4/bonus
-/division
-
-division id=West
-revenue6/revenue
-growth-1.5/growth
-bonus2/bonus
-/division
-
-/sales');
-
-$proc = new xsltprocessor;
+include('prepare.inc');
$proc-importStylesheet($xsl);
$proc-setParameter('', '', '\'');
$proc-transformToXml($dom);
-
-?
--EXPECTF--
Warning: XSLTProcessor::transformToXml(): Cannot create XPath expression
(string contains both quote and double-quotes) in %s on line %d
+--CREDITS--
+Christian Weiske, cwei...@php.net
+PHP Testfest Berlin 2009-05-09
--
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
colder Sun May 10 16:45:03 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/standard array.c
Log:
Fix #48224 (Remove incorrect shuffle)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1496r2=1.2027.2.547.2.1497diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1496 php-src/NEWS:1.2027.2.547.2.1497
--- php-src/NEWS:1.2027.2.547.2.1496Sun May 10 15:15:47 2009
+++ php-src/NEWSSun May 10 16:45:01 2009
@@ -12,6 +12,7 @@
- Fixed segfault on invalid session.save_path. (Hannes)
- Fixed leaks in imap when a mail_criteria is used. (Pierre)
+- Fixed bug #48224 (Incorrect shuffle in array_rand). (Etienne)
- Fixed bug #48221 (memory leak when passing invalid xslt parameter). (Felipe)
- Fixed bug #48206 (Iterating over an invalid data structure
with RecursiveIteratorIterator leads to a segfault). (Scott)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.65r2=1.308.2.21.2.66diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.65
php-src/ext/standard/array.c:1.308.2.21.2.66
--- php-src/ext/standard/array.c:1.308.2.21.2.65Fri Feb 13 22:26:46 2009
+++ php-src/ext/standard/array.cSun May 10 16:45:01 2009
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.65 2009/02/13 22:26:46 andrei Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.66 2009/05/10 16:45:01 colder Exp $ */
#include php.h
#include php_ini.h
@@ -4204,10 +4204,6 @@
num_avail--;
zend_hash_move_forward_ex(Z_ARRVAL_PP(input), pos);
}
-
- if (num_req_val == num_avail) {
- array_data_shuffle(return_value TSRMLS_CC);
- }
}
/* }}} */
--
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
colder Sun May 10 16:45:21 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard array.c
Log:
MFB: Fix #48224 (Remove incorrect shuffle)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.37.2.53r2=1.308.2.21.2.37.2.54diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.37.2.53
php-src/ext/standard/array.c:1.308.2.21.2.37.2.54
--- php-src/ext/standard/array.c:1.308.2.21.2.37.2.53 Fri Feb 13 22:34:15 2009
+++ php-src/ext/standard/array.cSun May 10 16:45:21 2009
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.308.2.21.2.37.2.53 2009/02/13 22:34:15 andrei Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.37.2.54 2009/05/10 16:45:21 colder Exp $ */
#include php.h
#include php_ini.h
@@ -3920,10 +3920,6 @@
num_avail--;
zend_hash_move_forward_ex(Z_ARRVAL_P(input), pos);
}
-
- if (num_req == num_avail) {
- php_array_data_shuffle(return_value TSRMLS_CC);
- }
}
/* }}} */
--
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
colder Sun May 10 16:45:30 2009 UTC
Modified files:
/php-src/ext/standard array.c
Log:
MFB: Fix #48224 (Remove incorrect shuffle)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.475r2=1.476diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.475 php-src/ext/standard/array.c:1.476
--- php-src/ext/standard/array.c:1.475 Thu Mar 26 20:02:28 2009
+++ php-src/ext/standard/array.cSun May 10 16:45:30 2009
@@ -21,7 +21,7 @@
+--+
*/
-/* $Id: array.c,v 1.475 2009/03/26 20:02:28 felipe Exp $ */
+/* $Id: array.c,v 1.476 2009/05/10 16:45:30 colder Exp $ */
#include php.h
#include php_ini.h
@@ -4114,10 +4114,6 @@
num_avail--;
zend_hash_move_forward_ex(Z_ARRVAL_P(input), pos);
}
-
- if (num_req == num_avail) {
- php_array_data_shuffle(return_value TSRMLS_CC);
- }
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard array.c
On Sun, 2009-05-10 at 16:45 +, Etienne Kneuss wrote: colderSun May 10 16:45:21 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard array.c Log: MFB: Fix #48224 (Remove incorrect shuffle) Any chance to cover this in a test? - I know it involves randomness. Maybe multiple calls to array_rand() and check if it's always in right order or something? johannes -- 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/intl intl_data.h intl_error.c
stasSun May 10 19:10:37 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl intl_data.h intl_error.c
Log:
little errors cleanup
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/intl_data.h?r1=1.1.2.4r2=1.1.2.5diff_format=u
Index: php-src/ext/intl/intl_data.h
diff -u php-src/ext/intl/intl_data.h:1.1.2.4
php-src/ext/intl/intl_data.h:1.1.2.5
--- php-src/ext/intl/intl_data.h:1.1.2.4Thu Jan 29 21:49:49 2009
+++ php-src/ext/intl/intl_data.hSun May 10 19:10:36 2009
@@ -50,7 +50,7 @@
intl_error_set_code( NULL, (err) TSRMLS_CC );
\
if( U_FAILURE((err)) )
\
{
\
-intl_errors_set_custom_msg( NULL, msg, 0 TSRMLS_CC );
\
+intl_error_set_custom_msg( NULL, msg, 0 TSRMLS_CC );
\
RETURN_FALSE;
\
}
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/intl_error.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/intl/intl_error.c
diff -u php-src/ext/intl/intl_error.c:1.1.2.2
php-src/ext/intl/intl_error.c:1.1.2.3
--- php-src/ext/intl/intl_error.c:1.1.2.2 Mon Aug 11 19:47:59 2008
+++ php-src/ext/intl/intl_error.c Sun May 10 19:10:36 2009
@@ -173,7 +173,9 @@
*/
void intl_error_set( intl_error* err, UErrorCode code, char* msg, int copyMsg
TSRMLS_DC )
{
- intl_error_set_code( err, code TSRMLS_CC );
+ if(err) {
+ intl_error_set_code( err, code TSRMLS_CC );
+ }
intl_error_set_custom_msg( err, msg, copyMsg TSRMLS_CC );
}
/* }}} */
@@ -182,7 +184,9 @@
*/
void intl_errors_reset( intl_error* err TSRMLS_DC )
{
- intl_error_reset( err TSRMLS_CC );
+ if(err) {
+ intl_error_reset( err TSRMLS_CC );
+ }
intl_error_reset( NULL TSRMLS_CC );
}
/* }}} */
@@ -191,7 +195,9 @@
*/
void intl_errors_set_custom_msg( intl_error* err, char* msg, int copyMsg
TSRMLS_DC )
{
- intl_error_set_custom_msg( err, msg, copyMsg TSRMLS_CC );
+ if(err) {
+ intl_error_set_custom_msg( err, msg, copyMsg TSRMLS_CC );
+ }
intl_error_set_custom_msg( NULL, msg, copyMsg TSRMLS_CC );
}
/* }}} */
@@ -200,7 +206,9 @@
*/
void intl_errors_set_code( intl_error* err, UErrorCode err_code TSRMLS_DC )
{
- intl_error_set_code( err, err_code TSRMLS_CC );
+ if(err) {
+ intl_error_set_code( err, err_code TSRMLS_CC );
+ }
intl_error_set_code( NULL, err_code TSRMLS_CC );
}
/* }}} */
--
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/xsl xsltprocessor.c
davidc Sun May 10 19:59:47 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/xslxsltprocessor.c
Log:
- Removed the RETURN_TRUE to keep consistency with documentation. This
function
is supposed to be void registerPHPFunctions
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.39.2.2.2.9.2.16r2=1.39.2.2.2.9.2.17diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.16
php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.17
--- php-src/ext/xsl/xsltprocessor.c:1.39.2.2.2.9.2.16 Sun May 10 15:13:05 2009
+++ php-src/ext/xsl/xsltprocessor.c Sun May 10 19:59:47 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.16 2009/05/10 15:13:05 felipe Exp $ */
+/* $Id: xsltprocessor.c,v 1.39.2.2.2.9.2.17 2009/05/10 19:59:47 davidc Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -814,7 +814,6 @@
zend_hash_move_forward(Z_ARRVAL_P(array_value));
}
intern-registerPhpFunctions = 2;
- RETURN_TRUE;
} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
ZEND_NUM_ARGS() TSRMLS_CC, s, name, name_len) == SUCCESS) {
intern = (xsl_object *)zend_object_store_get_object(id
TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl xsltprocessor.c
davidc Sun May 10 20:00:59 2009 UTC
Modified files:
/php-src/ext/xslxsltprocessor.c
Log:
- MFB: Removed the RETURN_TRUE to keep consistency with documentation.
This function is supposed to be void registerPHPFunctions
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/xsltprocessor.c?r1=1.74r2=1.75diff_format=u
Index: php-src/ext/xsl/xsltprocessor.c
diff -u php-src/ext/xsl/xsltprocessor.c:1.74
php-src/ext/xsl/xsltprocessor.c:1.75
--- php-src/ext/xsl/xsltprocessor.c:1.74Sun May 10 15:12:32 2009
+++ php-src/ext/xsl/xsltprocessor.c Sun May 10 20:00:58 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: xsltprocessor.c,v 1.74 2009/05/10 15:12:32 felipe Exp $ */
+/* $Id: xsltprocessor.c,v 1.75 2009/05/10 20:00:58 davidc Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -847,7 +847,6 @@
zend_hash_move_forward(Z_ARRVAL_P(array_value));
}
intern-registerPhpFunctions = 2;
- RETURN_TRUE;
} else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
ZEND_NUM_ARGS() TSRMLS_CC, t, name, name_len, name_type) == SUCCESS) {
intern = (xsl_object *)zend_object_store_get_object(id
TSRMLS_CC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/array bug48224.phpt
colder Sun May 10 20:11:36 2009 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/array bug48224.phpt Log: Add test for #48224 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug48224.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/bug48224.phpt +++ php-src/ext/standard/tests/array/bug48224.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/array bug48224.phpt
colder Sun May 10 20:12:56 2009 UTC Added files: (Branch: PHP_5_3) /php-src/ext/standard/tests/array bug48224.phpt Log: MFB: Add test for #48224 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug48224.phpt?view=markuprev=1.1 Index: php-src/ext/standard/tests/array/bug48224.phpt +++ php-src/ext/standard/tests/array/bug48224.phpt -- 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/array bug48224.phpt
colder Sun May 10 20:13:08 2009 UTC Modified files: /php-src/ext/standard/tests/array bug48224.phpt Log: MFB: Add test for #48224 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/array/bug48224.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/array/bug48224.phpt diff -u /dev/null php-src/ext/standard/tests/array/bug48224.phpt:1.2 --- /dev/null Sun May 10 20:13:08 2009 +++ php-src/ext/standard/tests/array/bug48224.phpt Sun May 10 20:13:08 2009 @@ -0,0 +1,15 @@ +--TEST-- +Bug #48224 (array_rand no longer shuffles) +--FILE-- +?php +$a = range(0, 100); +$a1 = array_rand($a, count($a)); +$a2 = array_rand($a, count($a)); +$a3 = array_rand($a, count($a)); +$a4 = array_rand($a, count($a)); + +var_dump($a1 === $a2 $a1 === $a3 $a1 === $a4); + +? +--EXPECT-- +bool(true) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/standard array.c
2009/5/10 Johannes Schlüter johan...@php.net: On Sun, 2009-05-10 at 16:45 +, Etienne Kneuss wrote: colder Sun May 10 16:45:21 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard array.c Log: MFB: Fix #48224 (Remove incorrect shuffle) Any chance to cover this in a test? - I know it involves randomness. Maybe multiple calls to array_rand() and check if it's always in right order or something? Yeah, I added a === check which should have a low probability of passing with shuffles johannes -- Etienne Kneuss http://www.colder.ch Men never do evil so completely and cheerfully as when they do it from a religious conviction. -- Pascal -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/intl/formatter formatter_format.c /ext/intl/tests bug48227.phpt
felipe Sun May 10 20:15:39 2009 UTC
Added files:
/php-src/ext/intl/tests bug48227.phpt
Modified files:
/php-src/ext/intl/formatter formatter_format.c
Log:
- Fixed bug #48227 (NumberFormatter::format leaks memory)
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/formatter/formatter_format.c?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/intl/formatter/formatter_format.c
diff -u php-src/ext/intl/formatter/formatter_format.c:1.4
php-src/ext/intl/formatter/formatter_format.c:1.5
--- php-src/ext/intl/formatter/formatter_format.c:1.4 Tue Mar 10 23:39:26 2009
+++ php-src/ext/intl/formatter/formatter_format.c Sun May 10 20:15:39 2009
@@ -53,11 +53,7 @@
if(type == FORMAT_TYPE_DEFAULT) {
if(Z_TYPE_PP(number) == IS_STRING) {
- SEPARATE_ZVAL_IF_NOT_REF(number);
- if
((Z_TYPE_PP(number)=is_numeric_string(Z_STRVAL_PP(number), Z_STRLEN_PP(number),
- Z_LVAL_PP(number), Z_DVAL_PP(number), 1)) ==
0) {
- ZVAL_LONG(*number, 0);
- }
+ convert_scalar_to_number_ex(number);
}
if(Z_TYPE_PP(number) == IS_LONG) {
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/tests/bug48227.phpt?view=markuprev=1.1
Index: php-src/ext/intl/tests/bug48227.phpt
+++ php-src/ext/intl/tests/bug48227.phpt
--TEST--
Bug #48227 (NumberFormatter::format leaks memory)
--FILE--
?php
$x = new NumberFormatter('en_US', NumberFormatter::DECIMAL);
var_dump($x-format(''));
var_dump($x-format(1));
var_dump($x-format(NULL));
var_dump($x-format($x));
?
--EXPECTF--
string(1) 0
string(1) 1
string(1) 0
Notice: Object of class NumberFormatter could not be converted to int in %s on
line %d
string(1) 1
--
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) / NEWS /ext/intl/formatter formatter_format.c /ext/intl/tests bug48227.phpt
felipe Sun May 10 20:17:22 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/intl/tests bug48227.phpt
Modified files:
/php-srcNEWS
/php-src/ext/intl/formatter formatter_format.c
Log:
- Fixed bug #48227 (NumberFormatter::format leaks memory)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.965.2.594r2=1.2027.2.547.2.965.2.595diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.965.2.594
php-src/NEWS:1.2027.2.547.2.965.2.595
--- php-src/NEWS:1.2027.2.547.2.965.2.594 Sat May 9 21:06:59 2009
+++ php-src/NEWSSun May 10 20:17:21 2009
@@ -6,6 +6,7 @@
- Disabled SQLite3::loadExtension for threaded SAPIs. (Scott)
+- Fixed bug #48227 (NumberFormatter::format leaks memory). (Felipe)
07 May 2009, PHP 5.3.0 RC 2
- Upgraded bundled sqlite to version 3.6.13. (Ilia)
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/formatter/formatter_format.c?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/intl/formatter/formatter_format.c
diff -u php-src/ext/intl/formatter/formatter_format.c:1.1.2.2
php-src/ext/intl/formatter/formatter_format.c:1.1.2.3
--- php-src/ext/intl/formatter/formatter_format.c:1.1.2.2 Mon Aug 11
19:48:00 2008
+++ php-src/ext/intl/formatter/formatter_format.c Sun May 10 20:17:21 2009
@@ -54,11 +54,7 @@
if(type == FORMAT_TYPE_DEFAULT) {
if(Z_TYPE_PP(number) == IS_STRING) {
- SEPARATE_ZVAL_IF_NOT_REF(number);
- if
((Z_TYPE_PP(number)=is_numeric_string(Z_STRVAL_PP(number), Z_STRLEN_PP(number),
- Z_LVAL_PP(number), Z_DVAL_PP(number), 1)) ==
0) {
- ZVAL_LONG(*number, 0);
- }
+ convert_scalar_to_number_ex(number);
}
if(Z_TYPE_PP(number) == IS_LONG) {
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/tests/bug48227.phpt?view=markuprev=1.1
Index: php-src/ext/intl/tests/bug48227.phpt
+++ php-src/ext/intl/tests/bug48227.phpt
--TEST--
Bug #48227 (NumberFormatter::format leaks memory)
--FILE--
?php
$x = new NumberFormatter('en_US', NumberFormatter::DECIMAL);
var_dump($x-format(''));
var_dump($x-format(1));
var_dump($x-format(NULL));
var_dump($x-format($x));
?
--EXPECTF--
string(1) 0
string(1) 1
string(1) 0
Notice: Object of class NumberFormatter could not be converted to int in %s on
line %d
string(1) 1
--
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/intl intl_error.c
stasSun May 10 20:58:26 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/intl intl_error.c
Log:
revent wrong part
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/intl_error.c?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/intl/intl_error.c
diff -u php-src/ext/intl/intl_error.c:1.1.2.3
php-src/ext/intl/intl_error.c:1.1.2.4
--- php-src/ext/intl/intl_error.c:1.1.2.3 Sun May 10 19:10:36 2009
+++ php-src/ext/intl/intl_error.c Sun May 10 20:58:26 2009
@@ -173,9 +173,7 @@
*/
void intl_error_set( intl_error* err, UErrorCode code, char* msg, int copyMsg
TSRMLS_DC )
{
- if(err) {
- intl_error_set_code( err, code TSRMLS_CC );
- }
+ intl_error_set_code( err, code TSRMLS_CC );
intl_error_set_custom_msg( err, msg, copyMsg TSRMLS_CC );
}
/* }}} */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/intl intl_data.h intl_error.c
stasSun May 10 21:01:38 2009 UTC
Modified files:
/php-src/ext/intl intl_data.h intl_error.c
Log:
MF5 fixes
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/intl_data.h?r1=1.5r2=1.6diff_format=u
Index: php-src/ext/intl/intl_data.h
diff -u php-src/ext/intl/intl_data.h:1.5 php-src/ext/intl/intl_data.h:1.6
--- php-src/ext/intl/intl_data.h:1.5Tue Mar 10 23:39:22 2009
+++ php-src/ext/intl/intl_data.hSun May 10 21:01:38 2009
@@ -45,12 +45,12 @@
obj = (oclass##_object *) zend_object_store_get_object( object
TSRMLS_CC ); \
intl_error_reset( INTL_DATA_ERROR_P(obj) TSRMLS_CC );
\
-// Check status by error code, if error - exit
+/* Check status by error code, if error - exit */
#define INTL_CHECK_STATUS(err, msg)
\
intl_error_set_code( NULL, (err) TSRMLS_CC );
\
if( U_FAILURE((err)) )
\
{
\
-intl_errors_set_custom_msg( NULL, msg, 0 TSRMLS_CC );
\
+intl_error_set_custom_msg( NULL, msg, 0 TSRMLS_CC );
\
RETURN_FALSE;
\
}
@@ -62,9 +62,9 @@
RETURN_FALSE;
\
}
-#define INTL_MAX_LOCALE_LEN 64
+#define INTL_MAX_LOCALE_LEN 80
-// Check status, if error - destroy value and exit
+/* Check status, if error - destroy value and exit */
#define INTL_CTOR_CHECK_STATUS(obj, msg)
\
intl_error_set_code( NULL, INTL_DATA_ERROR_CODE((obj)) TSRMLS_CC );
\
if( U_FAILURE( INTL_DATA_ERROR_CODE((obj)) ) )
\
@@ -77,14 +77,14 @@
#define INTL_CHECK_LOCALE_LEN(locale_len)
\
if((locale_len) INTL_MAX_LOCALE_LEN) {
\
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
\
- Locale string too long, should be no longer than 64 characters, 0
TSRMLS_CC );\
+ Locale string too long, should be no longer than 80 characters, 0
TSRMLS_CC );\
RETURN_NULL();
\
}
#define INTL_CHECK_LOCALE_LEN_OBJ(locale_len, object)
\
if((locale_len) INTL_MAX_LOCALE_LEN) {
\
intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
\
- Locale string too long, should be no longer than 64 characters, 0
TSRMLS_CC );\
+ Locale string too long, should be no longer than 80 characters, 0
TSRMLS_CC );\
zval_dtor(object);
\
ZVAL_NULL(object);
\
RETURN_NULL();
\
http://cvs.php.net/viewvc.cgi/php-src/ext/intl/intl_error.c?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/intl/intl_error.c
diff -u php-src/ext/intl/intl_error.c:1.4 php-src/ext/intl/intl_error.c:1.5
--- php-src/ext/intl/intl_error.c:1.4 Tue Mar 10 23:39:22 2009
+++ php-src/ext/intl/intl_error.c Sun May 10 21:01:38 2009
@@ -182,7 +182,9 @@
*/
void intl_errors_reset( intl_error* err TSRMLS_DC )
{
- intl_error_reset( err TSRMLS_CC );
+ if(err) {
+ intl_error_reset( err TSRMLS_CC );
+ }
intl_error_reset( NULL TSRMLS_CC );
}
/* }}} */
@@ -191,7 +193,9 @@
*/
void intl_errors_set_custom_msg( intl_error* err, char* msg, int copyMsg
TSRMLS_DC )
{
- intl_error_set_custom_msg( err, msg, copyMsg TSRMLS_CC );
+ if(err) {
+
[PHP-CVS] cvs: php-src /ext/mbstring mbstring.c /ext/mbstring/tests zend_multibyte-01.phpt zend_multibyte-02.phpt zend_multibyte-03.phpt zend_multibyte-04.phpt zend_multibyte-05.phpt zend_multibyte-0
janiSun May 10 21:04:26 2009 UTC
Modified files:
/php-src/ext/mbstring mbstring.c
/php-src/ext/mbstring/tests zend_multibyte-01.phpt
zend_multibyte-02.phpt
zend_multibyte-03.phpt
zend_multibyte-04.phpt
zend_multibyte-05.phpt
zend_multibyte-06.phpt
zend_multibyte-07.phpt
zend_multibyte-08.phpt
zend_multibyte-09.phpt
zend_multibyte-10.phpt
zend_multibyte-11.phpt
zend_multibyte-12.phpt
zend_multibyte-13.phpt
zend_multibyte-14.phpt
Log:
- Fixed bug #48200 (compile failure with mbstring.c when
--enable-zend-multibyte is used)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.321r2=1.322diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.321
php-src/ext/mbstring/mbstring.c:1.322
--- php-src/ext/mbstring/mbstring.c:1.321 Mon Apr 20 17:06:00 2009
+++ php-src/ext/mbstring/mbstring.c Sun May 10 21:04:26 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.321 2009/04/20 17:06:00 jani Exp $ */
+/* $Id: mbstring.c,v 1.322 2009/05/10 21:04:26 jani Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -94,8 +94,14 @@
/* {{{ prototypes */
ZEND_DECLARE_MODULE_GLOBALS(mbstring)
+
static PHP_GINIT_FUNCTION(mbstring);
static PHP_GSHUTDOWN_FUNCTION(mbstring);
+
+static size_t php_mb_oddlen(const unsigned char *string, size_t length, const
char *encoding TSRMLS_DC);
+static int php_mb_encoding_converter(unsigned char **to, size_t *to_length,
const unsigned char *from, size_t from_length, const char *encoding_to, const
char *encoding_from TSRMLS_DC);
+static char* php_mb_encoding_detector(const unsigned char *arg_string, size_t
arg_length, char *arg_list TSRMLS_DC);
+static int php_mb_set_zend_encoding(TSRMLS_D);
/* }}} */
/* {{{ php_mb_default_identify_list */
@@ -866,7 +872,7 @@
#if HAVE_ONIG
/* {{{ _php_mb_compile_regex */
-void *_php_mb_compile_regex(const char *pattern TSRMLS_DC)
+static void *_php_mb_compile_regex(const char *pattern TSRMLS_DC)
{
php_mb_regex_t *retval;
OnigErrorInfo err_info;
@@ -887,7 +893,7 @@
/* }}} */
/* {{{ _php_mb_match_regex */
-int _php_mb_match_regex(void *opaque, const char *str, size_t str_len)
+static int _php_mb_match_regex(void *opaque, const char *str, size_t str_len)
{
return onig_search((php_mb_regex_t *)opaque, (const OnigUChar *)str,
(const OnigUChar*)str + str_len, (const OnigUChar *)str,
@@ -896,14 +902,14 @@
/* }}} */
/* {{{ _php_mb_free_regex */
-void _php_mb_free_regex(void *opaque)
+static void _php_mb_free_regex(void *opaque)
{
onig_free((php_mb_regex_t *)opaque);
}
/* }}} */
#elif HAVE_PCRE || HAVE_BUNDLED_PCRE
/* {{{ _php_mb_compile_regex */
-void *_php_mb_compile_regex(const char *pattern TSRMLS_DC)
+static void *_php_mb_compile_regex(const char *pattern TSRMLS_DC)
{
pcre *retval;
const char *err_str;
@@ -918,7 +924,7 @@
/* }}} */
/* {{{ _php_mb_match_regex */
-int _php_mb_match_regex(void *opaque, const char *str, size_t str_len)
+static int _php_mb_match_regex(void *opaque, const char *str, size_t str_len)
{
return pcre_exec((pcre *)opaque, NULL, str, (int)str_len, 0,
0, NULL, 0) = 0;
@@ -926,7 +932,7 @@
/* }}} */
/* {{{ _php_mb_free_regex */
-void _php_mb_free_regex(void *opaque)
+static void _php_mb_free_regex(void *opaque)
{
pcre_free(opaque);
}
@@ -4714,7 +4720,6 @@
/* }}} */
#ifdef ZEND_MULTIBYTE
-
/* {{{ php_mb_set_zend_encoding() */
static int php_mb_set_zend_encoding(TSRMLS_D)
{
@@ -4806,9 +4811,7 @@
/* }}} */
/* {{{ int php_mb_encoding_converter() */
-static int php_mb_encoding_converter(unsigned char **to, size_t *to_length,
- const unsigned char *from, size_t from_length,
- const char *encoding_to, const char *encoding_from TSRMLS_DC)
+static int php_mb_encoding_converter(unsigned char **to, size_t *to_length,
const unsigned char *from, size_t from_length, const char *encoding_to, const
char *encoding_from TSRMLS_DC)
{
mbfl_string string, result, *ret;
enum mbfl_no_encoding from_encoding, to_encoding;
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/zend_multibyte-01.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/mbstring/tests/zend_multibyte-01.phpt
diff -u /dev/null php-src/ext/mbstring/tests/zend_multibyte-01.phpt:1.2
--- /dev/null Sun May 10 21:04:26 2009
+++
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/mbstring mbstring.c /ext/mbstring/tests zend_multibyte-02.phpt zend_multibyte-03.phpt zend_multibyte-04.phpt zend_multibyte-05.phpt zend_multibyte-06.phpt zend_mu
janiSun May 10 21:04:46 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mbstring mbstring.c
/php-src/ext/mbstring/tests zend_multibyte-02.phpt
zend_multibyte-03.phpt
zend_multibyte-04.phpt
zend_multibyte-05.phpt
zend_multibyte-06.phpt
zend_multibyte-07.phpt
zend_multibyte-08.phpt
zend_multibyte-09.phpt
zend_multibyte-10.phpt
zend_multibyte-11.phpt
zend_multibyte-12.phpt
zend_multibyte-13.phpt
zend_multibyte-14.phpt
Log:
- Fixed bug #48200 (compile failure with mbstring.c when
--enable-zend-multibyte is used)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.224.2.22.2.25.2.53r2=1.224.2.22.2.25.2.54diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.53
php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.54
--- php-src/ext/mbstring/mbstring.c:1.224.2.22.2.25.2.53Mon Apr 20
16:07:59 2009
+++ php-src/ext/mbstring/mbstring.c Sun May 10 21:04:46 2009
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: mbstring.c,v 1.224.2.22.2.25.2.53 2009/04/20 16:07:59 jani Exp $ */
+/* $Id: mbstring.c,v 1.224.2.22.2.25.2.54 2009/05/10 21:04:46 jani Exp $ */
/*
* PHP 4 Multibyte String module mbstring
@@ -94,8 +94,14 @@
/* {{{ prototypes */
ZEND_DECLARE_MODULE_GLOBALS(mbstring)
+
static PHP_GINIT_FUNCTION(mbstring);
static PHP_GSHUTDOWN_FUNCTION(mbstring);
+
+static size_t php_mb_oddlen(const unsigned char *string, size_t length, const
char *encoding TSRMLS_DC);
+static int php_mb_encoding_converter(unsigned char **to, size_t *to_length,
const unsigned char *from, size_t from_length, const char *encoding_to, const
char *encoding_from TSRMLS_DC);
+static char* php_mb_encoding_detector(const unsigned char *arg_string, size_t
arg_length, char *arg_list TSRMLS_DC);
+static int php_mb_set_zend_encoding(TSRMLS_D);
/* }}} */
/* {{{ php_mb_default_identify_list */
@@ -866,7 +872,7 @@
#if HAVE_ONIG
/* {{{ _php_mb_compile_regex */
-void *_php_mb_compile_regex(const char *pattern TSRMLS_DC)
+static void *_php_mb_compile_regex(const char *pattern TSRMLS_DC)
{
php_mb_regex_t *retval;
OnigErrorInfo err_info;
@@ -887,7 +893,7 @@
/* }}} */
/* {{{ _php_mb_match_regex */
-int _php_mb_match_regex(void *opaque, const char *str, size_t str_len)
+static int _php_mb_match_regex(void *opaque, const char *str, size_t str_len)
{
return onig_search((php_mb_regex_t *)opaque, (const OnigUChar *)str,
(const OnigUChar*)str + str_len, (const OnigUChar *)str,
@@ -896,14 +902,14 @@
/* }}} */
/* {{{ _php_mb_free_regex */
-void _php_mb_free_regex(void *opaque)
+static void _php_mb_free_regex(void *opaque)
{
onig_free((php_mb_regex_t *)opaque);
}
/* }}} */
#elif HAVE_PCRE || HAVE_BUNDLED_PCRE
/* {{{ _php_mb_compile_regex */
-void *_php_mb_compile_regex(const char *pattern TSRMLS_DC)
+static void *_php_mb_compile_regex(const char *pattern TSRMLS_DC)
{
pcre *retval;
const char *err_str;
@@ -918,7 +924,7 @@
/* }}} */
/* {{{ _php_mb_match_regex */
-int _php_mb_match_regex(void *opaque, const char *str, size_t str_len)
+static int _php_mb_match_regex(void *opaque, const char *str, size_t str_len)
{
return pcre_exec((pcre *)opaque, NULL, str, (int)str_len, 0,
0, NULL, 0) = 0;
@@ -926,7 +932,7 @@
/* }}} */
/* {{{ _php_mb_free_regex */
-void _php_mb_free_regex(void *opaque)
+static void _php_mb_free_regex(void *opaque)
{
pcre_free(opaque);
}
@@ -4720,7 +4726,6 @@
/* }}} */
#ifdef ZEND_MULTIBYTE
-
/* {{{ php_mb_set_zend_encoding() */
static int php_mb_set_zend_encoding(TSRMLS_D)
{
@@ -4812,9 +4817,7 @@
/* }}} */
/* {{{ int php_mb_encoding_converter() */
-static int php_mb_encoding_converter(unsigned char **to, size_t *to_length,
- const unsigned char *from, size_t from_length,
- const char *encoding_to, const char *encoding_from TSRMLS_DC)
+static int php_mb_encoding_converter(unsigned char **to, size_t *to_length,
const unsigned char *from, size_t from_length, const char *encoding_to, const
char *encoding_from TSRMLS_DC)
{
mbfl_string string, result, *ret;
enum mbfl_no_encoding from_encoding, to_encoding;
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/zend_multibyte-02.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/ext/mbstring/tests/zend_multibyte-02.phpt
diff -u php-src/ext/mbstring/tests/zend_multibyte-02.phpt:1.1.2.2
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar/tests phpinfo_001.phpt phpinfo_002.phpt phpinfo_003.phpt phpinfo_004.phpt
felipe Mon May 11 01:51:07 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar/tests phpinfo_001.phpt phpinfo_002.phpt phpinfo_003.phpt phpinfo_004.phpt Log: - Fixed tests http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_001.phpt?r1=1.3.2.3r2=1.3.2.4diff_format=u Index: php-src/ext/phar/tests/phpinfo_001.phpt diff -u php-src/ext/phar/tests/phpinfo_001.phpt:1.3.2.3 php-src/ext/phar/tests/phpinfo_001.phpt:1.3.2.4 --- php-src/ext/phar/tests/phpinfo_001.phpt:1.3.2.3 Fri Aug 1 13:38:47 2008 +++ php-src/ext/phar/tests/phpinfo_001.phpt Mon May 11 01:51:07 2009 @@ -37,7 +37,7 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik. Phar fully realized by Gregory Beaver and Marcus Boerger. -Portions of tar implementation Copyright (c) 2003-2008 Tim Kientzle. +Portions of tar implementation Copyright (c) %d-%d Tim Kientzle. Directive = Local Value = Master Value phar.cache_list = no value = no value phar.readonly = Off = Off @@ -59,7 +59,7 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik. Phar fully realized by Gregory Beaver and Marcus Boerger. -Portions of tar implementation Copyright (c) 2003-2008 Tim Kientzle. +Portions of tar implementation Copyright (c) %d-%d Tim Kientzle. Directive = Local Value = Master Value phar.cache_list = no value = no value phar.readonly = On = Off http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_002.phpt?r1=1.4.2.3r2=1.4.2.4diff_format=u Index: php-src/ext/phar/tests/phpinfo_002.phpt diff -u php-src/ext/phar/tests/phpinfo_002.phpt:1.4.2.3 php-src/ext/phar/tests/phpinfo_002.phpt:1.4.2.4 --- php-src/ext/phar/tests/phpinfo_002.phpt:1.4.2.3 Fri Aug 1 13:38:47 2008 +++ php-src/ext/phar/tests/phpinfo_002.phpt Mon May 11 01:51:07 2009 @@ -35,7 +35,7 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik. Phar fully realized by Gregory Beaver and Marcus Boerger. -Portions of tar implementation Copyright (c) 2003-2008 Tim Kientzle. +Portions of tar implementation Copyright (c) %d-%d Tim Kientzle. Directive = Local Value = Master Value phar.cache_list = no value = no value phar.readonly = On = On http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_003.phpt?r1=1.3.2.6r2=1.3.2.7diff_format=u Index: php-src/ext/phar/tests/phpinfo_003.phpt diff -u php-src/ext/phar/tests/phpinfo_003.phpt:1.3.2.6 php-src/ext/phar/tests/phpinfo_003.phpt:1.3.2.7 --- php-src/ext/phar/tests/phpinfo_003.phpt:1.3.2.6 Sun Jan 25 16:53:05 2009 +++ php-src/ext/phar/tests/phpinfo_003.phpt Mon May 11 01:51:07 2009 @@ -35,7 +35,7 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik. Phar fully realized by Gregory Beaver and Marcus Boerger. -Portions of tar implementation Copyright (c) 2003-200%d Tim Kientzle. +Portions of tar implementation Copyright (c) %d-%d Tim Kientzle. Directive = Local Value = Master Value phar.cache_list = no value = no value phar.readonly = On = On http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_004.phpt?r1=1.3.2.4r2=1.3.2.5diff_format=u Index: php-src/ext/phar/tests/phpinfo_004.phpt diff -u php-src/ext/phar/tests/phpinfo_004.phpt:1.3.2.4 php-src/ext/phar/tests/phpinfo_004.phpt:1.3.2.5 --- php-src/ext/phar/tests/phpinfo_004.phpt:1.3.2.4 Sun Aug 31 19:18:35 2008 +++ php-src/ext/phar/tests/phpinfo_004.phpt Mon May 11 01:51:07 2009 @@ -39,7 +39,7 @@ /tablebr / table border=0 cellpadding=3 width=600 tr class=vtd -Phar based on pear/PHP_Archive, original concept by Davey Shafik.br /Phar fully realized by Gregory Beaver and Marcus Boerger.br /Portions of tar implementation Copyright (c) 2003-2008 Tim Kientzle./td/tr +Phar based on pear/PHP_Archive, original concept by Davey Shafik.br /Phar fully realized by Gregory Beaver and Marcus Boerger.br /Portions of tar implementation Copyright (c) %d-%d Tim Kientzle./td/tr /tablebr / table border=0 cellpadding=3 width=600 tr class=hthDirective/ththLocal Value/ththMaster Value/th/tr @@ -63,7 +63,7 @@ /tablebr / table border=0 cellpadding=3 width=600 tr class=vtd -Phar based on pear/PHP_Archive, original concept by Davey Shafik.br /Phar fully realized by Gregory Beaver and Marcus Boerger.br /Portions of tar implementation Copyright (c) 2003-2008 Tim Kientzle./td/tr +Phar based on pear/PHP_Archive, original concept by Davey Shafik.br /Phar fully realized by Gregory Beaver and Marcus Boerger.br /Portions of tar implementation Copyright (c) %d-%d Tim Kientzle./td/tr /tablebr / table border=0 cellpadding=3 width=600 tr class=hthDirective/ththLocal Value/ththMaster Value/th/tr @@ -72,4 +72,4 @@ trtd class=ephar.require_hash/tdtd class=vOn/tdtd class=vOff/td/tr /tablebr / %abr / -/div/body/html===DONE=== \ No newline at end of file +/div/body/html===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/phar/tests phpinfo_001.phpt phpinfo_002.phpt phpinfo_003.phpt phpinfo_004.phpt
felipe Mon May 11 01:53:01 2009 UTC Modified files: /php-src/ext/phar/tests phpinfo_001.phpt phpinfo_002.phpt phpinfo_003.phpt phpinfo_004.phpt Log: - Fixed tests http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_001.phpt?r1=1.4r2=1.5diff_format=u Index: php-src/ext/phar/tests/phpinfo_001.phpt diff -u php-src/ext/phar/tests/phpinfo_001.phpt:1.4 php-src/ext/phar/tests/phpinfo_001.phpt:1.5 --- php-src/ext/phar/tests/phpinfo_001.phpt:1.4 Fri Aug 1 13:36:18 2008 +++ php-src/ext/phar/tests/phpinfo_001.phpt Mon May 11 01:53:01 2009 @@ -37,7 +37,7 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik. Phar fully realized by Gregory Beaver and Marcus Boerger. -Portions of tar implementation Copyright (c) 2003-2008 Tim Kientzle. +Portions of tar implementation Copyright (c) %d-%d Tim Kientzle. Directive = Local Value = Master Value phar.cache_list = no value = no value phar.readonly = Off = Off @@ -59,7 +59,7 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik. Phar fully realized by Gregory Beaver and Marcus Boerger. -Portions of tar implementation Copyright (c) 2003-2008 Tim Kientzle. +Portions of tar implementation Copyright (c) %d-%d Tim Kientzle. Directive = Local Value = Master Value phar.cache_list = no value = no value phar.readonly = On = Off http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_002.phpt?r1=1.5r2=1.6diff_format=u Index: php-src/ext/phar/tests/phpinfo_002.phpt diff -u php-src/ext/phar/tests/phpinfo_002.phpt:1.5 php-src/ext/phar/tests/phpinfo_002.phpt:1.6 --- php-src/ext/phar/tests/phpinfo_002.phpt:1.5 Fri Aug 1 13:36:18 2008 +++ php-src/ext/phar/tests/phpinfo_002.phpt Mon May 11 01:53:01 2009 @@ -35,7 +35,7 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik. Phar fully realized by Gregory Beaver and Marcus Boerger. -Portions of tar implementation Copyright (c) 2003-2008 Tim Kientzle. +Portions of tar implementation Copyright (c) %d-%d Tim Kientzle. Directive = Local Value = Master Value phar.cache_list = no value = no value phar.readonly = On = On http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_003.phpt?r1=1.7r2=1.8diff_format=u Index: php-src/ext/phar/tests/phpinfo_003.phpt diff -u php-src/ext/phar/tests/phpinfo_003.phpt:1.7 php-src/ext/phar/tests/phpinfo_003.phpt:1.8 --- php-src/ext/phar/tests/phpinfo_003.phpt:1.7 Sat Apr 25 18:02:56 2009 +++ php-src/ext/phar/tests/phpinfo_003.phpt Mon May 11 01:53:01 2009 @@ -35,7 +35,7 @@ Phar based on pear/PHP_Archive, original concept by Davey Shafik. Phar fully realized by Gregory Beaver and Marcus Boerger. -Portions of tar implementation Copyright (c) 2003-200%d Tim Kientzle. +Portions of tar implementation Copyright (c) %d-%d Tim Kientzle. Directive = Local Value = Master Value phar.cache_list = no value = no value phar.readonly = On = On http://cvs.php.net/viewvc.cgi/php-src/ext/phar/tests/phpinfo_004.phpt?r1=1.5r2=1.6diff_format=u Index: php-src/ext/phar/tests/phpinfo_004.phpt diff -u php-src/ext/phar/tests/phpinfo_004.phpt:1.5 php-src/ext/phar/tests/phpinfo_004.phpt:1.6 --- php-src/ext/phar/tests/phpinfo_004.phpt:1.5 Sun Aug 31 20:54:27 2008 +++ php-src/ext/phar/tests/phpinfo_004.phpt Mon May 11 01:53:01 2009 @@ -39,7 +39,7 @@ /tablebr / table border=0 cellpadding=3 width=600 tr class=vtd -Phar based on pear/PHP_Archive, original concept by Davey Shafik.br /Phar fully realized by Gregory Beaver and Marcus Boerger.br /Portions of tar implementation Copyright (c) 2003-2008 Tim Kientzle./td/tr +Phar based on pear/PHP_Archive, original concept by Davey Shafik.br /Phar fully realized by Gregory Beaver and Marcus Boerger.br /Portions of tar implementation Copyright (c) %d-%d Tim Kientzle./td/tr /tablebr / table border=0 cellpadding=3 width=600 tr class=hthDirective/ththLocal Value/ththMaster Value/th/tr @@ -63,7 +63,7 @@ /tablebr / table border=0 cellpadding=3 width=600 tr class=vtd -Phar based on pear/PHP_Archive, original concept by Davey Shafik.br /Phar fully realized by Gregory Beaver and Marcus Boerger.br /Portions of tar implementation Copyright (c) 2003-2008 Tim Kientzle./td/tr +Phar based on pear/PHP_Archive, original concept by Davey Shafik.br /Phar fully realized by Gregory Beaver and Marcus Boerger.br /Portions of tar implementation Copyright (c) %d-%d Tim Kientzle./td/tr /tablebr / table border=0 cellpadding=3 width=600 tr class=hthDirective/ththLocal Value/ththMaster Value/th/tr @@ -72,4 +72,4 @@ trtd class=ephar.require_hash/tdtd class=vOn/tdtd class=vOff/td/tr /tablebr / %abr / -/div/body/html===DONE=== \ No newline at end of file +/div/body/html===DONE=== -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/odbc/tests config.inc odbc_exec_001.phpt skipif.inc
felipe Mon May 11 03:09:13 2009 UTC
Added files:
/php-src/ext/odbc/tests config.inc odbc_exec_001.phpt skipif.inc
Log:
- Starting tests for this extension
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/tests/config.inc?view=markuprev=1.1
Index: php-src/ext/odbc/tests/config.inc
+++ php-src/ext/odbc/tests/config.inc
?php
putenv('ODBCINI=/etc/odbc.ini');
putenv('ODBCSYSINI=/etc');
$dsn = 'myodbc3';
$user = 'root';
$pass = '';
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/tests/odbc_exec_001.phpt?view=markuprev=1.1
Index: php-src/ext/odbc/tests/odbc_exec_001.phpt
+++ php-src/ext/odbc/tests/odbc_exec_001.phpt
--TEST--
odbc_exec(): Basic test
--SKIPIF--
?php include 'skipif.inc'; ?
--FILE--
?php
include 'config.inc';
$conn = odbc_connect($dsn, $user, $pass);
odbc_exec($conn, 'foo', 'bar');
odbc_exec($conn, 'foo');
odbc_exec($conn, '', '');
odbc_exec($conn, '');
odbc_exec($conn, 1, 1);
odbc_exec($conn, 1);
odbc_exec($conn, NULL, NULL);
odbc_exec($conn, NULL);
?
--EXPECTF--
Warning: odbc_exec() expects parameter 3 to be long, %unicode_string_optional%
given in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec() expects parameter 3 to be long, %unicode_string_optional%
given in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/tests/skipif.inc?view=markuprev=1.1
Index: php-src/ext/odbc/tests/skipif.inc
+++ php-src/ext/odbc/tests/skipif.inc
?php
if (!extension_loaded('odbc')) die('skip');
include 'config.inc';
$conn = @odbc_connect($dsn, $user, $pass);
if (!$conn) {
die('skip could not connect');
}
--
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/odbc/tests config.inc odbc_exec_001.phpt skipif.inc
felipe Mon May 11 03:09:59 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/odbc/tests config.inc odbc_exec_001.phpt skipif.inc
Log:
- Starting tests for this extension
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/tests/config.inc?view=markuprev=1.1
Index: php-src/ext/odbc/tests/config.inc
+++ php-src/ext/odbc/tests/config.inc
?php
putenv('ODBCINI=/etc/odbc.ini');
putenv('ODBCSYSINI=/etc');
$dsn = 'myodbc3';
$user = 'root';
$pass = '';
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/tests/odbc_exec_001.phpt?view=markuprev=1.1
Index: php-src/ext/odbc/tests/odbc_exec_001.phpt
+++ php-src/ext/odbc/tests/odbc_exec_001.phpt
--TEST--
odbc_exec(): Basic test
--SKIPIF--
?php include 'skipif.inc'; ?
--FILE--
?php
include 'config.inc';
$conn = odbc_connect($dsn, $user, $pass);
odbc_exec($conn, 'foo', 'bar');
odbc_exec($conn, 'foo');
odbc_exec($conn, '', '');
odbc_exec($conn, '');
odbc_exec($conn, 1, 1);
odbc_exec($conn, 1);
odbc_exec($conn, NULL, NULL);
odbc_exec($conn, NULL);
?
--EXPECTF--
Warning: odbc_exec() expects parameter 3 to be long, %unicode_string_optional%
given in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec() expects parameter 3 to be long, %unicode_string_optional%
given in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/tests/skipif.inc?view=markuprev=1.1
Index: php-src/ext/odbc/tests/skipif.inc
+++ php-src/ext/odbc/tests/skipif.inc
?php
if (!extension_loaded('odbc')) die('skip');
include 'config.inc';
$conn = @odbc_connect($dsn, $user, $pass);
if (!$conn) {
die('skip could not connect');
}
--
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/odbc/tests config.inc odbc_exec_001.phpt skipif.inc
felipe Mon May 11 03:10:31 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/odbc/tests config.inc odbc_exec_001.phpt skipif.inc
Log:
- Starting tests for this extension
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/tests/config.inc?view=markuprev=1.1
Index: php-src/ext/odbc/tests/config.inc
+++ php-src/ext/odbc/tests/config.inc
?php
putenv('ODBCINI=/etc/odbc.ini');
putenv('ODBCSYSINI=/etc');
$dsn = 'myodbc3';
$user = 'root';
$pass = '';
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/tests/odbc_exec_001.phpt?view=markuprev=1.1
Index: php-src/ext/odbc/tests/odbc_exec_001.phpt
+++ php-src/ext/odbc/tests/odbc_exec_001.phpt
--TEST--
odbc_exec(): Basic test
--SKIPIF--
?php include 'skipif.inc'; ?
--FILE--
?php
include 'config.inc';
$conn = odbc_connect($dsn, $user, $pass);
odbc_exec($conn, 'foo', 'bar');
odbc_exec($conn, 'foo');
odbc_exec($conn, '', '');
odbc_exec($conn, '');
odbc_exec($conn, 1, 1);
odbc_exec($conn, 1);
odbc_exec($conn, NULL, NULL);
odbc_exec($conn, NULL);
?
--EXPECTF--
Warning: odbc_exec() expects parameter 3 to be long, %unicode_string_optional%
given in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec() expects parameter 3 to be long, %unicode_string_optional%
given in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
Warning: odbc_exec(): SQL error: %s in %s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/odbc/tests/skipif.inc?view=markuprev=1.1
Index: php-src/ext/odbc/tests/skipif.inc
+++ php-src/ext/odbc/tests/skipif.inc
?php
if (!extension_loaded('odbc')) die('skip');
include 'config.inc';
$conn = @odbc_connect($dsn, $user, $pass);
if (!$conn) {
die('skip could not connect');
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/file file_put_contents_variation2.phpt fwrite_variation5.phpt
janiMon May 11 05:01:17 2009 UTC Modified files: /php-src/ext/standard/tests/filefile_put_contents_variation2.phpt fwrite_variation5.phpt Log: -fix path http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation2.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/file/file_put_contents_variation2.phpt diff -u php-src/ext/standard/tests/file/file_put_contents_variation2.phpt:1.2 php-src/ext/standard/tests/file/file_put_contents_variation2.phpt:1.3 --- php-src/ext/standard/tests/file/file_put_contents_variation2.phpt:1.2 Wed Nov 26 17:48:40 2008 +++ php-src/ext/standard/tests/file/file_put_contents_variation2.phpt Mon May 11 05:01:17 2009 @@ -23,7 +23,7 @@ // Initialise function arguments not being substituted (if any) -$filename = 'fwriteVar5.tmp'; +$filename = __DIR__ . '/fwriteVar5.tmp'; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite_variation5.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/file/fwrite_variation5.phpt diff -u php-src/ext/standard/tests/file/fwrite_variation5.phpt:1.2 php-src/ext/standard/tests/file/fwrite_variation5.phpt:1.3 --- php-src/ext/standard/tests/file/fwrite_variation5.phpt:1.2 Wed Nov 26 17:48:40 2008 +++ php-src/ext/standard/tests/file/fwrite_variation5.phpt Mon May 11 05:01:17 2009 @@ -23,7 +23,7 @@ // Initialise function arguments not being substituted (if any) -$filename = 'fwriteVar5.tmp'; +$filename = __DIR__ . '/fwriteVar5.tmp'; -- 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/file file_put_contents_variation2.phpt fwrite_variation5.phpt
janiMon May 11 05:01:37 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filefile_put_contents_variation2.phpt fwrite_variation5.phpt Log: - Fix paths http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation2.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/file/file_put_contents_variation2.phpt diff -u php-src/ext/standard/tests/file/file_put_contents_variation2.phpt:1.1.4.2 php-src/ext/standard/tests/file/file_put_contents_variation2.phpt:1.1.4.3 --- php-src/ext/standard/tests/file/file_put_contents_variation2.phpt:1.1.4.2 Wed Nov 26 10:10:17 2008 +++ php-src/ext/standard/tests/file/file_put_contents_variation2.phpt Mon May 11 05:01:37 2009 @@ -23,7 +23,7 @@ // Initialise function arguments not being substituted (if any) -$filename = 'fwriteVar5.tmp'; +$filename = __DIR__ . '/fwriteVar5.tmp'; @@ -164,4 +164,4 @@ --undefined var-- --unset var-- -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite_variation5.phpt?r1=1.1.4.2r2=1.1.4.3diff_format=u Index: php-src/ext/standard/tests/file/fwrite_variation5.phpt diff -u php-src/ext/standard/tests/file/fwrite_variation5.phpt:1.1.4.2 php-src/ext/standard/tests/file/fwrite_variation5.phpt:1.1.4.3 --- php-src/ext/standard/tests/file/fwrite_variation5.phpt:1.1.4.2 Wed Nov 26 10:10:17 2008 +++ php-src/ext/standard/tests/file/fwrite_variation5.phpt Mon May 11 05:01:37 2009 @@ -23,7 +23,7 @@ // Initialise function arguments not being substituted (if any) -$filename = 'fwriteVar5.tmp'; +$filename = __DIR__ . '/fwriteVar5.tmp'; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file file_put_contents_variation2.phpt fwrite_variation5.phpt
janiMon May 11 05:01:48 2009 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filefile_put_contents_variation2.phpt fwrite_variation5.phpt Log: - Fix paths http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_put_contents_variation2.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/file/file_put_contents_variation2.phpt diff -u php-src/ext/standard/tests/file/file_put_contents_variation2.phpt:1.1.2.1 php-src/ext/standard/tests/file/file_put_contents_variation2.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/file_put_contents_variation2.phpt:1.1.2.1 Tue Nov 25 11:31:25 2008 +++ php-src/ext/standard/tests/file/file_put_contents_variation2.phpt Mon May 11 05:01:48 2009 @@ -23,7 +23,7 @@ // Initialise function arguments not being substituted (if any) -$filename = 'fwriteVar5.tmp'; +$filename = dirname(__FILE__) . '/fwriteVar5.tmp'; @@ -164,4 +164,4 @@ --undefined var-- --unset var-- -===DONE=== \ No newline at end of file +===DONE=== http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fwrite_variation5.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/file/fwrite_variation5.phpt diff -u php-src/ext/standard/tests/file/fwrite_variation5.phpt:1.1.2.1 php-src/ext/standard/tests/file/fwrite_variation5.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/fwrite_variation5.phpt:1.1.2.1 Tue Nov 25 11:31:24 2008 +++ php-src/ext/standard/tests/file/fwrite_variation5.phpt Mon May 11 05:01:48 2009 @@ -23,7 +23,7 @@ // Initialise function arguments not being substituted (if any) -$filename = 'fwriteVar5.tmp'; +$filename = dirname(__FILE__) . '/fwriteVar5.tmp'; -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
