[PHP-CVS] Re: cvs: CVSROOT / loginfo.pl
Rasmus Lerdorf wrote: rasmusSat Feb 10 18:36:05 2007 UTC Modified files: /CVSROOT loginfo.pl Log: Revert bad idea I don't know why it happened and am grateful it was reverted, because it immediately left some queasy feeling. Thanks, -- Michael -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/imap config.m4
tony2001Sun Feb 11 09:25:25 2007 UTC Modified files: /php-src/ext/imap config.m4 Log: fix typos http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.75r2=1.76diff_format=u Index: php-src/ext/imap/config.m4 diff -u php-src/ext/imap/config.m4:1.75 php-src/ext/imap/config.m4:1.76 --- php-src/ext/imap/config.m4:1.75 Tue Jan 23 12:38:40 2007 +++ php-src/ext/imap/config.m4 Sun Feb 11 09:25:25 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.75 2007/01/23 12:38:40 bjori Exp $ +dnl $Id: config.m4,v 1.76 2007/02/11 09:25:25 tony2001 Exp $ dnl AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then @@ -137,7 +137,7 @@ if test $ac_cv_utf8_mime2text = new; then AC_DEFINE(HAVE_NEW_MIME2TEXT, 1, [Whether utf8_mime2text() has new signature]) fi -CFLAGS=$old_CPPFLAGS +CFLAGS=$old_CFLAGS old_CFLAGS=$CFLAGS CFLAGS=-I$IMAP_INC_DIR @@ -152,7 +152,7 @@ ac_cv_u8t_canonical=no ]) ) -CFLAGS=$old_CPPFLAGS +CFLAGS=$old_CFLAGS if test $ac_cv_u8t_canonical = no test $ac_cv_utf8_mime2text = new; then AC_MSG_ERROR([utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information.]) -- 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/imap config.m4
tony2001Sun Feb 11 09:25:32 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/imap config.m4 Log: MFH http://cvs.php.net/viewvc.cgi/php-src/ext/imap/config.m4?r1=1.69.4.6r2=1.69.4.7diff_format=u Index: php-src/ext/imap/config.m4 diff -u php-src/ext/imap/config.m4:1.69.4.6 php-src/ext/imap/config.m4:1.69.4.7 --- php-src/ext/imap/config.m4:1.69.4.6 Tue Jan 23 12:37:21 2007 +++ php-src/ext/imap/config.m4 Sun Feb 11 09:25:32 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.69.4.6 2007/01/23 12:37:21 bjori Exp $ +dnl $Id: config.m4,v 1.69.4.7 2007/02/11 09:25:32 tony2001 Exp $ dnl AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then @@ -137,7 +137,7 @@ if test $ac_cv_utf8_mime2text = new; then AC_DEFINE(HAVE_NEW_MIME2TEXT, 1, [Whether utf8_mime2text() has new signature]) fi -CFLAGS=$old_CPPFLAGS +CFLAGS=$old_CFLAGS old_CFLAGS=$CFLAGS CFLAGS=-I$IMAP_INC_DIR @@ -152,7 +152,7 @@ ac_cv_u8t_canonical=no ]) ) -CFLAGS=$old_CPPFLAGS +CFLAGS=$old_CFLAGS if test $ac_cv_u8t_canonical = no test $ac_cv_utf8_mime2text = new; then AC_MSG_ERROR([utf8_mime2text() has new signature, but U8T_CANONICAL is missing. This should not happen. Check config.log for additional information.]) -- 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/gd gd.c
pajoye Sun Feb 11 11:11:49 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/ext/gd gd.c
Log:
- Fixed bug #40428, imagepstext() doesn't accept optional parameter
(Pierre)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.529r2=1.2027.2.547.2.530diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.529 php-src/NEWS:1.2027.2.547.2.530
--- php-src/NEWS:1.2027.2.547.2.529 Sat Feb 10 20:52:42 2007
+++ php-src/NEWSSun Feb 11 11:11:48 2007
@@ -6,6 +6,7 @@
- Add --ri switch to CLI which allows to check extension information. (Marcus)
- Fixed bug #40431 (dynamic properties may cause crash in ReflectionProperty
methods). (Tony)
+- Fixed bug #40428, imagepstext() doesn't accept optional parameter (Pierre)
- Fixed bug #40410 (ext/posix does not compile on MacOS 10.3.9). (Tony)
- Fixed bug #39836 (SplObjectStorage empty after unserialize). (Marcus)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.14r2=1.312.2.20.2.15diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.14 php-src/ext/gd/gd.c:1.312.2.20.2.15
--- php-src/ext/gd/gd.c:1.312.2.20.2.14 Mon Jan 8 22:52:22 2007
+++ php-src/ext/gd/gd.c Sun Feb 11 11:11:48 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.312.2.20.2.14 2007/01/08 22:52:22 nlopess Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.15 2007/02/11 11:11:48 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -4338,11 +4338,6 @@
T1_TMATRIX *transform = NULL;
char *str;
int str_len;
- int argc = ZEND_NUM_ARGS();
-
- if (argc != 8 argc != 12) {
- ZEND_WRONG_PARAM_COUNT();
- }
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rsrl|lldl,
img, str, str_len, fnt, size, _fg, _bg, x, y, space, width, angle,
aa_steps) == FAILURE) {
return;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/gd gd.c
pajoye Sun Feb 11 11:13:41 2007 UTC
Modified files:
/php-src/ext/gd gd.c
Log:
- MFB: Fixed bug #40428, imagepstext() doesn't accept optional parameter
(Pierre)
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.365r2=1.366diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.365 php-src/ext/gd/gd.c:1.366
--- php-src/ext/gd/gd.c:1.365 Mon Jan 8 22:56:25 2007
+++ php-src/ext/gd/gd.c Sun Feb 11 11:13:40 2007
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: gd.c,v 1.365 2007/01/08 22:56:25 nlopess Exp $ */
+/* $Id: gd.c,v 1.366 2007/02/11 11:13:40 pajoye Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3807,11 +3807,6 @@
T1_TMATRIX *transform = NULL;
char *str;
int str_len;
- int argc = ZEND_NUM_ARGS();
-
- if (argc != 8 argc != 12) {
- ZEND_WRONG_PARAM_COUNT();
- }
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rsrl|lldl,
img, str, str_len, fnt, size, _fg, _bg, x, y, space, width, angle,
aa_steps) == FAILURE) {
return;
--
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/tidy tidy.c /ext/tidy/tests 028.phpt
nlopess Sun Feb 11 16:07:31 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/tidy/tests 028.phpt
Modified files:
/php-srcNEWS
/php-src/ext/tidy tidy.c
Log:
merge the tidyNode::getParent() patch from HEAD
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.530r2=1.2027.2.547.2.531diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.530 php-src/NEWS:1.2027.2.547.2.531
--- php-src/NEWS:1.2027.2.547.2.530 Sun Feb 11 11:11:48 2007
+++ php-src/NEWSSun Feb 11 16:07:30 2007
@@ -4,6 +4,7 @@
- Upgraded SQLite 3 to version 3.3.12 (Ilia)
- Upgraded PCRE to version 7.0 (Nuno)
- Add --ri switch to CLI which allows to check extension information. (Marcus)
+- Added tidyNode::getParent() method (John, Nuno)
- Fixed bug #40431 (dynamic properties may cause crash in ReflectionProperty
methods). (Tony)
- Fixed bug #40428, imagepstext() doesn't accept optional parameter (Pierre)
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tidy.c?r1=1.66.2.8.2.21r2=1.66.2.8.2.22diff_format=u
Index: php-src/ext/tidy/tidy.c
diff -u php-src/ext/tidy/tidy.c:1.66.2.8.2.21
php-src/ext/tidy/tidy.c:1.66.2.8.2.22
--- php-src/ext/tidy/tidy.c:1.66.2.8.2.21 Tue Jan 23 19:23:29 2007
+++ php-src/ext/tidy/tidy.c Sun Feb 11 16:07:30 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: tidy.c,v 1.66.2.8.2.21 2007/01/23 19:23:29 nlopess Exp $ */
+/* $Id: tidy.c,v 1.66.2.8.2.22 2007/02/11 16:07:30 nlopess Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -267,6 +267,7 @@
static TIDY_NODE_METHOD(isJste);
static TIDY_NODE_METHOD(isAsp);
static TIDY_NODE_METHOD(isPhp);
+static TIDY_NODE_METHOD(getParent);
/* }}} */
ZEND_DECLARE_MODULE_GLOBALS(tidy)
@@ -341,6 +342,7 @@
TIDY_NODE_ME(isJste, NULL)
TIDY_NODE_ME(isAsp, NULL)
TIDY_NODE_ME(isPhp, NULL)
+ TIDY_NODE_ME(getParent, NULL)
{NULL, NULL, NULL}
};
@@ -990,7 +992,7 @@
php_info_print_table_start();
php_info_print_table_header(2, Tidy support, enabled);
php_info_print_table_row(2, libTidy Release, (char
*)tidyReleaseDate());
- php_info_print_table_row(2, Extension Version,
PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.66.2.8.2.21 2007/01/23 19:23:29
nlopess Exp $));
+ php_info_print_table_row(2, Extension Version,
PHP_TIDY_MODULE_VERSION ($Id: tidy.c,v 1.66.2.8.2.22 2007/02/11 16:07:30
nlopess Exp $));
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -1659,6 +1661,29 @@
}
/* }}} */
+/* {{{ proto tidyNode tidyNode::getParent()
+ Returns the parent node if available or NULL */
+static TIDY_NODE_METHOD(getParent)
+{
+ TidyNodeparent_node;
+ PHPTidyObj *newobj;
+ TIDY_FETCH_ONLY_OBJECT;
+
+ parent_node = tidyGetParent(obj-node);
+ if(parent_node) {
+ tidy_instanciate(tidy_ce_node, return_value TSRMLS_CC);
+ newobj = (PHPTidyObj *)
zend_object_store_get_object(return_value TSRMLS_CC);
+ newobj-node = parent_node;
+ newobj-type = is_node;
+ newobj-ptdoc = obj-ptdoc;
+ newobj-ptdoc-ref_count++;
+ tidy_add_default_properties(newobj, is_node TSRMLS_CC);
+ } else {
+ ZVAL_NULL(return_value);
+ }
+}
+/* }}} */
+
static void _php_tidy_register_nodetypes(INIT_FUNC_ARGS)
{
TIDY_NODE_CONST(ROOT, Root);
http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tests/028.phpt?view=markuprev=1.1
Index: php-src/ext/tidy/tests/028.phpt
+++ php-src/ext/tidy/tests/028.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/tidy/tests 019.phpt 028.phpt
nlopess Sun Feb 11 16:12:00 2007 UTC Modified files: /php-src/ext/tidy/tests 028.phpt 019.phpt Log: sync tests with php 5.2 http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tests/028.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/tidy/tests/028.phpt diff -u /dev/null php-src/ext/tidy/tests/028.phpt:1.2 --- /dev/null Sun Feb 11 16:12:00 2007 +++ php-src/ext/tidy/tests/028.phpt Sun Feb 11 16:12:00 2007 @@ -0,0 +1,19 @@ +--TEST-- +tidyNode::getParent() +--SKIPIF-- +?php if (!extension_loaded(tidy)) print skip; ? +--FILE-- +?php +$x = tidy_parse_string(bodydivContent/div/body); +var_dump($x-body()-child[0]-name); +var_dump($x-body()-child[0]-getParent()-name); +var_dump($x-root()-getParent()); +? +--EXPECT-- +string(3) div +string(4) body +NULL +--UEXPECT-- +unicode(3) div +unicode(4) body +NULL http://cvs.php.net/viewvc.cgi/php-src/ext/tidy/tests/019.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/tidy/tests/019.phpt diff -u php-src/ext/tidy/tests/019.phpt:1.2 php-src/ext/tidy/tests/019.phpt:1.3 --- php-src/ext/tidy/tests/019.phpt:1.2 Thu Feb 8 16:37:52 2007 +++ php-src/ext/tidy/tests/019.phpt Sun Feb 11 16:12:00 2007 @@ -1,16 +1,55 @@ --TEST-- -Test getParent() +tidy_repair_*() and invalid parameters --SKIPIF-- ?php if (!extension_loaded(tidy)) print skip; ? --FILE-- ?php -$x = tidy_parse_string(bodydivContent/div/body); -var_dump($x-body()-child[0]-name); -var_dump($x-body()-child[0]-getParent()-name); + +$l = 1; +$s = ; +$a = array(); + +tidy_repair_string($s, $l, $l, $l); +tidy_repair_string($s, $s, $s, $s); +tidy_repair_string($l, $l, $l ,$l); +tidy_repair_string($a, $a, $a, $a); + +tidy_repair_file($s, $l, $l, $l); +tidy_repair_file($s, $s, $s, $s); +tidy_repair_file($l, $l, $l ,$l); +tidy_repair_file($a, $a, $a, $a); + +echo Done\n; ? ---EXPECT-- -string(3) div -string(4) body ---UEXPECT-- -unicode(3) div -unicode(4) body +--EXPECTF-- +Warning: tidy_repair_string(): Could not load configuration file '1' in %s on line %d + +Warning: tidy_repair_string(): Could not set encoding '1' in %s on line %d + +Warning: tidy_repair_string(): Could not load configuration file '' in %s on line %d + +Warning: tidy_repair_string(): Could not load configuration file '1' in %s on line %d + +Warning: tidy_repair_string(): Could not set encoding '1' in %s on line %d + +Warning: tidy_repair_string() expects parameter 1 to be string, array given in %s on line %d + +Warning: tidy_repair_file() expects parameter 1 to be string, array given in %s on line %d +Done +--UEXPECTF-- +Warning: tidy_repair_string(): Could not load configuration file '1' in %s019.php on line 7 + +Warning: tidy_repair_string(): Could not set encoding '1' in %s019.php on line 7 + +Warning: tidy_repair_string() expects parameter 4 to be boolean, Unicode string given in %s019.php on line 8 + +Warning: tidy_repair_string(): Could not load configuration file '1' in %s019.php on line 9 + +Warning: tidy_repair_string(): Could not set encoding '1' in %s019.php on line 9 + +Warning: tidy_repair_string() expects parameter 1 to be binary string, array given in %s019.php on line 10 + +Warning: tidy_repair_file() expects parameter 4 to be boolean, Unicode string given in %s019.php on line 13 + +Warning: tidy_repair_file() expects parameter 1 to be binary string, array given in %s019.php on line 15 +Done -- 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 bug40374.phpt
tony2001Sun Feb 11 20:06:05 2007 UTC Modified files: /php-src/ext/standard/tests/filebug40374.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug40374.phpt?r1=1.1r2=1.2diff_format=u Index: php-src/ext/standard/tests/file/bug40374.phpt diff -u php-src/ext/standard/tests/file/bug40374.phpt:1.1 php-src/ext/standard/tests/file/bug40374.phpt:1.2 --- php-src/ext/standard/tests/file/bug40374.phpt:1.1 Wed Feb 7 21:12:48 2007 +++ php-src/ext/standard/tests/file/bug40374.phpt Sun Feb 11 20:06:05 2007 @@ -13,8 +13,8 @@ echo Done\n; ? --EXPECTF-- -string(%d) /tmp/test_%s +string(%d) %s Done --UEXPECTF-- -unicode(%d) /tmp/test_%s +unicode(%d) %s Done -- 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 bug40374.phpt
tony2001Sun Feb 11 20:06:19 2007 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard/tests/filebug40374.phpt Log: fix test http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/bug40374.phpt?r1=1.1.2.2r2=1.1.2.3diff_format=u Index: php-src/ext/standard/tests/file/bug40374.phpt diff -u php-src/ext/standard/tests/file/bug40374.phpt:1.1.2.2 php-src/ext/standard/tests/file/bug40374.phpt:1.1.2.3 --- php-src/ext/standard/tests/file/bug40374.phpt:1.1.2.2 Wed Feb 7 21:13:01 2007 +++ php-src/ext/standard/tests/file/bug40374.phpt Sun Feb 11 20:06:19 2007 @@ -13,5 +13,5 @@ echo Done\n; ? --EXPECTF-- -string(%d) /tmp/test_%s +string(%d) %s Done -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /tests/lang bug30638.phpt
tony2001Sun Feb 11 20:12:46 2007 UTC
Modified files:
/php-src/tests/lang bug30638.phpt
Log:
add a note
http://cvs.php.net/viewvc.cgi/php-src/tests/lang/bug30638.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/tests/lang/bug30638.phpt
diff -u php-src/tests/lang/bug30638.phpt:1.3
php-src/tests/lang/bug30638.phpt:1.4
--- php-src/tests/lang/bug30638.phpt:1.3Wed Dec 6 13:11:02 2006
+++ php-src/tests/lang/bug30638.phptSun Feb 11 20:12:45 2007
@@ -1,5 +1,5 @@
--TEST--
-Bug #30638 (localeconv returns wrong LC_NUMERIC settings)
+Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS
X)
--SKIPIF--
?php # try to activate a german locale
if (setlocale(LC_NUMERIC, de_DE, de, german, ge) === FALSE) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/standard/tests/strings str_ireplace.phpt
tony2001Sun Feb 11 20:56:17 2007 UTC
Added files:
/php-src/ext/standard/tests/strings str_ireplace.phpt
Log:
new test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_ireplace.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/str_ireplace.phpt
+++ php-src/ext/standard/tests/strings/str_ireplace.phpt
--TEST--
str_ireplace() tests
--FILE--
?php
var_dump(str_ireplace());
var_dump(str_ireplace());
var_dump(str_ireplace(, ));
var_dump(str_ireplace(, , ));
var_dump(str_ireplace(tt, a, TTT));
var_dump(str_ireplace(tt, a, TTT, $count));
var_dump($count);
var_dump(str_ireplace(tt, aa, TTT));
var_dump(str_ireplace(tt, aa, TTT, $count));
var_dump($count);
var_dump(str_ireplace(tt, aaa, TTT));
var_dump(str_ireplace(tt, aaa, TTT, $count));
var_dump($count);
var_dump(str_ireplace(tt, aaa, TTT));
var_dump(str_ireplace(tt, aaa, TTT, $count));
var_dump($count);
var_dump(str_ireplace(array(tt, tt), aaa, TTT));
var_dump(str_ireplace(array(tt, tt), array(aaa), TTT));
var_dump(str_ireplace(array(tt, y), array(aaa, bbb),
TTT));
var_dump(str_ireplace(array(tt, tt), aaa, TTT));
var_dump(str_ireplace(array(tt, tt), array(aaa), TTT));
var_dump(str_ireplace(array(tt, y), array(aaa, bbb),
TTT));
var_dump(str_ireplace(array(tt, y), array(aaa, bbb),
array(TTT, aayyaayasdayYahsdYYY)));
var_dump(str_ireplace(array(tt, y), array(aaa, bbb),
array(key=TTT, test=aayyaayasdayYahsdYYY)));
var_dump(str_ireplace(array(t=tt, y=y), array(a=aaa,
b=bbb), array(key=TTT, test=aayyaayasdayYahsdYYY)));
/* separate testcase for str_ireplace() off-by-one */
$Data = Change tracking and management software designed to watch
for abnormal system behavior.\nSuggest features, report bugs, or ask
questions here.;
var_dump($Data = str_ireplace(\r\n, br, $Data));
var_dump($Data = str_ireplace(\n, br, $Data));
echo Done\n;
?
--EXPECTF--
Warning: str_ireplace() expects at least 3 parameters, 0 given in %s on line %d
NULL
Warning: str_ireplace() expects at least 3 parameters, 1 given in %s on line %d
NULL
Warning: str_ireplace() expects at least 3 parameters, 2 given in %s on line %d
NULL
string(0)
string(8) aaaT
string(8) aaaT
int(7)
string(15) aaT
string(15) aaT
int(7)
string(22) aT
string(22) aT
int(7)
string(22) aT
string(22) aT
int(7)
string(22) aT
string(22) aT
string(22) aT
string(22) aT
string(22) aT
string(22) aT
array(2) {
[0]=
string(22) aT
[1]=
string(36) aabbaabbbasdabbahsdb
}
array(2) {
[key]=
string(22) aT
[test]=
string(36) aabbaabbbasdabbahsdb
}
array(2) {
[key]=
string(22) aT
[test]=
string(36) aabbaabbbasdabbahsdb
}
string(143) Change tracking and management software designed to watch
for abnormal system behavior.
Suggest features, report bugs, or ask
questions here.
string(152) Change tracking and management software designed to watchbr
for abnormal system behavior.brSuggest features, report bugs, or askbr
questions here.
Done
--UEXPECTF--
Warning: str_ireplace() expects at least 3 parameters, 0 given in %s on line %d
NULL
Warning: str_ireplace() expects at least 3 parameters, 1 given in %s on line %d
NULL
Warning: str_ireplace() expects at least 3 parameters, 2 given in %s on line %d
NULL
unicode(0)
unicode(8) aaaT
unicode(8) aaaT
int(7)
unicode(15) aaT
unicode(15) aaT
int(7)
unicode(22) aT
unicode(22) aT
int(7)
unicode(22) aT
unicode(22) aT
int(7)
unicode(22) aT
unicode(22) aT
unicode(22) aT
unicode(22) aT
unicode(22) aT
unicode(22) aT
array(2) {
[0]=
unicode(22) aT
[1]=
unicode(36) aabbaabbbasdabbahsdb
}
array(2) {
[ukey]=
unicode(22) aT
[utest]=
unicode(36) aabbaabbbasdabbahsdb
}
array(2) {
[ukey]=
unicode(22) aT
[utest]=
unicode(36) aabbaabbbasdabbahsdb
}
unicode(143) Change tracking and management software designed to watch
for abnormal system behavior.
Suggest features, report bugs, or ask
questions here.
unicode(152) Change tracking and management software designed to watchbr
for abnormal system behavior.brSuggest features, report bugs, or askbr
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/strings str_ireplace.phpt
tony2001Sun Feb 11 20:56:46 2007 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings str_ireplace.phpt
Log:
add test
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/str_ireplace.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/strings/str_ireplace.phpt
+++ php-src/ext/standard/tests/strings/str_ireplace.phpt
--TEST--
str_ireplace() tests
--FILE--
?php
var_dump(str_ireplace());
var_dump(str_ireplace());
var_dump(str_ireplace(, ));
var_dump(str_ireplace(, , ));
var_dump(str_ireplace(tt, a, TTT));
var_dump(str_ireplace(tt, a, TTT, $count));
var_dump($count);
var_dump(str_ireplace(tt, aa, TTT));
var_dump(str_ireplace(tt, aa, TTT, $count));
var_dump($count);
var_dump(str_ireplace(tt, aaa, TTT));
var_dump(str_ireplace(tt, aaa, TTT, $count));
var_dump($count);
var_dump(str_ireplace(tt, aaa, TTT));
var_dump(str_ireplace(tt, aaa, TTT, $count));
var_dump($count);
var_dump(str_ireplace(array(tt, tt), aaa, TTT));
var_dump(str_ireplace(array(tt, tt), array(aaa), TTT));
var_dump(str_ireplace(array(tt, y), array(aaa, bbb),
TTT));
var_dump(str_ireplace(array(tt, tt), aaa, TTT));
var_dump(str_ireplace(array(tt, tt), array(aaa), TTT));
var_dump(str_ireplace(array(tt, y), array(aaa, bbb),
TTT));
var_dump(str_ireplace(array(tt, y), array(aaa, bbb),
array(TTT, aayyaayasdayYahsdYYY)));
var_dump(str_ireplace(array(tt, y), array(aaa, bbb),
array(key=TTT, test=aayyaayasdayYahsdYYY)));
var_dump(str_ireplace(array(t=tt, y=y), array(a=aaa,
b=bbb), array(key=TTT, test=aayyaayasdayYahsdYYY)));
/* separate testcase for str_ireplace() off-by-one */
$Data = Change tracking and management software designed to watch
for abnormal system behavior.\nSuggest features, report bugs, or ask
questions here.;
var_dump($Data = str_ireplace(\r\n, br, $Data));
var_dump($Data = str_ireplace(\n, br, $Data));
echo Done\n;
?
--EXPECTF--
Warning: str_ireplace() expects at least 3 parameters, 0 given in %s on line %d
NULL
Warning: str_ireplace() expects at least 3 parameters, 1 given in %s on line %d
NULL
Warning: str_ireplace() expects at least 3 parameters, 2 given in %s on line %d
NULL
string(0)
string(8) aaaT
string(8) aaaT
int(7)
string(15) aaT
string(15) aaT
int(7)
string(22) aT
string(22) aT
int(7)
string(22) aT
string(22) aT
int(7)
string(22) aT
string(22) aT
string(22) aT
string(22) aT
string(22) aT
string(22) aT
array(2) {
[0]=
string(22) aT
[1]=
string(36) aabbaabbbasdabbahsdb
}
array(2) {
[key]=
string(22) aT
[test]=
string(36) aabbaabbbasdabbahsdb
}
array(2) {
[key]=
string(22) aT
[test]=
string(36) aabbaabbbasdabbahsdb
}
string(143) Change tracking and management software designed to watch
for abnormal system behavior.
Suggest features, report bugs, or ask
questions here.
string(152) Change tracking and management software designed to watchbr
for abnormal system behavior.brSuggest features, report bugs, or askbr
questions here.
Done
--UEXPECTF--
Warning: str_ireplace() expects at least 3 parameters, 0 given in %s on line %d
NULL
Warning: str_ireplace() expects at least 3 parameters, 1 given in %s on line %d
NULL
Warning: str_ireplace() expects at least 3 parameters, 2 given in %s on line %d
NULL
unicode(0)
unicode(8) aaaT
unicode(8) aaaT
int(7)
unicode(15) aaT
unicode(15) aaT
int(7)
unicode(22) aT
unicode(22) aT
int(7)
unicode(22) aT
unicode(22) aT
int(7)
unicode(22) aT
unicode(22) aT
unicode(22) aT
unicode(22) aT
unicode(22) aT
unicode(22) aT
array(2) {
[0]=
unicode(22) aT
[1]=
unicode(36) aabbaabbbasdabbahsdb
}
array(2) {
[ukey]=
unicode(22) aT
[utest]=
unicode(36) aabbaabbbasdabbahsdb
}
array(2) {
[ukey]=
unicode(22) aT
[utest]=
unicode(36) aabbaabbbasdabbahsdb
}
unicode(143) Change tracking and management software designed to watch
for abnormal system behavior.
Suggest features, report bugs, or ask
questions here.
unicode(152) Change tracking and management software designed to watchbr
for abnormal system behavior.brSuggest features, report
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/readline readline.c
iliaa Mon Feb 12 01:23:17 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/readline readline.c
Log:
Fixed a memory leak inside readline_completion_function() on non-callable
callback.
http://cvs.php.net/viewvc.cgi/php-src/ext/readline/readline.c?r1=1.42.2.3.2.2r2=1.42.2.3.2.3diff_format=u
Index: php-src/ext/readline/readline.c
diff -u php-src/ext/readline/readline.c:1.42.2.3.2.2
php-src/ext/readline/readline.c:1.42.2.3.2.3
--- php-src/ext/readline/readline.c:1.42.2.3.2.2Mon Jan 1 09:36:05 2007
+++ php-src/ext/readline/readline.c Mon Feb 12 01:23:17 2007
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: readline.c,v 1.42.2.3.2.2 2007/01/01 09:36:05 sebastian Exp $ */
+/* $Id: readline.c,v 1.42.2.3.2.3 2007/02/12 01:23:17 iliaa Exp $ */
/* {{{ includes prototypes */
@@ -453,6 +453,7 @@
if (!zend_is_callable(arg, 0, name)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s is not
callable, name);
+ efree(name);
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
