[PHP-CVS-DAILY] cvs: php-src / ChangeLog
changelog Thu Jun 4 01:33:03 2009 UTC Modified files: /php-srcChangeLog Log: ChangeLog update http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3423r2=1.3424diff_format=u Index: php-src/ChangeLog diff -u php-src/ChangeLog:1.3423 php-src/ChangeLog:1.3424 --- php-src/ChangeLog:1.3423Wed Jun 3 01:32:48 2009 +++ php-src/ChangeLog Thu Jun 4 01:33:02 2009 @@ -1,3 +1,157 @@ +2009-06-03 Brian Shire sh...@tekrat.com + +* (PHP_5_3) + ext/standard/tests/general_functions/bug47859.phpt: + MFH: Add test for Bug #47859 parse_ini_file() does not like asterisk (*) in + key in the beginning + +* ext/standard/tests/general_functions/bug47859.phpt + ext/standard/tests/general_functions/bug47859.phpt: + + Add test for Bug #47859 parse_ini_file() does not like asterisk (*) in key + in the beginning + +2009-06-03 Ilia Alshanetsky i...@prohost.org + +* (PHP_5_2) + NEWS + ext/soap/php_http.c + ext/soap/php_http.c: + + MFB: Fixed bug #46386 (Digest authentication with SOAP module fails + against + MSSQL SOAP services) + +* (PHP_5_3) + ext/soap/php_http.c: + + Fixed bug #46386 (Digest authentication with SOAP module fails against + MSSQL + SOAP services) + + +2009-06-03 Zoe Slattery zoe.slatt...@googlemail.com + +* (PHP_5_2) + ext/spl/tests/SplFileObject_fflush_basic_001.phpt + ext/spl/tests/SplFileObject_fflush_basic_001.phpt + ext/spl/tests/SplFileObject_fpassthru_basic.phpt + ext/spl/tests/SplFileObject_fpassthru_basic.phpt + ext/spl/tests/SplFileObject_fscanf_basic.phpt + ext/spl/tests/SplFileObject_fscanf_basic.phpt + ext/spl/tests/SplFileObject_fseek_error_001.phpt + ext/spl/tests/SplFileObject_fseek_error_001.phpt + ext/spl/tests/SplFileObject_ftruncate_error_001.phpt + ext/spl/tests/SplFileObject_ftruncate_error_001.phpt + ext/spl/tests/SplFileObject_fwrite_error_001.phpt + ext/spl/tests/SplFileObject_fwrite_error_001.phpt + ext/spl/tests/SplFileObject_fwrite_variation_001.phpt + ext/spl/tests/SplFileObject_fwrite_variation_001.phpt + ext/spl/tests/SplFileObject_fwrite_variation_002.phpt + ext/spl/tests/SplFileObject_fwrite_variation_002.phpt + ext/spl/tests/SplFileObject_fwrite_variation_003.phpt + ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt + ext/spl/tests/SplFileObject_seek_error_001.phpt + ext/spl/tests/SplFileObject_testinput.csv: + Commiting testfest tests from tek + +* ext/spl/tests/SplFileObject_fwrite_variation_003.phpt + ext/spl/tests/SplFileObject_fwrite_variation_003.phpt + ext/spl/tests/SplFileObject_fwrite_variation_003.phpt + ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt + ext/spl/tests/SplFileObject_seek_error_001.phpt + ext/spl/tests/SplFileObject_testinput.csv: +1.1.4; + file SplFileObject_fwrite_variation_003.phpt was initially added on branch + PHP_5_3. + +* ext/spl/tests/SplFileObject_fflush_basic_001.phpt + ext/spl/tests/SplFileObject_fflush_basic_001.phpt + ext/spl/tests/SplFileObject_fflush_basic_001.phpt + ext/spl/tests/SplFileObject_fpassthru_basic.phpt + ext/spl/tests/SplFileObject_fpassthru_basic.phpt + ext/spl/tests/SplFileObject_fpassthru_basic.phpt + ext/spl/tests/SplFileObject_fscanf_basic.phpt + ext/spl/tests/SplFileObject_fscanf_basic.phpt + ext/spl/tests/SplFileObject_fscanf_basic.phpt + ext/spl/tests/SplFileObject_fseek_error_001.phpt + ext/spl/tests/SplFileObject_fseek_error_001.phpt + ext/spl/tests/SplFileObject_fseek_error_001.phpt + ext/spl/tests/SplFileObject_ftruncate_error_001.phpt + ext/spl/tests/SplFileObject_ftruncate_error_001.phpt + ext/spl/tests/SplFileObject_ftruncate_error_001.phpt + ext/spl/tests/SplFileObject_fwrite_error_001.phpt + ext/spl/tests/SplFileObject_fwrite_error_001.phpt + ext/spl/tests/SplFileObject_fwrite_error_001.phpt + ext/spl/tests/SplFileObject_fwrite_variation_001.phpt + ext/spl/tests/SplFileObject_fwrite_variation_001.phpt + ext/spl/tests/SplFileObject_fwrite_variation_001.phpt + ext/spl/tests/SplFileObject_fwrite_variation_002.phpt + ext/spl/tests/SplFileObject_fwrite_variation_002.phpt + ext/spl/tests/SplFileObject_fwrite_variation_002.phpt + ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt + ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt + ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt + ext/spl/tests/SplFileObject_seek_error_001.phpt + ext/spl/tests/SplFileObject_seek_error_001.phpt + ext/spl/tests/SplFileObject_seek_error_001.phpt + ext/spl/tests/SplFileObject_testinput.csv + ext/spl/tests/SplFileObject_testinput.csv + ext/spl/tests/SplFileObject_testinput.csv: +1.1.4; + Commiting
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/bcmath/libbcmath/src bcmath.h
On Wed, Jun 3, 2009 at 03:19, Kalle Sommer Nielsen ka...@php.net wrote: kalle Wed Jun 3 01:19:33 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/bcmath/libbcmath/src bcmath.h Log: MFH: config.h is in this directory, not in ext/bcmath root, fixes re-compilation for me Please read the commit history. This will probably break other stuff. -Hannes -- 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 link_win32.c /ext/standard/tests/file link_win32.phpt
pajoye Wed Jun 3 07:56:53 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/filelink_win32.phpt
Modified files:
/php-src/ext/standard link_win32.c
Log:
- fix parameter order and return value check in windows (Venkat Raman Don,
Pierre)' link
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/link_win32.c?r1=1.1.2.3r2=1.1.2.4diff_format=u
Index: php-src/ext/standard/link_win32.c
diff -u php-src/ext/standard/link_win32.c:1.1.2.3
php-src/ext/standard/link_win32.c:1.1.2.4
--- php-src/ext/standard/link_win32.c:1.1.2.3 Fri Jan 16 14:10:16 2009
+++ php-src/ext/standard/link_win32.c Wed Jun 3 07:56:53 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: link_win32.c,v 1.1.2.3 2009/01/16 14:10:16 pajoye Exp $ */
+/* $Id: link_win32.c,v 1.1.2.4 2009/06/03 07:56:53 pajoye Exp $ */
#ifdef PHP_WIN32
#include php.h
@@ -231,7 +231,9 @@
char source_p[MAXPATHLEN];
char dest_p[MAXPATHLEN];
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss, topath,
topath_len, frompath, frompath_len) == FAILURE) {
+ /*First argument to link function is the target and hence should go to
frompath
+ Second argument to link function is the link itself and hence should
go to topath */
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss, frompath,
frompath_len, topath, topath_len) == FAILURE) {
return;
}
@@ -260,7 +262,8 @@
#else
ret = CreateHardLinkA(dest_p, source_p, NULL);
#endif
- if (ret == -1) {
+
+ if (ret == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
strerror(errno));
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/link_win32.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/file/link_win32.phpt
+++ php-src/ext/standard/tests/file/link_win32.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 link_win32.c /ext/standard/tests/file link_win32.phpt
pajoye Wed Jun 3 08:07:30 2009 UTC
Modified files:
/php-src/ext/standard link_win32.c
/php-src/ext/standard/tests/filelink_win32.phpt
Log:
- MFB: fix parameter order and return value check in windows (Venkat Raman
Don, Pierre)' link
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/link_win32.c?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/standard/link_win32.c
diff -u php-src/ext/standard/link_win32.c:1.4
php-src/ext/standard/link_win32.c:1.5
--- php-src/ext/standard/link_win32.c:1.4 Tue Mar 10 23:39:40 2009
+++ php-src/ext/standard/link_win32.c Wed Jun 3 08:07:29 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: link_win32.c,v 1.4 2009/03/10 23:39:40 helly Exp $ */
+/* $Id: link_win32.c,v 1.5 2009/06/03 08:07:29 pajoye Exp $ */
#ifdef PHP_WIN32
#include php.h
@@ -230,7 +230,9 @@
char source_p[MAXPATHLEN];
char dest_p[MAXPATHLEN];
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss, topath,
topath_len, frompath, frompath_len) == FAILURE) {
+ /*First argument to link function is the target and hence should go to
frompath
+ Second argument to link function is the link itself and hence should
go to topath */
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ss, frompath,
frompath_len, topath, topath_len) == FAILURE) {
return;
}
@@ -259,7 +261,8 @@
#else
ret = CreateHardLinkA(dest_p, source_p, NULL);
#endif
- if (ret == -1) {
+
+ if (ret == 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
strerror(errno));
RETURN_FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/link_win32.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/standard/tests/file/link_win32.phpt
diff -u /dev/null php-src/ext/standard/tests/file/link_win32.phpt:1.2
--- /dev/null Wed Jun 3 08:07:30 2009
+++ php-src/ext/standard/tests/file/link_win32.phpt Wed Jun 3 08:07:30 2009
@@ -0,0 +1,26 @@
+--TEST--
+bug #bugid (link not working properly on Windows)
+--CREDITS--
+Venkat Raman Don
+--SKIPIF--
+?php
+if(substr(PHP_OS, 0, 3) != 'WIN' ) {
+ die('skip windows only test');
+}
+?
+--FILE--
+?php
+$filename = __DIR__ . '\\a.php';
+$content = '?php echo Dummy Content.\n ?';
+file_put_contents($filename, $content);
+$linkname = __DIR__ . '\\a_link.php';
+link($filename, $linkname);
+var_dump(file_exists($linkname));
+$linkcontent = file_get_contents($linkname);
+var_dump($content == $linkcontent);
+unlink($filename);
+unlink($linkname);
+?
+--EXPECT--
+bool(true)
+bool(true)
--
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 link_win32.phpt
pajoye Wed Jun 3 08:31:07 2009 UTC Modified files: /php-src/ext/standard/tests/filelink_win32.phpt Log: - fix title http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/link_win32.phpt?r1=1.2r2=1.3diff_format=u Index: php-src/ext/standard/tests/file/link_win32.phpt diff -u php-src/ext/standard/tests/file/link_win32.phpt:1.2 php-src/ext/standard/tests/file/link_win32.phpt:1.3 --- php-src/ext/standard/tests/file/link_win32.phpt:1.2 Wed Jun 3 08:07:30 2009 +++ php-src/ext/standard/tests/file/link_win32.phpt Wed Jun 3 08:31:07 2009 @@ -1,5 +1,5 @@ --TEST-- -bug #bugid (link not working properly on Windows) +link not working properly on Windows --CREDITS-- Venkat Raman Don --SKIPIF-- -- 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 link_win32.phpt
pajoye Wed Jun 3 08:31:24 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard/tests/filelink_win32.phpt Log: - fix title http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/link_win32.phpt?r1=1.1.2.1r2=1.1.2.2diff_format=u Index: php-src/ext/standard/tests/file/link_win32.phpt diff -u php-src/ext/standard/tests/file/link_win32.phpt:1.1.2.1 php-src/ext/standard/tests/file/link_win32.phpt:1.1.2.2 --- php-src/ext/standard/tests/file/link_win32.phpt:1.1.2.1 Wed Jun 3 07:56:53 2009 +++ php-src/ext/standard/tests/file/link_win32.phpt Wed Jun 3 08:31:24 2009 @@ -1,5 +1,5 @@ --TEST-- -bug #bugid (link not working properly on Windows) +link not working properly on Windows --CREDITS-- Venkat Raman Don --SKIPIF-- -- 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 /main/streams cast.c
kalle Wed Jun 3 08:59:19 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-srcNEWS
/php-src/main/streams cast.c
Log:
Fixed #48448 (Compile failure under IRIX 6.5.30 building cast.c)
# Only in this branch, looks like a missing merge compared to PHP_5_3/HEAD
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1539r2=1.2027.2.547.2.1540diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1539 php-src/NEWS:1.2027.2.547.2.1540
--- php-src/NEWS:1.2027.2.547.2.1539Tue Jun 2 19:55:07 2009
+++ php-src/NEWSWed Jun 3 08:59:19 2009
@@ -1,10 +1,12 @@
-PHPNEWS
+PHP
NEWS
|||
?? Jun 2009, PHP 5.2.10
- Added ignore_errors option to http fopen wrapper. (David Zulke, Sara)
- Fixed bug #48456 (CPPFLAGS not restored properly in phpize.m4).
(Jani, spisek at kerio dot com)
+- Fixed bug #48448 (Compile failure under IRIX 6.5.30 building cast.c).
+ (Kalle)
- Fixed bug #48434 (memory_get_usage() accuracy). (Arnaud)
- Fixed bug #48416 (Force a cache limit in ereg() to stop excessive memory
usage).
(Scott)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/cast.c?r1=1.12.2.1.2.5r2=1.12.2.1.2.6diff_format=u
Index: php-src/main/streams/cast.c
diff -u php-src/main/streams/cast.c:1.12.2.1.2.5
php-src/main/streams/cast.c:1.12.2.1.2.6
--- php-src/main/streams/cast.c:1.12.2.1.2.5Sun Apr 19 17:10:52 2009
+++ php-src/main/streams/cast.c Wed Jun 3 08:59:19 2009
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: cast.c,v 1.12.2.1.2.5 2009/04/19 17:10:52 lbarnaud Exp $ */
+/* $Id: cast.c,v 1.12.2.1.2.6 2009/06/03 08:59:19 kalle Exp $ */
#define _GNU_SOURCE
#include php.h
@@ -219,7 +219,7 @@
if (ret != SUCCESS) {
php_stream_close(newstream);
} else {
- int retcode =
php_stream_cast(newstream, castas | flags, ret, show_err);
+ int retcode =
php_stream_cast(newstream, castas | flags, (void **)ret, show_err);
if (retcode == SUCCESS)
rewind(*(FILE**)ret);
--
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/bcmath/libbcmath/src bcmath.h
Kalle Sommer Nielsen kirjoitti: 2009/6/3 Hannes Magnusson hannes.magnus...@gmail.com: On Wed, Jun 3, 2009 at 03:19, Kalle Sommer Nielsen ka...@php.net wrote: kalle Wed Jun 3 01:19:33 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/bcmath/libbcmath/src bcmath.h Log: MFH: config.h is in this directory, not in ext/bcmath root, fixes re-compilation for me Please read the commit history. This will probably break other stuff. Its broken for me, if its an issue for others then we need to isolate it, if i do a fresh nmake and then make a buildconf configure nmake (after i have made a change), it breaks the build because config.h isn't in ext/bcmath, but ext/bcmath/libbcmath/src/ Did you try on real OSes? Please keep in mind that Windows comes 2nd, if you fix something and it breaks on other OSes, that fix will be reverted. --Jani -- 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/bcmath/libbcmath/src bcmath.h
On Wed, Jun 3, 2009 at 2:06 PM, Jani Taskinen jani.taski...@sci.fi wrote: Its broken for me, if its an issue for others then we need to isolate it, if i do a fresh nmake and then make a buildconf configure nmake (after i have made a change), it breaks the build because config.h isn't in ext/bcmath, but ext/bcmath/libbcmath/src/ Did you try on real OSes? Please keep in mind that Windows comes 2nd, if you fix something and it breaks on other OSes, that fix will be reverted. All supported OSes have the same priority. I asked Kalle to double check again that this change does not affect any other platform and revert it if yes (it works on win already, only not in some weird configuration). Cheers, -- Pierre http://blog.thepimp.net | http://www.libgd.org -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/spl/tests SplFileObject_fflush_basic_001.phpt SplFileObject_fpassthru_basic.phpt SplFileObject_fscanf_basic.phpt SplFileObject_fseek_error_001.phpt SplFileObject_ftruncate_
zoe Wed Jun 3 12:29:57 2009 UTC
Added files:
/php-src/ext/spl/tests SplFileObject_fpassthru_basic.phpt
SplFileObject_fwrite_error_001.phpt
SplFileObject_seek_error_001.phpt
SplFileObject_fseek_error_001.phpt
SplFileObject_fscanf_basic.phpt
SplFileObject_ftruncate_error_001.phpt
SplFileObject_fwrite_variation_002.phpt
SplFileObject_fwrite_variation_001.phpt
SplFileObject_fflush_basic_001.phpt
SplFileObject_testinput.csv
SplFileObject_getCsvControl_basic_001.phpt
Log:
Commiting testfest tests from tek
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fpassthru_basic.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fpassthru_basic.phpt
+++ php-src/ext/spl/tests/SplFileObject_fpassthru_basic.phpt
--TEST--
SplFileObject::fpassthru function - basic functionality test
--FILE--
?php
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
$obj-fpassthru();
?
--EXPECT--
first,second,third
1,2,3
4,5,6
7,8,9
0,0,0
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fwrite_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fwrite_error_001.phpt
+++ php-src/ext/spl/tests/SplFileObject_fwrite_error_001.phpt
--TEST--
SplFileObject::fpassthru function - parameters test
--FILE--
?php
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
$obj-fwrite();
$obj-fwrite('6,6,6',25,null);
?
--EXPECTF--
Warning: SplFileObject::fwrite() expects at least 1 parameter, 0 given in %s
Warning: SplFileObject::fwrite() expects at most 2 parameters, 3 given in %s
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_seek_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_seek_error_001.phpt
+++ php-src/ext/spl/tests/SplFileObject_seek_error_001.phpt
--TEST--
SplFileObject::seek function - test parameters
--FILE--
?php
$obj = New SplFileObject(__FILE__);
$obj-seek(1,2);
$obj-seek();
try {
$obj-seek(-1);
} catch (LogicException $e) {
echo($e-getMessage());
}
?
--EXPECTF--
Warning: SplFileObject::seek() expects exactly 1 parameter, 2 given in %s
Warning: SplFileObject::seek() expects exactly 1 parameter, 0 given in %s
Can't seek file %s to negative line %s
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fseek_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fseek_error_001.phpt
+++ php-src/ext/spl/tests/SplFileObject_fseek_error_001.phpt
--TEST--
SplFileObject::fseek function - parameters test
--FILE--
?php
$obj = New SplFileObject(__FILE__);
$obj-fseek(1,2,3);
$obj-fseek();
?
--EXPECTF--
Warning: SplFileObject::fseek() expects at most 2 parameters, 3 given %s
Warning: SplFileObject::fseek() expects at least 1 parameter, 0 given %s
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fscanf_basic.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fscanf_basic.phpt
+++ php-src/ext/spl/tests/SplFileObject_fscanf_basic.phpt
--TEST--
SplFileObject::fscanf function - basic functionality test
--FILE--
?php
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
var_dump($obj-fscanf('%s'));
?
--EXPECT--
array(1) {
[0]=
string(18) first,second,third
}
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt
+++ php-src/ext/spl/tests/SplFileObject_ftruncate_error_001.phpt
--TEST--
SplFileObject::ftruncate function - truncating with stream that does not
support truncation
--FILE--
?php
//create a basic stream class
class VariableStream {
var $position;
var $varname;
function stream_open($path, $mode, $options, $opened_path)
{
return true;
}
}
stream_wrapper_register(SPLtest, VariableStream);
$ftruncate_test = ;
//end creating stream
//open an SplFileObject using the above test stream
$obj = New SplFileObject(SPLtest://ftruncate_test);
try {
$obj-ftruncate(1);
} catch (LogicException $e) {
echo($e-getMessage());
}
?
--EXPECTF--
Can't truncate file %s
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fwrite_variation_002.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fwrite_variation_002.phpt
+++ php-src/ext/spl/tests/SplFileObject_fwrite_variation_002.phpt
--TEST--
SplFileObject::fwrite function - writing with two parameters, length input
string length
--FILE--
?php
$file = dirname(__FILE__).'/SplFileObject_fwrite_variation_002.txt';
if(file_exists($file)) {
unlink($file);
}
$obj = New
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests SplFileObject_fflush_basic_001.phpt SplFileObject_fpassthru_basic.phpt SplFileObject_fscanf_basic.phpt SplFileObject_fseek_error_001.phpt SplFileObject_f
zoe Wed Jun 3 12:30:40 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests SplFileObject_fwrite_variation_003.phpt
SplFileObject_fwrite_variation_002.phpt
SplFileObject_fwrite_variation_001.phpt
SplFileObject_fflush_basic_001.phpt
SplFileObject_getCsvControl_basic_001.phpt
SplFileObject_fpassthru_basic.phpt
SplFileObject_testinput.csv
SplFileObject_fseek_error_001.phpt
SplFileObject_ftruncate_error_001.phpt
SplFileObject_fwrite_error_001.phpt
SplFileObject_seek_error_001.phpt
SplFileObject_fscanf_basic.phpt
Log:
Commiting testfest tests from tek
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fwrite_variation_003.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fwrite_variation_003.phpt
+++ php-src/ext/spl/tests/SplFileObject_fwrite_variation_003.phpt
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fwrite_variation_002.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fwrite_variation_002.phpt
+++ php-src/ext/spl/tests/SplFileObject_fwrite_variation_002.phpt
--TEST--
SplFileObject::fwrite function - writing with two parameters, length input
string length
--FILE--
?php
$file = dirname(__FILE__).'/SplFileObject_fwrite_variation_002.txt';
if(file_exists($file)) {
unlink($file);
}
$obj = New SplFileObject($file,'w');
$obj-fwrite('test_write',12);
var_dump(file_get_contents($file));
if(file_exists($file)) {
unlink($file);
}
?
--EXPECT--
string(10) test_write
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fwrite_variation_001.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fwrite_variation_001.phpt
+++ php-src/ext/spl/tests/SplFileObject_fwrite_variation_001.phpt
--TEST--
SplFileObject::fwrite function - writing with two parameters length input
string length
--FILE--
?php
$file = dirname(__FILE__).'/SplFileObject_fwrite_variation_001.txt';
if(file_exists($file)) {
unlink($file);
}
$obj = New SplFileObject($file,'w');
$obj-fwrite('test_write',4);
var_dump(file_get_contents($file));
if(file_exists($file)) {
unlink($file);
}
?
--EXPECT--
string(4) test
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fflush_basic_001.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
+++ php-src/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
--TEST--
SplFileObject::fflush function - basic test
--FILE--
?php
/*
* test a successful flush
*/
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
var_dump($obj-fflush());
/*
* test a unsuccessful flush
*/
//create a basic stream class
class VariableStream {
var $position;
var $varname;
function stream_open($path, $mode, $options, $opened_path)
{
return true;
}
}
stream_wrapper_register(SPLtest, VariableStream);
$ftruncate_test = ;
//end creating stream
//open an SplFileObject using the above test stream
$obj = New SplFileObject(SPLtest://ftruncate_test);
var_dump($obj-fflush());
?
--EXPECTF--
bool(true)
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt
+++ php-src/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt
--TEST--
SplFileObject::getCsvControl function - basic test
--FILE--
?php
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
var_dump($obj-getCsvControl());
?
--EXPECTF--
array(2) {
[0]=
%unicode|string%(1) ,
[1]=
%unicode|string%(1)
}
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fpassthru_basic.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fpassthru_basic.phpt
+++ php-src/ext/spl/tests/SplFileObject_fpassthru_basic.phpt
--TEST--
SplFileObject::fpassthru function - basic functionality test
--FILE--
?php
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
$obj-fpassthru();
?
--EXPECT--
first,second,third
1,2,3
4,5,6
7,8,9
0,0,0
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_testinput.csv?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_testinput.csv
+++ php-src/ext/spl/tests/SplFileObject_testinput.csv
first,second,third
1,2,3
4,5,6
7,8,9
0,0,0
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fseek_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fseek_error_001.phpt
+++ php-src/ext/spl/tests/SplFileObject_fseek_error_001.phpt
--TEST--
SplFileObject::fseek function -
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl/tests SplFileObject_fflush_basic_001.phpt SplFileObject_fpassthru_basic.phpt SplFileObject_fscanf_basic.phpt SplFileObject_fseek_error_001.phpt SplFileObject_f
zoe Wed Jun 3 12:31:05 2009 UTC
Added files: (Branch: PHP_5_2)
/php-src/ext/spl/tests SplFileObject_fwrite_variation_002.phpt
SplFileObject_fwrite_variation_001.phpt
SplFileObject_fflush_basic_001.phpt
SplFileObject_testinput.csv
SplFileObject_getCsvControl_basic_001.phpt
SplFileObject_fpassthru_basic.phpt
SplFileObject_fseek_error_001.phpt
SplFileObject_fwrite_error_001.phpt
SplFileObject_seek_error_001.phpt
SplFileObject_ftruncate_error_001.phpt
SplFileObject_fscanf_basic.phpt
SplFileObject_fwrite_variation_003.phpt
Log:
Commiting testfest tests from tek
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fwrite_variation_002.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fwrite_variation_002.phpt
+++ php-src/ext/spl/tests/SplFileObject_fwrite_variation_002.phpt
--TEST--
SplFileObject::fwrite function - writing with two parameters, length input
string length
--FILE--
?php
$file = dirname(__FILE__).'/SplFileObject_fwrite_variation_002.txt';
if(file_exists($file)) {
unlink($file);
}
$obj = New SplFileObject($file,'w');
$obj-fwrite('test_write',12);
var_dump(file_get_contents($file));
if(file_exists($file)) {
unlink($file);
}
?
--EXPECT--
string(10) test_write
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fwrite_variation_001.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fwrite_variation_001.phpt
+++ php-src/ext/spl/tests/SplFileObject_fwrite_variation_001.phpt
--TEST--
SplFileObject::fwrite function - writing with two parameters length input
string length
--FILE--
?php
$file = dirname(__FILE__).'/SplFileObject_fwrite_variation_001.txt';
if(file_exists($file)) {
unlink($file);
}
$obj = New SplFileObject($file,'w');
$obj-fwrite('test_write',4);
var_dump(file_get_contents($file));
if(file_exists($file)) {
unlink($file);
}
?
--EXPECT--
string(4) test
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fflush_basic_001.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
+++ php-src/ext/spl/tests/SplFileObject_fflush_basic_001.phpt
--TEST--
SplFileObject::fflush function - basic test
--FILE--
?php
/*
* test a successful flush
*/
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
var_dump($obj-fflush());
/*
* test a unsuccessful flush
*/
//create a basic stream class
class VariableStream {
var $position;
var $varname;
function stream_open($path, $mode, $options, $opened_path)
{
return true;
}
}
stream_wrapper_register(SPLtest, VariableStream);
$ftruncate_test = ;
//end creating stream
//open an SplFileObject using the above test stream
$obj = New SplFileObject(SPLtest://ftruncate_test);
var_dump($obj-fflush());
?
--EXPECTF--
bool(true)
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_testinput.csv?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_testinput.csv
+++ php-src/ext/spl/tests/SplFileObject_testinput.csv
first,second,third
1,2,3
4,5,6
7,8,9
0,0,0
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt
+++ php-src/ext/spl/tests/SplFileObject_getCsvControl_basic_001.phpt
--TEST--
SplFileObject::getCsvControl function - basic test
--FILE--
?php
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
var_dump($obj-getCsvControl());
?
--EXPECTF--
array(2) {
[0]=
%unicode|string%(1) ,
[1]=
%unicode|string%(1)
}
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fpassthru_basic.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fpassthru_basic.phpt
+++ php-src/ext/spl/tests/SplFileObject_fpassthru_basic.phpt
--TEST--
SplFileObject::fpassthru function - basic functionality test
--FILE--
?php
$obj = New SplFileObject(dirname(__FILE__).'/SplFileObject_testinput.csv');
$obj-fpassthru();
?
--EXPECT--
first,second,third
1,2,3
4,5,6
7,8,9
0,0,0
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/SplFileObject_fseek_error_001.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/SplFileObject_fseek_error_001.phpt
+++ php-src/ext/spl/tests/SplFileObject_fseek_error_001.phpt
--TEST--
SplFileObject::fseek function - parameters test
--FILE--
?php
$obj = New SplFileObject(__FILE__);
$obj-fseek(1,2,3);
$obj-fseek();
?
--EXPECTF--
Warning: SplFileObject::fseek() expects at most 2 parameters, 3 given %s
Warning: SplFileObject::fseek() expects at least 1 parameter, 0
Re: [PHP-CVS] cvs: php-src(PHP_5_3) /ext/bcmath/libbcmath/src bcmath.h
2009/6/3 Jani Taskinen jani.taski...@sci.fi: Kalle Sommer Nielsen kirjoitti: 2009/6/3 Hannes Magnusson hannes.magnus...@gmail.com: On Wed, Jun 3, 2009 at 03:19, Kalle Sommer Nielsen ka...@php.net wrote: kalle Wed Jun 3 01:19:33 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/bcmath/libbcmath/src bcmath.h Log: MFH: config.h is in this directory, not in ext/bcmath root, fixes re-compilation for me Please read the commit history. This will probably break other stuff. Its broken for me, if its an issue for others then we need to isolate it, if i do a fresh nmake and then make a buildconf configure nmake (after i have made a change), it breaks the build because config.h isn't in ext/bcmath, but ext/bcmath/libbcmath/src/ Did you try on real OSes? Please keep in mind that Windows comes 2nd, if you fix something and it breaks on other OSes, that fix will be reverted. So real OSes about everything thats not produced by Microsoft? I don't see why we treat Windows as second class really, its just as a good OS as any of the other (*awaiting stupid comment*). Windows isn't lacking that much behind anymore, especially not with 5.3. Alternatively until the problem have been solved, then we could just directly include the config.h which is abit ugly and we're all happy: #include ext/bcmath/libbcmath/src/config.h --Jani -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- regrads, Kalle Sommer Nielsen ka...@php.net -- 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/soap php_http.c
iliaa Wed Jun 3 12:39:50 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/soap php_http.c
Log:
Fixed bug #46386 (Digest authentication with SOAP module fails against MSSQL
SOAP services)
#original patch by lordelph at gmail dot com
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.12.2.10r2=1.77.2.11.2.12.2.11diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.10
php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.11
--- php-src/ext/soap/php_http.c:1.77.2.11.2.12.2.10 Mon Jan 19 21:58:02 2009
+++ php-src/ext/soap/php_http.c Wed Jun 3 12:39:50 2009
@@ -17,7 +17,7 @@
| Dmitry Stogov dmi...@zend.com |
+--+
*/
-/* $Id: php_http.c,v 1.77.2.11.2.12.2.10 2009/01/19 21:58:02 iliaa Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.12.2.11 2009/06/03 12:39:50 iliaa Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -612,6 +612,11 @@
smart_str_append_const(soap_headers, \, opaque=\);
smart_str_appendl(soap_headers, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
}
+ if (zend_hash_find(Z_ARRVAL_PP(digest),
algorithm, sizeof(algorithm), (void **)tmp) == SUCCESS
+ Z_TYPE_PP(tmp) == IS_STRING) {
+
smart_str_append_const(soap_headers, \, algorithm=\);
+
smart_str_appendl(soap_headers, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
+ }
smart_str_append_const(soap_headers,
\\r\n);
}
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/soap php_http.c
iliaa Wed Jun 3 12:40:01 2009 UTC
Modified files:
/php-src/ext/soap php_http.c
Log:
MFB: Fixed bug #46386 (Digest authentication with SOAP module fails against
MSSQL SOAP services)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.120r2=1.121diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.120 php-src/ext/soap/php_http.c:1.121
--- php-src/ext/soap/php_http.c:1.120 Thu Mar 26 20:02:12 2009
+++ php-src/ext/soap/php_http.c Wed Jun 3 12:40:01 2009
@@ -17,7 +17,7 @@
| Dmitry Stogov dmi...@zend.com |
+--+
*/
-/* $Id: php_http.c,v 1.120 2009/03/26 20:02:12 felipe Exp $ */
+/* $Id: php_http.c,v 1.121 2009/06/03 12:40:01 iliaa Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -589,6 +589,11 @@
smart_str_append_const(soap_headers, \, opaque=\);
smart_str_appends(soap_headers, client-digest_opaque);
}
+ if (zend_hash_find(Z_ARRVAL_PP(digest),
algorithm, sizeof(algorithm), (void **)tmp) == SUCCESS
+ Z_TYPE_PP(tmp) == IS_STRING) {
+
smart_str_append_const(soap_headers, \, algorithm=\);
+
smart_str_appendl(soap_headers, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
+ }
smart_str_append_const(soap_headers,
\\r\n);
}
} else {
--
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/soap php_http.c
iliaa Wed Jun 3 12:41:47 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/soap php_http.c
/php-srcNEWS
Log:
MFB: Fixed bug #46386 (Digest authentication with SOAP module fails against
MSSQL SOAP services)
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/php_http.c?r1=1.77.2.11.2.17r2=1.77.2.11.2.18diff_format=u
Index: php-src/ext/soap/php_http.c
diff -u php-src/ext/soap/php_http.c:1.77.2.11.2.17
php-src/ext/soap/php_http.c:1.77.2.11.2.18
--- php-src/ext/soap/php_http.c:1.77.2.11.2.17 Mon Jan 19 21:57:45 2009
+++ php-src/ext/soap/php_http.c Wed Jun 3 12:41:46 2009
@@ -17,7 +17,7 @@
| Dmitry Stogov dmi...@zend.com |
+--+
*/
-/* $Id: php_http.c,v 1.77.2.11.2.17 2009/01/19 21:57:45 iliaa Exp $ */
+/* $Id: php_http.c,v 1.77.2.11.2.18 2009/06/03 12:41:46 iliaa Exp $ */
#include php_soap.h
#include ext/standard/base64.h
@@ -614,6 +614,11 @@
smart_str_append_const(soap_headers, \, opaque=\);
smart_str_appendl(soap_headers, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
}
+ if (zend_hash_find(Z_ARRVAL_PP(digest),
algorithm, sizeof(algorithm), (void **)tmp) == SUCCESS
+ Z_TYPE_PP(tmp) == IS_STRING) {
+
smart_str_append_const(soap_headers, \, algorithm=\);
+
smart_str_appendl(soap_headers, Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp));
+ }
smart_str_append_const(soap_headers,
\\r\n);
}
} else {
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1540r2=1.2027.2.547.2.1541diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1540 php-src/NEWS:1.2027.2.547.2.1541
--- php-src/NEWS:1.2027.2.547.2.1540Wed Jun 3 08:59:19 2009
+++ php-src/NEWSWed Jun 3 12:41:46 2009
@@ -19,6 +19,8 @@
- Fixed bug #48273 (snmp*_real_walk() returns SNMP errors as values).
(Ilia, lytboris at gmail dot com)
- Fixed bug #48247 (Crash on errors during startup). (Stas)
+- Fixed bug #46386 (Digest authentication with SOAP module fails against MSSQL
+ SOAP services). (Ilia, lordelph at gmail dot com)
- Fixed bug #42143 (The constant NAN is reported as 0 on Windows)
(Kanwaljeet Singla, Venkat Raman Don)
--
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/general_functions bug47859.phpt
shire Wed Jun 3 19:37:23 2009 UTC
Added files:
/php-src/ext/standard/tests/general_functions bug47859.phpt
Log:
Add test for Bug #47859 parse_ini_file() does not like asterisk (*) in key in
the beginning
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug47859.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/general_functions/bug47859.phpt
+++ php-src/ext/standard/tests/general_functions/bug47859.phpt
--TEST--
Bug #47859 parse_ini_file() does not like asterisk (*) in key in the
beginning
--FILE--
?php
var_dump(parse_ini_string('*key = *value'));
var_dump(parse_ini_string('-key = -value'));
var_dump(parse_ini_string('_key = _value'));
var_dump(parse_ini_string('key* = value*'));
var_dump(parse_ini_string('key.*.* = value.*.*'));
var_dump(parse_ini_string('*.*.key = *.*.value'));
var_dump(parse_ini_string('k*e*y = v*a*lue'));
?
--EXPECT--
array(1) {
[*key]=
string(6) *value
}
array(1) {
[-key]=
string(6) -value
}
array(1) {
[_key]=
string(6) _value
}
array(1) {
[key*]=
string(6) value*
}
array(1) {
[key.*.*]=
string(9) value.*.*
}
array(1) {
[*.*.key]=
string(9) *.*.value
}
array(1) {
[k*e*y]=
string(7) v*a*lue
}
--
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/general_functions bug47859.phpt
shire Wed Jun 3 19:37:26 2009 UTC
Added files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions bug47859.phpt
Log:
MFH: Add test for Bug #47859 parse_ini_file() does not like asterisk (*) in
key in the beginning
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/bug47859.phpt?view=markuprev=1.1
Index: php-src/ext/standard/tests/general_functions/bug47859.phpt
+++ php-src/ext/standard/tests/general_functions/bug47859.phpt
--TEST--
Bug #47859 parse_ini_file() does not like asterisk (*) in key in the
beginning
--FILE--
?php
var_dump(parse_ini_string('*key = *value'));
var_dump(parse_ini_string('-key = -value'));
var_dump(parse_ini_string('_key = _value'));
var_dump(parse_ini_string('key* = value*'));
var_dump(parse_ini_string('key.*.* = value.*.*'));
var_dump(parse_ini_string('*.*.key = *.*.value'));
var_dump(parse_ini_string('k*e*y = v*a*lue'));
?
--EXPECT--
array(1) {
[*key]=
string(6) *value
}
array(1) {
[-key]=
string(6) -value
}
array(1) {
[_key]=
string(6) _value
}
array(1) {
[key*]=
string(6) value*
}
array(1) {
[key.*.*]=
string(9) value.*.*
}
array(1) {
[*.*.key]=
string(9) *.*.value
}
array(1) {
[k*e*y]=
string(7) v*a*lue
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/xsl/tests bug26384.phpt xslt001.phpt xslt002.phpt xslt003.phpt xslt004.phpt xslt005.phpt xslt006.phpt xslt007.phpt xslt008.phpt xslt009.phpt xslt010.phpt xslt011.phpt xslt0
felipe Thu Jun 4 01:14:48 2009 UTC
Modified files:
/php-src/ext/xsl/tests bug26384.phpt xslt001.phpt xslt002.phpt
xslt003.phpt xslt004.phpt xslt005.phpt
xslt006.phpt xslt007.phpt xslt008.phpt
xslt009.phpt xslt010.phpt xslt011.phpt
xslt012.phpt
Log:
- Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/bug26384.phpt?r1=1.1r2=1.2diff_format=u
Index: php-src/ext/xsl/tests/bug26384.phpt
diff -u php-src/ext/xsl/tests/bug26384.phpt:1.1
php-src/ext/xsl/tests/bug26384.phpt:1.2
--- php-src/ext/xsl/tests/bug26384.phpt:1.1 Sat Nov 29 16:38:09 2003
+++ php-src/ext/xsl/tests/bug26384.phpt Thu Jun 4 01:14:48 2009
@@ -1,7 +1,7 @@
--TEST--
Bug #26384 (domxslt-process causes segfault with xsl:key)
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
$dom = new domDocument;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt001.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/xsl/tests/xslt001.phpt
diff -u php-src/ext/xsl/tests/xslt001.phpt:1.2
php-src/ext/xsl/tests/xslt001.phpt:1.3
--- php-src/ext/xsl/tests/xslt001.phpt:1.2 Mon Oct 27 11:28:43 2003
+++ php-src/ext/xsl/tests/xslt001.phpt Thu Jun 4 01:14:48 2009
@@ -1,7 +1,7 @@
--TEST--
Test 1: Transform To XML String
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 1: Transform To XML String;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt002.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/xsl/tests/xslt002.phpt
diff -u php-src/ext/xsl/tests/xslt002.phpt:1.3
php-src/ext/xsl/tests/xslt002.phpt:1.4
--- php-src/ext/xsl/tests/xslt002.phpt:1.3 Sat Jan 10 11:50:49 2004
+++ php-src/ext/xsl/tests/xslt002.phpt Thu Jun 4 01:14:48 2009
@@ -1,7 +1,7 @@
--TEST--
Test 2: Transform To HTML String
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 2: Transform To HTML String;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt003.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/xsl/tests/xslt003.phpt
diff -u php-src/ext/xsl/tests/xslt003.phpt:1.3
php-src/ext/xsl/tests/xslt003.phpt:1.4
--- php-src/ext/xsl/tests/xslt003.phpt:1.3 Mon Oct 27 11:28:43 2003
+++ php-src/ext/xsl/tests/xslt003.phpt Thu Jun 4 01:14:48 2009
@@ -1,7 +1,7 @@
--TEST--
Test 3: Using Parameters
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 3: Using Parameters;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt004.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/xsl/tests/xslt004.phpt
diff -u php-src/ext/xsl/tests/xslt004.phpt:1.3
php-src/ext/xsl/tests/xslt004.phpt:1.4
--- php-src/ext/xsl/tests/xslt004.phpt:1.3 Sat Jan 10 11:50:49 2004
+++ php-src/ext/xsl/tests/xslt004.phpt Thu Jun 4 01:14:48 2009
@@ -1,7 +1,7 @@
--TEST--
Test 4: Checking UTF8 Output
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 4: Checking UTF8 Output;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt005.phpt?r1=1.3r2=1.4diff_format=u
Index: php-src/ext/xsl/tests/xslt005.phpt
diff -u php-src/ext/xsl/tests/xslt005.phpt:1.3
php-src/ext/xsl/tests/xslt005.phpt:1.4
--- php-src/ext/xsl/tests/xslt005.phpt:1.3 Sat Jan 10 11:50:49 2004
+++ php-src/ext/xsl/tests/xslt005.phpt Thu Jun 4 01:14:48 2009
@@ -1,7 +1,7 @@
--TEST--
Test 5: Checking Indent
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 5: Checking Indent;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt006.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/xsl/tests/xslt006.phpt
diff -u php-src/ext/xsl/tests/xslt006.phpt:1.2
php-src/ext/xsl/tests/xslt006.phpt:1.3
--- php-src/ext/xsl/tests/xslt006.phpt:1.2 Mon Oct 27 11:28:43 2003
+++ php-src/ext/xsl/tests/xslt006.phpt Thu Jun 4 01:14:48 2009
@@ -1,7 +1,7 @@
--TEST--
Test 6: Transform To Doc
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 6: Transform To Doc;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt007.phpt?r1=1.2r2=1.3diff_format=u
Index: php-src/ext/xsl/tests/xslt007.phpt
diff -u php-src/ext/xsl/tests/xslt007.phpt:1.2
php-src/ext/xsl/tests/xslt007.phpt:1.3
--- php-src/ext/xsl/tests/xslt007.phpt:1.2 Mon Oct 27 11:28:43 2003
+++ php-src/ext/xsl/tests/xslt007.phpt Thu Jun 4 01:14:48 2009
@@ -1,7 +1,7 @@
--TEST--
Test 7: Transform To Uri
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 7: Transform To Uri;
[PHP-CVS] cvs: php-src(PHP_5_3) /ext/xsl/tests bug26384.phpt xslt001.phpt xslt002.phpt xslt003.phpt xslt004.phpt xslt005.phpt xslt006.phpt xslt007.phpt xslt008.phpt xslt009.phpt xslt010.phpt xslt011.p
felipe Thu Jun 4 01:15:12 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/xsl/tests bug26384.phpt xslt001.phpt xslt002.phpt
xslt003.phpt xslt004.phpt xslt005.phpt
xslt006.phpt xslt007.phpt xslt008.phpt
xslt009.phpt xslt010.phpt xslt011.phpt
xslt012.phpt
Log:
- Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/bug26384.phpt?r1=1.1r2=1.1.8.1diff_format=u
Index: php-src/ext/xsl/tests/bug26384.phpt
diff -u php-src/ext/xsl/tests/bug26384.phpt:1.1
php-src/ext/xsl/tests/bug26384.phpt:1.1.8.1
--- php-src/ext/xsl/tests/bug26384.phpt:1.1 Sat Nov 29 16:38:09 2003
+++ php-src/ext/xsl/tests/bug26384.phpt Thu Jun 4 01:15:12 2009
@@ -1,7 +1,7 @@
--TEST--
Bug #26384 (domxslt-process causes segfault with xsl:key)
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
$dom = new domDocument;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt001.phpt?r1=1.2r2=1.2.8.1diff_format=u
Index: php-src/ext/xsl/tests/xslt001.phpt
diff -u php-src/ext/xsl/tests/xslt001.phpt:1.2
php-src/ext/xsl/tests/xslt001.phpt:1.2.8.1
--- php-src/ext/xsl/tests/xslt001.phpt:1.2 Mon Oct 27 11:28:43 2003
+++ php-src/ext/xsl/tests/xslt001.phpt Thu Jun 4 01:15:12 2009
@@ -1,7 +1,7 @@
--TEST--
Test 1: Transform To XML String
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 1: Transform To XML String;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt002.phpt?r1=1.3r2=1.3.8.1diff_format=u
Index: php-src/ext/xsl/tests/xslt002.phpt
diff -u php-src/ext/xsl/tests/xslt002.phpt:1.3
php-src/ext/xsl/tests/xslt002.phpt:1.3.8.1
--- php-src/ext/xsl/tests/xslt002.phpt:1.3 Sat Jan 10 11:50:49 2004
+++ php-src/ext/xsl/tests/xslt002.phpt Thu Jun 4 01:15:12 2009
@@ -1,7 +1,7 @@
--TEST--
Test 2: Transform To HTML String
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 2: Transform To HTML String;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt003.phpt?r1=1.3r2=1.3.8.1diff_format=u
Index: php-src/ext/xsl/tests/xslt003.phpt
diff -u php-src/ext/xsl/tests/xslt003.phpt:1.3
php-src/ext/xsl/tests/xslt003.phpt:1.3.8.1
--- php-src/ext/xsl/tests/xslt003.phpt:1.3 Mon Oct 27 11:28:43 2003
+++ php-src/ext/xsl/tests/xslt003.phpt Thu Jun 4 01:15:12 2009
@@ -1,7 +1,7 @@
--TEST--
Test 3: Using Parameters
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 3: Using Parameters;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt004.phpt?r1=1.3r2=1.3.8.1diff_format=u
Index: php-src/ext/xsl/tests/xslt004.phpt
diff -u php-src/ext/xsl/tests/xslt004.phpt:1.3
php-src/ext/xsl/tests/xslt004.phpt:1.3.8.1
--- php-src/ext/xsl/tests/xslt004.phpt:1.3 Sat Jan 10 11:50:49 2004
+++ php-src/ext/xsl/tests/xslt004.phpt Thu Jun 4 01:15:12 2009
@@ -1,7 +1,7 @@
--TEST--
Test 4: Checking UTF8 Output
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 4: Checking UTF8 Output;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt005.phpt?r1=1.3r2=1.3.8.1diff_format=u
Index: php-src/ext/xsl/tests/xslt005.phpt
diff -u php-src/ext/xsl/tests/xslt005.phpt:1.3
php-src/ext/xsl/tests/xslt005.phpt:1.3.8.1
--- php-src/ext/xsl/tests/xslt005.phpt:1.3 Sat Jan 10 11:50:49 2004
+++ php-src/ext/xsl/tests/xslt005.phpt Thu Jun 4 01:15:12 2009
@@ -1,7 +1,7 @@
--TEST--
Test 5: Checking Indent
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 5: Checking Indent;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt006.phpt?r1=1.2r2=1.2.8.1diff_format=u
Index: php-src/ext/xsl/tests/xslt006.phpt
diff -u php-src/ext/xsl/tests/xslt006.phpt:1.2
php-src/ext/xsl/tests/xslt006.phpt:1.2.8.1
--- php-src/ext/xsl/tests/xslt006.phpt:1.2 Mon Oct 27 11:28:43 2003
+++ php-src/ext/xsl/tests/xslt006.phpt Thu Jun 4 01:15:12 2009
@@ -1,7 +1,7 @@
--TEST--
Test 6: Transform To Doc
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 6: Transform To Doc;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt007.phpt?r1=1.2r2=1.2.8.1diff_format=u
Index: php-src/ext/xsl/tests/xslt007.phpt
diff -u php-src/ext/xsl/tests/xslt007.phpt:1.2
php-src/ext/xsl/tests/xslt007.phpt:1.2.8.1
--- php-src/ext/xsl/tests/xslt007.phpt:1.2 Mon Oct 27 11:28:43 2003
+++ php-src/ext/xsl/tests/xslt007.phpt Thu Jun 4 01:15:12 2009
@@ -1,7 +1,7 @@
--TEST--
Test 7: Transform To Uri
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once
[PHP-CVS] cvs: php-src(PHP_5_2) /ext/xsl/tests bug26384.phpt xslt001.phpt xslt002.phpt xslt003.phpt xslt004.phpt xslt005.phpt xslt006.phpt xslt007.phpt xslt008.phpt xslt009.phpt xslt010.phpt xslt011.p
felipe Thu Jun 4 01:16:58 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/xsl/tests bug26384.phpt xslt001.phpt xslt002.phpt
xslt003.phpt xslt004.phpt xslt005.phpt
xslt006.phpt xslt007.phpt xslt008.phpt
xslt009.phpt xslt010.phpt xslt011.phpt
xslt012.phpt
Log:
- Fixed tests
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/bug26384.phpt?r1=1.1r2=1.1.6.1diff_format=u
Index: php-src/ext/xsl/tests/bug26384.phpt
diff -u php-src/ext/xsl/tests/bug26384.phpt:1.1
php-src/ext/xsl/tests/bug26384.phpt:1.1.6.1
--- php-src/ext/xsl/tests/bug26384.phpt:1.1 Sat Nov 29 16:38:09 2003
+++ php-src/ext/xsl/tests/bug26384.phpt Thu Jun 4 01:16:58 2009
@@ -1,7 +1,7 @@
--TEST--
Bug #26384 (domxslt-process causes segfault with xsl:key)
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
$dom = new domDocument;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt001.phpt?r1=1.2r2=1.2.6.1diff_format=u
Index: php-src/ext/xsl/tests/xslt001.phpt
diff -u php-src/ext/xsl/tests/xslt001.phpt:1.2
php-src/ext/xsl/tests/xslt001.phpt:1.2.6.1
--- php-src/ext/xsl/tests/xslt001.phpt:1.2 Mon Oct 27 11:28:43 2003
+++ php-src/ext/xsl/tests/xslt001.phpt Thu Jun 4 01:16:58 2009
@@ -1,7 +1,7 @@
--TEST--
Test 1: Transform To XML String
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 1: Transform To XML String;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt002.phpt?r1=1.3r2=1.3.6.1diff_format=u
Index: php-src/ext/xsl/tests/xslt002.phpt
diff -u php-src/ext/xsl/tests/xslt002.phpt:1.3
php-src/ext/xsl/tests/xslt002.phpt:1.3.6.1
--- php-src/ext/xsl/tests/xslt002.phpt:1.3 Sat Jan 10 11:50:49 2004
+++ php-src/ext/xsl/tests/xslt002.phpt Thu Jun 4 01:16:58 2009
@@ -1,7 +1,7 @@
--TEST--
Test 2: Transform To HTML String
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 2: Transform To HTML String;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt003.phpt?r1=1.3r2=1.3.6.1diff_format=u
Index: php-src/ext/xsl/tests/xslt003.phpt
diff -u php-src/ext/xsl/tests/xslt003.phpt:1.3
php-src/ext/xsl/tests/xslt003.phpt:1.3.6.1
--- php-src/ext/xsl/tests/xslt003.phpt:1.3 Mon Oct 27 11:28:43 2003
+++ php-src/ext/xsl/tests/xslt003.phpt Thu Jun 4 01:16:58 2009
@@ -1,7 +1,7 @@
--TEST--
Test 3: Using Parameters
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 3: Using Parameters;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt004.phpt?r1=1.3r2=1.3.6.1diff_format=u
Index: php-src/ext/xsl/tests/xslt004.phpt
diff -u php-src/ext/xsl/tests/xslt004.phpt:1.3
php-src/ext/xsl/tests/xslt004.phpt:1.3.6.1
--- php-src/ext/xsl/tests/xslt004.phpt:1.3 Sat Jan 10 11:50:49 2004
+++ php-src/ext/xsl/tests/xslt004.phpt Thu Jun 4 01:16:58 2009
@@ -1,7 +1,7 @@
--TEST--
Test 4: Checking UTF8 Output
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 4: Checking UTF8 Output;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt005.phpt?r1=1.3r2=1.3.6.1diff_format=u
Index: php-src/ext/xsl/tests/xslt005.phpt
diff -u php-src/ext/xsl/tests/xslt005.phpt:1.3
php-src/ext/xsl/tests/xslt005.phpt:1.3.6.1
--- php-src/ext/xsl/tests/xslt005.phpt:1.3 Sat Jan 10 11:50:49 2004
+++ php-src/ext/xsl/tests/xslt005.phpt Thu Jun 4 01:16:58 2009
@@ -1,7 +1,7 @@
--TEST--
Test 5: Checking Indent
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 5: Checking Indent;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt006.phpt?r1=1.2r2=1.2.6.1diff_format=u
Index: php-src/ext/xsl/tests/xslt006.phpt
diff -u php-src/ext/xsl/tests/xslt006.phpt:1.2
php-src/ext/xsl/tests/xslt006.phpt:1.2.6.1
--- php-src/ext/xsl/tests/xslt006.phpt:1.2 Mon Oct 27 11:28:43 2003
+++ php-src/ext/xsl/tests/xslt006.phpt Thu Jun 4 01:16:58 2009
@@ -1,7 +1,7 @@
--TEST--
Test 6: Transform To Doc
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once dirname(__FILE__) .'/skipif.inc'; ?
--FILE--
?php
echo Test 6: Transform To Doc;
http://cvs.php.net/viewvc.cgi/php-src/ext/xsl/tests/xslt007.phpt?r1=1.2r2=1.2.6.1diff_format=u
Index: php-src/ext/xsl/tests/xslt007.phpt
diff -u php-src/ext/xsl/tests/xslt007.phpt:1.2
php-src/ext/xsl/tests/xslt007.phpt:1.2.6.1
--- php-src/ext/xsl/tests/xslt007.phpt:1.2 Mon Oct 27 11:28:43 2003
+++ php-src/ext/xsl/tests/xslt007.phpt Thu Jun 4 01:16:58 2009
@@ -1,7 +1,7 @@
--TEST--
Test 7: Transform To Uri
--SKIPIF--
-?php require_once('skipif.inc'); ?
+?php require_once
