[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/ mbfilter_utf8.c
hirokawa Wed, 07 Sep 2011 14:30:38 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316358
Log:
MFH: fixed invalid utf-8 check.
Changed paths:
U
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
Modified:
php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
===
--- php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
2011-09-07 14:30:06 UTC (rev 316357)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
2011-09-07 14:30:38 UTC (rev 316358)
@@ -101,10 +101,15 @@
int s, c1, w = 0, flag = 0;
if (c < 0x80) {
+ if (filter->status != 0) {
+ w = (filter->cache & MBFL_WCSGROUP_MASK) |
MBFL_WCSGROUP_THROUGH;
+ CK((*filter->output_function)(w, filter->data));
+ filter->status = 0;
+ filter->cache = 0;
+ }
if (c >= 0) {
CK((*filter->output_function)(c, filter->data));
}
- filter->status = 0;
} else if (c < 0xc0) {
int status = filter->status & 0xff;
switch (status) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt branches/PHP_5_4/ext/oci8/t
sixd Wed, 07 Sep 2011 19:19:00 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316384
Log:
Use unique object names to reduce potential clashes when testing in parallel
Changed paths:
U php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt
U php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt
U php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt
U php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_2.phpt
U php/php-src/trunk/ext/oci8/tests/bug42496_1.phpt
U php/php-src/trunk/ext/oci8/tests/bug42496_2.phpt
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt 2011-09-07
18:51:43 UTC (rev 316383)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_1.phpt 2011-09-07
19:19:00 UTC (rev 316384)
@@ -14,11 +14,11 @@
// Initialization
$stmtarray = array(
- "DROP table bug42496_tab",
- "CREATE table bug42496_tab(c1 CLOB, c2 CLOB)",
- "INSERT INTO bug42496_tab VALUES('test1', 'test1')",
- "INSERT INTO bug42496_tab VALUES('test2', 'test2')",
- "INSERT INTO bug42496_tab VALUES('test3', 'test3')"
+ "DROP table bug42496_1_tab",
+ "CREATE table bug42496_1_tab(c1 CLOB, c2 CLOB)",
+ "INSERT INTO bug42496_1_tab VALUES('test1', 'test1')",
+ "INSERT INTO bug42496_1_tab VALUES('test2', 'test2')",
+ "INSERT INTO bug42496_1_tab VALUES('test3', 'test3')"
);
oci8_test_sql_execute($c, $stmtarray);
@@ -28,7 +28,7 @@
echo "Test 1\n";
for ($i = 0; $i < 15000; $i++) {
- $s = oci_parse($c, "SELECT * from bug42496_tab");
+ $s = oci_parse($c, "SELECT * from bug42496_1_tab");
oci_define_by_name($s, "C1", $col1);
oci_define_by_name($s, "C2", $col2);
if (oci_execute($s)) {
@@ -46,7 +46,7 @@
// Cleanup
$stmtarray = array(
- "DROP table bug42496_tab"
+ "DROP table bug42496_1_tab"
);
oci8_test_sql_execute($c, $stmtarray);
Modified: php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt
===
--- php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt 2011-09-07
18:51:43 UTC (rev 316383)
+++ php/php-src/branches/PHP_5_3/ext/oci8/tests/bug42496_2.phpt 2011-09-07
19:19:00 UTC (rev 316384)
@@ -14,11 +14,11 @@
// Initialization
$stmtarray = array(
- "DROP table bug42496_tab",
- "CREATE table bug42496_tab(c1 CLOB, c2 CLOB)",
- "INSERT INTO bug42496_tab VALUES('test1', 'test1')",
- "INSERT INTO bug42496_tab VALUES('test2', 'test2')",
- "INSERT INTO bug42496_tab VALUES('test3', 'test3')"
+ "DROP table bug42496_2_tab",
+ "CREATE table bug42496_2_tab(c1 CLOB, c2 CLOB)",
+ "INSERT INTO bug42496_2_tab VALUES('test1', 'test1')",
+ "INSERT INTO bug42496_2_tab VALUES('test2', 'test2')",
+ "INSERT INTO bug42496_2_tab VALUES('test3', 'test3')"
);
oci8_test_sql_execute($c, $stmtarray);
@@ -28,7 +28,7 @@
echo "Test 2\n";
for ($i = 0; $i < 15000; $i++) {
- $s = oci_parse($c, "SELECT * from bug42496_tab");
+ $s = oci_parse($c, "SELECT * from bug42496_2_tab");
if (oci_execute($s)) {
$arr = array();
while ($arr = oci_fetch_assoc($s)) {
@@ -44,7 +44,7 @@
// Cleanup
$stmtarray = array(
- "DROP table bug42496_tab"
+ "DROP table bug42496_2_tab"
);
oci8_test_sql_execute($c, $stmtarray);
Modified: php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt
===
--- php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt 2011-09-07
18:51:43 UTC (rev 316383)
+++ php/php-src/branches/PHP_5_4/ext/oci8/tests/bug42496_1.phpt 2011-09-07
19:19:00 UTC (rev 316384)
@@ -14,11 +14,11 @@
// Initialization
$stmtarray = array(
- "DROP table bug42496_tab",
- "CREATE table bug42496_tab(c1 CLOB, c2 CLOB)",
- "INSERT INTO bug42496_tab VALUES('test1', 'test1')",
- "INSERT INTO bug42496_tab VALUES('test2', 'test2')",
- "INSERT INTO bug42496_tab VALUES('test3', 'test3')"
+ "DROP table bug42496_1_tab",
+ "CREATE table bug42496_1_tab(c1 CLOB, c2 CLOB)",
+ "INSERT INTO bug42496_1_tab VALUES('test1', 'test1')",
+ "INSERT INTO bug42496_1_tab VALUES('test2', 'test2')",
+ "INSERT INTO bug42496_1_tab VALUES('test3', 'test3')"
);
oci8_test_sql_execute($c, $stmtarray);
@@ -28,7 +28,7 @@
echo "Test 1\n";
for ($i = 0; $i < 15000; $i++) {
- $s = oci_parse($c, "SELECT * from bug42496_tab");
+ $s = oci_parse($c, "SELECT * from bug42496_1_tab");
oci_define_by_name($s, "C1", $col1);
oci_define_by_name($s, "C2", $col2);
if (oci_execute($s)) {
@@ -46,7 +46,7 @@
// Cleanup
$stmtarray = array(
- "DROP table bug42496_tab"
+ "DROP table
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_execute_API.c trunk/Zend/zend_execute_API.c
rasmus Wed, 07 Sep 2011 18:48:17 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316382
Log:
Make timeouts work again for shutdown functions.
Fixes the faling lang/045 test
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
U php/php-src/trunk/Zend/zend_execute_API.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c
===
--- php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2011-09-07
18:47:22 UTC (rev 316381)
+++ php/php-src/branches/PHP_5_4/Zend/zend_execute_API.c2011-09-07
18:48:17 UTC (rev 316382)
@@ -1328,6 +1328,13 @@
TSRMLS_FETCH();
if (zend_on_timeout) {
+ /*
+ We got here because we got a timeout signal, so we are in a
signal handler
+ at this point. However, we want to be able to timeout any
user-supplied
+ shutdown functions, so pretend we are not in a signal
handler while we are
+ calling these
+ */
+ SIGG(running) = 0;
zend_on_timeout(EG(timeout_seconds) TSRMLS_CC);
}
Modified: php/php-src/trunk/Zend/zend_execute_API.c
===
--- php/php-src/trunk/Zend/zend_execute_API.c 2011-09-07 18:47:22 UTC (rev
316381)
+++ php/php-src/trunk/Zend/zend_execute_API.c 2011-09-07 18:48:17 UTC (rev
316382)
@@ -1328,6 +1328,13 @@
TSRMLS_FETCH();
if (zend_on_timeout) {
+ /*
+ We got here because we got a timeout signal, so we are in a
signal handler
+ at this point. However, we want to be able to timeout any
user-supplied
+ shutdown functions, so pretend we are not in a signal
handler while we are
+ calling these
+ */
+ SIGG(running) = 0;
zend_on_timeout(EG(timeout_seconds) TSRMLS_CC);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/tests/general_functions/proc_open02.phpt branches/PHP_5_4/ext/standard/tests/general_functions/proc_open02.phpt trunk/ext/standard/tests/gene
rasmus Wed, 07 Sep 2011 18:09:34 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316379
Log:
This test was added to verify that bug 39322 was fixed, which the test
does test for and this works. However, it consistently failed because
it relied on a SIGHUP not terminating a sh -c /usr/bin/nohup sleep 50
process which doesn't work because the SIGHUP goes to the sh process
not the nohup'ed sleep process. So, I have sped up the test and removed
the nohup and instead of trying to SIGHUP I am just doing the equivalent
of a kill 0 on it to verify that the resource sticks around.
Bug: https://bugs.php.net/39322 (Closed) proc_terminate(): loosing process
resource
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open02.phpt
U
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_open02.phpt
U php/php-src/trunk/ext/standard/tests/general_functions/proc_open02.phpt
Modified:
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open02.phpt
===
---
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open02.phpt
2011-09-07 18:08:44 UTC (rev 316378)
+++
php/php-src/branches/PHP_5_3/ext/standard/tests/general_functions/proc_open02.phpt
2011-09-07 18:09:34 UTC (rev 316379)
@@ -3,7 +3,6 @@
--SKIPIF--
--FILE--
@@ -11,19 +10,19 @@
$ds = array(array('pipe', 'r'));
$cat = proc_open(
- '/usr/bin/nohup /bin/sleep 50',
+ '/bin/sleep 2',
$ds,
$pipes
);
-sleep(1); // let the OS run the nohup process before sending the signal
+usleep(2); // let the OS run the sleep process before sending the signal
-var_dump(proc_terminate($cat, 1)); // send a SIGHUP
-sleep(1);
+var_dump(proc_terminate($cat, 0)); // status check
+usleep(2);
var_dump(proc_get_status($cat));
var_dump(proc_terminate($cat)); // now really quit it
-sleep(1);
+usleep(2);
var_dump(proc_get_status($cat));
proc_close($cat);
@@ -35,7 +34,7 @@
bool(true)
array(8) {
["command"]=>
- string(28) "/usr/bin/nohup /bin/sleep 50"
+ string(12) "/bin/sleep 2"
["pid"]=>
int(%d)
["running"]=>
@@ -54,7 +53,7 @@
bool(true)
array(8) {
["command"]=>
- string(28) "/usr/bin/nohup /bin/sleep 50"
+ string(12) "/bin/sleep 2"
["pid"]=>
int(%d)
["running"]=>
Modified:
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_open02.phpt
===
---
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_open02.phpt
2011-09-07 18:08:44 UTC (rev 316378)
+++
php/php-src/branches/PHP_5_4/ext/standard/tests/general_functions/proc_open02.phpt
2011-09-07 18:09:34 UTC (rev 316379)
@@ -3,7 +3,6 @@
--SKIPIF--
--FILE--
@@ -11,19 +10,19 @@
$ds = array(array('pipe', 'r'));
$cat = proc_open(
- '/usr/bin/nohup /bin/sleep 50',
+ '/bin/sleep 2',
$ds,
$pipes
);
-sleep(1); // let the OS run the nohup process before sending the signal
+usleep(2); // let the OS run the sleep process before sending the signal
-var_dump(proc_terminate($cat, 1)); // send a SIGHUP
-sleep(1);
+var_dump(proc_terminate($cat, 0)); // status check
+usleep(2);
var_dump(proc_get_status($cat));
var_dump(proc_terminate($cat)); // now really quit it
-sleep(1);
+usleep(2);
var_dump(proc_get_status($cat));
proc_close($cat);
@@ -35,7 +34,7 @@
bool(true)
array(8) {
["command"]=>
- string(28) "/usr/bin/nohup /bin/sleep 50"
+ string(12) "/bin/sleep 2"
["pid"]=>
int(%d)
["running"]=>
@@ -54,7 +53,7 @@
bool(true)
array(8) {
["command"]=>
- string(28) "/usr/bin/nohup /bin/sleep 50"
+ string(12) "/bin/sleep 2"
["pid"]=>
int(%d)
["running"]=>
Modified:
php/php-src/trunk/ext/standard/tests/general_functions/proc_open02.phpt
===
--- php/php-src/trunk/ext/standard/tests/general_functions/proc_open02.phpt
2011-09-07 18:08:44 UTC (rev 316378)
+++ php/php-src/trunk/ext/standard/tests/general_functions/proc_open02.phpt
2011-09-07 18:09:34 UTC (rev 316379)
@@ -3,7 +3,6 @@
--SKIPIF--
--FILE--
@@ -11,19 +10,19 @@
$ds = array(array('pipe', 'r'));
$cat = proc_open(
- '/usr/bin/nohup /bin/sleep 50',
+ '/bin/sleep 2',
$ds,
$pipes
);
-sleep(1); // let the OS run the nohup process before sending the signal
+usleep(2); // let the OS run the sleep process before sending the signal
-var_dump(proc_terminate($cat, 1)); // send a SIGHUP
-sleep(1);
+var_dump(proc_terminate($cat, 0)); // status check
+usleep(2);
var_dump(proc_get_status($cat));
var_dump(proc_terminate($cat)); // now really quit it
-sleep(1);
+usleep(2);
var_dump(proc_get_status($cat));
proc_close($cat);
@@ -35,7 +34,7 @@
bool(true)
array(8) {
["command"]=>
- string(28) "/usr/
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/main/rfc1867.c branches/PHP_5_3/tests/basic/030.phpt branches/PHP_5_3/tests/basic/031.phpt branches/PHP_5_3/tests/basic/032.phpt bra
bjoriWed, 07 Sep 2011 16:19:09 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316373
Log:
Fixed bug #55504 (Content-Type header is not parsed correctly on HTTP POST
request
Bug: https://bugs.php.net/55504 (Assigned) Content-Type header is not parsed
correctly on HTTP POST request
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/main/rfc1867.c
A php/php-src/branches/PHP_5_3/tests/basic/030.phpt
A php/php-src/branches/PHP_5_3/tests/basic/031.phpt
A php/php-src/branches/PHP_5_3/tests/basic/032.phpt
U php/php-src/branches/PHP_5_4/main/rfc1867.c
A php/php-src/branches/PHP_5_4/tests/basic/030.phpt
A php/php-src/branches/PHP_5_4/tests/basic/031.phpt
A php/php-src/branches/PHP_5_4/tests/basic/032.phpt
U php/php-src/trunk/main/rfc1867.c
A php/php-src/trunk/tests/basic/030.phpt
A php/php-src/trunk/tests/basic/031.phpt
A php/php-src/trunk/tests/basic/032.phpt
Modified: php/php-src/branches/PHP_5_3/NEWS
===
--- php/php-src/branches/PHP_5_3/NEWS 2011-09-07 16:18:53 UTC (rev 316372)
+++ php/php-src/branches/PHP_5_3/NEWS 2011-09-07 16:19:09 UTC (rev 316373)
@@ -10,6 +10,8 @@
(Arpad)
. Fixed bug #55576: Cannot conditionally move uploaded file without race
condition. (Gustavo)
+ . Fixed bug #55504 (Content-Type header is not parsed correctly on
+HTTP POST request). (Hannes)
- DateTime:
. Fixed bug #48476 (cloning extended DateTime class without calling
Modified: php/php-src/branches/PHP_5_3/main/rfc1867.c
===
--- php/php-src/branches/PHP_5_3/main/rfc1867.c 2011-09-07 16:18:53 UTC (rev 316372)
+++ php/php-src/branches/PHP_5_3/main/rfc1867.c 2011-09-07 16:19:09 UTC (rev 316373)
@@ -816,7 +816,7 @@
}
} else {
/* search for the end of the boundary */
- boundary_end = strchr(boundary, ',');
+ boundary_end = strpbrk(boundary, ",;");
}
if (boundary_end) {
boundary_end[0] = '\0';
Added: php/php-src/branches/PHP_5_3/tests/basic/030.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/030.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/tests/basic/030.phpt 2011-09-07 16:19:09 UTC (rev 316373)
@@ -0,0 +1,20 @@
+--TEST--
+Bug#55504 (Content-Type header is not parsed correctly on HTTP POST request)
+--INI--
+file_uploads=1
+--POST_RAW--
+Content-Type: multipart/form-data; boundary=BVoyv; charset=iso-8859-1
+--BVoyv
+Content-Disposition: form-data; name="data"
+
+abc
+--BVoyv--
+--FILE--
+
+--EXPECT--
+array(1) {
+ ["data"]=>
+ string(3) "abc"
+}
Added: php/php-src/branches/PHP_5_3/tests/basic/031.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/031.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/tests/basic/031.phpt 2011-09-07 16:19:09 UTC (rev 316373)
@@ -0,0 +1,32 @@
+--TEST--
+Bug#55504 (Content-Type header is not parsed correctly on HTTP POST request)
+--INI--
+file_uploads=1
+--POST_RAW--
+Content-Type: multipart/form-data; boundary=BVoyv; charset=iso-8859-1
+--BVoyv
+Content-Disposition: form-data; name="data"
+
+abc
+--BVoyv
+Content-Disposition: form-data; name="data2"
+
+more data
+--BVoyv
+Content-Disposition: form-data; name="data3"
+
+even more data
+--BVoyv--
+--FILE--
+
+--EXPECT--
+array(3) {
+ ["data"]=>
+ string(3) "abc"
+ ["data2"]=>
+ string(9) "more data"
+ ["data3"]=>
+ string(14) "even more data"
+}
Added: php/php-src/branches/PHP_5_3/tests/basic/032.phpt
===
--- php/php-src/branches/PHP_5_3/tests/basic/032.phpt (rev 0)
+++ php/php-src/branches/PHP_5_3/tests/basic/032.phpt 2011-09-07 16:19:09 UTC (rev 316373)
@@ -0,0 +1,20 @@
+--TEST--
+Bug#18792 (no form variables after multipart/form-data)
+--INI--
+file_uploads=1
+--POST_RAW--
+Content-Type: multipart/form-data; boundary=BVoyv, charset=iso-8859-1
+--BVoyv
+Content-Disposition: form-data; name="data"
+
+abc
+--BVoyv--
+--FILE--
+
+--EXPECT--
+array(1) {
+ ["data"]=>
+ string(3) "abc"
+}
Modified: php/php-src/branches/PHP_5_4/main/rfc1867.c
===
--- php/php-src/branches/PHP_5_4/main/rfc1867.c 2011-09-07 16:18:53 UTC (rev 316372)
+++ php/php-src/branches/PHP_5_4/main/rfc1867.c 2011-09-07 16:19:09 UTC (rev 316373)
@@ -738,7 +738,7 @@
}
} else {
/* search for the end of the boundary */
- boundary_end = strchr(boundary, ',');
+ boundary_end = strpbrk(boundary, ",;");
}
if (boundary_end) {
boundary_end[0] = '\0';
Added: php/php-src/branches/PHP_5_4/tests/basic/030.phpt
===
--- php/php-src/branches/PHP_5_4/tests
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/curl/tests/curl_basic_008.phpt branches/PHP_5_4/ext/curl/tests/curl_basic_010.phpt trunk/ext/curl/tests/curl_basic_008.phpt trunk/ext/curl/tests/curl_
iliaaWed, 07 Sep 2011 15:31:48 + Revision: http://svn.php.net/viewvc?view=revision&revision=316365 Log: Fixed tests (skip when catch-all DNS such as openDNS is being used) Changed paths: U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_basic_008.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_basic_010.phpt U php/php-src/trunk/ext/curl/tests/curl_basic_008.phpt U php/php-src/trunk/ext/curl/tests/curl_basic_010.phpt Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_basic_008.phpt === --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_basic_008.phpt 2011-09-07 15:28:12 UTC (rev 316364) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_basic_008.phpt 2011-09-07 15:31:48 UTC (rev 316365) @@ -3,7 +3,13 @@ --CREDITS-- TestFest 2009 - AFUP - Perrick Penet --SKIPIF-- - + --FILE-- --SKIPIF-- - + --FILE-- --SKIPIF-- - + --FILE-- --SKIPIF-- - + --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/UPGRADING trunk/UPGRADING
cataphract Wed, 07 Sep 2011 15:28:12 + Revision: http://svn.php.net/viewvc?view=revision&revision=316364 Log: - Fixed doc bug #54657: Function parameters can no longer be named after superglobal variables. Bug: https://bugs.php.net/54657 (Open) Function parameters can no longer be named after superglobal variables Changed paths: U php/php-src/branches/PHP_5_4/UPGRADING U php/php-src/trunk/UPGRADING Modified: php/php-src/branches/PHP_5_4/UPGRADING === --- php/php-src/branches/PHP_5_4/UPGRADING 2011-09-07 15:13:30 UTC (rev 316363) +++ php/php-src/branches/PHP_5_4/UPGRADING 2011-09-07 15:28:12 UTC (rev 316364) @@ -116,6 +116,10 @@ Now emits a Fatal error due the incompatible declaration. +- In previous versions, names of superglobals could be used for parameter + names, thereby shadowing the corresponding superglobal. This now causes a + fatal error such as "Cannot re-assign auto-global variable GLOBALS". + = 4. Changes made to existing functions = Modified: php/php-src/trunk/UPGRADING === --- php/php-src/trunk/UPGRADING 2011-09-07 15:13:30 UTC (rev 316363) +++ php/php-src/trunk/UPGRADING 2011-09-07 15:28:12 UTC (rev 316364) @@ -102,6 +102,10 @@ $test = new StdClass; $test->baz = 1; +- In previous versions, names of superglobals could be used for parameter + names, thereby shadowing the corresponding superglobal. This now causes a + fatal error such as "Cannot re-assign auto-global variable GLOBALS". + = 4. Changes made to existing functions = -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/mbstring/libmbfl/filters/ mbfilter_utf8.c
hirokawa Wed, 07 Sep 2011 14:30:06 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316357
Log:
fixed invalid utf-8 check.
Changed paths:
U php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
Modified: php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
===
--- php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
2011-09-07 14:25:12 UTC (rev 316356)
+++ php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_utf8.c
2011-09-07 14:30:06 UTC (rev 316357)
@@ -101,10 +101,15 @@
int s, c1, w = 0, flag = 0;
if (c < 0x80) {
+ if (filter->status != 0) {
+ w = (filter->cache & MBFL_WCSGROUP_MASK) |
MBFL_WCSGROUP_THROUGH;
+ CK((*filter->output_function)(w, filter->data));
+ filter->status = 0;
+ filter->cache = 0;
+ }
if (c >= 0) {
CK((*filter->output_function)(c, filter->data));
}
- filter->status = 0;
} else if (c < 0xc0) {
int status = filter->status & 0xff;
switch (status) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS
bjoriWed, 07 Sep 2011 14:44:31 + Revision: http://svn.php.net/viewvc?view=revision&revision=316360 Log: Remove entries already in 5.3 Changed paths: U php/php-src/branches/PHP_5_4/NEWS Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-09-07 14:34:11 UTC (rev 316359) +++ php/php-src/branches/PHP_5_4/NEWS 2011-09-07 14:44:31 UTC (rev 316360) @@ -9,8 +9,6 @@ not empty. (Derick) . Fixed bug #55378: Binary number literal returns float number though its value is small enough. (Derick) - . Fixed bug #52461 (Incomplete doctype and missing xmlns). -(virsacer at web dot de, Pierre) . Added support for SORT_NATURAL and SORT_FLAG_CASE in array sort functions (sort, rsort, ksort, krsort, asort, arsort and array_multisort). FR#55158 (Arpad) @@ -29,10 +27,6 @@ support. (Rui) . Added the user user defined area for CP936 and CP950 (Rui). -- Improved NSAPI SAPI: - . Fixed bug#55403 (Don't set $_SERVER['HTTPS'] on unsecure connection). -(Uwe Schindler) - - Improved Reflection extension: . Added ReflectionClass::newInstanceWithoutConstructor() to create a new instance of a class without invoking its constructor. FR #55490. -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/zend_API.c branches/PHP_5_4/ext/standard/tests/file/005_variation2-win32.phpt branches/PHP_5_4/ext/standard/tests/file/copy_variation3-win32.phpt
instead of acting like that every time something does not fit in what you have in mind at a given mind, can you at least wait for a reply before do a revert? Just like you do in other cases? Especially if you have apparently are not well informed about what is all about. Thanks. On Wed, Sep 7, 2011 at 3:50 PM, Hannes Magnusson wrote: > bjori Wed, 07 Sep 2011 13:50:18 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=316354 > > Log: > Revert r316345 which fixes all the tests again > > Changed paths: > U php/php-src/branches/PHP_5_4/Zend/zend_API.c > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/005_variation2-win32.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/copy_variation3-win32.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_exists_variation1.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_get_contents_variation8-win32.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/file_put_contents_variation8-win32.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/filegroup_variation2.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileinode_variation2.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileowner_variation2.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/fileperms_variation2.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/filesize_variation5.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_dir_variation3.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_file_variation3.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_readable_variation3.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/is_writable_variation3.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/lstat_stat_variation22.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/mkdir_variation1-win32.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/popen_pclose_basic-win32.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/readfile_variation10-win32.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/realpath_variation-win32.phpt > U > php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7-win32.phpt > U php/php-src/trunk/Zend/zend_API.c > U php/php-src/trunk/ext/standard/tests/file/005_variation2-win32.phpt > U php/php-src/trunk/ext/standard/tests/file/copy_variation3-win32.phpt > U php/php-src/trunk/ext/standard/tests/file/file_exists_variation1.phpt > U > php/php-src/trunk/ext/standard/tests/file/file_get_contents_variation8-win32.phpt > U > php/php-src/trunk/ext/standard/tests/file/file_put_contents_variation8-win32.phpt > U php/php-src/trunk/ext/standard/tests/file/filegroup_variation2.phpt > U php/php-src/trunk/ext/standard/tests/file/fileinode_variation2.phpt > U php/php-src/trunk/ext/standard/tests/file/fileowner_variation2.phpt > U php/php-src/trunk/ext/standard/tests/file/fileperms_variation2.phpt > U php/php-src/trunk/ext/standard/tests/file/filesize_variation5.phpt > U php/php-src/trunk/ext/standard/tests/file/is_dir_variation3.phpt > U php/php-src/trunk/ext/standard/tests/file/is_file_variation3.phpt > U php/php-src/trunk/ext/standard/tests/file/is_readable_variation3.phpt > U php/php-src/trunk/ext/standard/tests/file/is_writable_variation3.phpt > U php/php-src/trunk/ext/standard/tests/file/lstat_stat_variation22.phpt > U php/php-src/trunk/ext/standard/tests/file/mkdir_variation1-win32.phpt > U php/php-src/trunk/ext/standard/tests/file/popen_pclose_basic-win32.phpt > U > php/php-src/trunk/ext/standard/tests/file/readfile_variation10-win32.phpt > U php/php-src/trunk/ext/standard/tests/file/realpath_variation-win32.phpt > U php/php-src/trunk/ext/standard/tests/file/tempnam_variation7-win32.phpt > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > -- Pierre @pierrejoye | 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
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/tests/closure_036.phpt branches/PHP_5_4/Zend/tests/closure_038.phpt branches/PHP_5_4/Zend/tests/closure_039.phpt branches/P
On Wed, Sep 7, 2011 at 16:00, Gustavo A. S. Lopes wrote: > On Wed, 07 Sep 2011 10:38:54 +0100, Hannes Magnusson > wrote: > >> On Wed, Sep 7, 2011 at 08:46, Stanislav Malyshev wrote: >>> >>> stas Wed, 07 Sep 2011 06:46:27 + >>> >>> Revision: http://svn.php.net/viewvc?view=revision&revision=316300 >>> >>> [...] >> >> @@ -20,7 +20,7 @@ >> >> $ca = $a->getIncrementor(); >> $cb = $ca->bindTo($b); >> -$cb2 = Closure::bind($b, $ca); >> +$cb2 = Closure::bind($ca, $b); >> >> >> That change seems a bit weird to me and quite big BC break. >> Please update the migration file with details on this. >> > > There's no BC break as this function is new in 5.4. Unless you mean BC > break from the latest alpha. Ahh. Explains why I had a hard time finding anything related in the docs :) -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/tests/closure_036.phpt branches/PHP_5_4/Zend/tests/closure_038.phpt branches/PHP_5_4/Zend/tests/closure_039.phpt branches/P
On Wed, 07 Sep 2011 10:38:54 +0100, Hannes Magnusson wrote: On Wed, Sep 7, 2011 at 08:46, Stanislav Malyshev wrote: stas Wed, 07 Sep 2011 06:46:27 + Revision: http://svn.php.net/viewvc?view=revision&revision=316300 [...] @@ -20,7 +20,7 @@ $ca = $a->getIncrementor(); $cb = $ca->bindTo($b); -$cb2 = Closure::bind($b, $ca); +$cb2 = Closure::bind($ca, $b); That change seems a bit weird to me and quite big BC break. Please update the migration file with details on this. There's no BC break as this function is new in 5.4. Unless you mean BC break from the latest alpha. -- Gustavo Lopes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/pcntl/config.m4 branches/PHP_5_4/ext/pcntl/config.m4 trunk/ext/pcntl/config.m4
bjoriWed, 07 Sep 2011 13:47:31 + Revision: http://svn.php.net/viewvc?view=revision&revision=316353 Log: Fix errormessage Changed paths: U php/php-src/branches/PHP_5_3/ext/pcntl/config.m4 U php/php-src/branches/PHP_5_4/ext/pcntl/config.m4 U php/php-src/trunk/ext/pcntl/config.m4 Modified: php/php-src/branches/PHP_5_3/ext/pcntl/config.m4 === --- php/php-src/branches/PHP_5_3/ext/pcntl/config.m42011-09-07 13:46:45 UTC (rev 316352) +++ php/php-src/branches/PHP_5_3/ext/pcntl/config.m42011-09-07 13:47:31 UTC (rev 316353) @@ -7,7 +7,7 @@ if test "$PHP_PCNTL" != "no"; then AC_CHECK_FUNCS(fork, [ AC_DEFINE(HAVE_FORK,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ]) - AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ]) + AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [ AC_MSG_ERROR(pcntl: waitpid() not supported by this platform) ]) AC_CHECK_FUNCS(sigaction, [ AC_DEFINE(HAVE_SIGACTION,1,[ ]) ], [ AC_MSG_ERROR(pcntl: sigaction() not supported by this platform) ]) AC_CHECK_FUNCS([getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait]) PHP_NEW_EXTENSION(pcntl, pcntl.c php_signal.c, $ext_shared, cli) Modified: php/php-src/branches/PHP_5_4/ext/pcntl/config.m4 === --- php/php-src/branches/PHP_5_4/ext/pcntl/config.m42011-09-07 13:46:45 UTC (rev 316352) +++ php/php-src/branches/PHP_5_4/ext/pcntl/config.m42011-09-07 13:47:31 UTC (rev 316353) @@ -7,7 +7,7 @@ if test "$PHP_PCNTL" != "no"; then AC_CHECK_FUNCS(fork, [ AC_DEFINE(HAVE_FORK,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ]) - AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ]) + AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [ AC_MSG_ERROR(pcntl: waitpid() not supported by this platform) ]) AC_CHECK_FUNCS(sigaction, [ AC_DEFINE(HAVE_SIGACTION,1,[ ]) ], [ AC_MSG_ERROR(pcntl: sigaction() not supported by this platform) ]) AC_CHECK_FUNCS([getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait]) PHP_NEW_EXTENSION(pcntl, pcntl.c php_signal.c, $ext_shared, cli) Modified: php/php-src/trunk/ext/pcntl/config.m4 === --- php/php-src/trunk/ext/pcntl/config.m4 2011-09-07 13:46:45 UTC (rev 316352) +++ php/php-src/trunk/ext/pcntl/config.m4 2011-09-07 13:47:31 UTC (rev 316353) @@ -7,7 +7,7 @@ if test "$PHP_PCNTL" != "no"; then AC_CHECK_FUNCS(fork, [ AC_DEFINE(HAVE_FORK,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ]) - AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [ AC_MSG_ERROR(pcntl: fork() not supported by this platform) ]) + AC_CHECK_FUNCS(waitpid, [ AC_DEFINE(HAVE_WAITPID,1,[ ]) ], [ AC_MSG_ERROR(pcntl: waitpid() not supported by this platform) ]) AC_CHECK_FUNCS(sigaction, [ AC_DEFINE(HAVE_SIGACTION,1,[ ]) ], [ AC_MSG_ERROR(pcntl: sigaction() not supported by this platform) ]) AC_CHECK_FUNCS([getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait]) PHP_NEW_EXTENSION(pcntl, pcntl.c php_signal.c, $ext_shared, cli) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/standard/ dl.c
bjoriWed, 07 Sep 2011 13:46:45 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316352
Log:
Fix folding
Changed paths:
U php/php-src/trunk/ext/standard/dl.c
Modified: php/php-src/trunk/ext/standard/dl.c
===
--- php/php-src/trunk/ext/standard/dl.c 2011-09-07 13:35:06 UTC (rev 316351)
+++ php/php-src/trunk/ext/standard/dl.c 2011-09-07 13:46:45 UTC (rev 316352)
@@ -97,9 +97,9 @@
#define USING_ZTS 0
#endif
-/* {{{ php_dl
+/* {{{ php_load_extension
*/
-PHPAPI int php_load_extension(char *filename, int type, int start_now
TSRMLS_DC) /* {{{ */
+PHPAPI int php_load_extension(char *filename, int type, int start_now
TSRMLS_DC)
{
void *handle;
char *libpath;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/UPGRADING branches/PHP_5_4/ext/mysql/config.m4 branches/PHP_5_4/ext/mysqli/config.m4 branches/PHP_5_4/ext/pdo_mysql/config.m4 trunk/
johannes Wed, 07 Sep 2011 13:33:56 + Revision: http://svn.php.net/viewvc?view=revision&revision=316350 Log: - Use myslqnd by default when MySQL extensions are activated but no path given Changed paths: U php/php-src/branches/PHP_5_4/NEWS U php/php-src/branches/PHP_5_4/UPGRADING U php/php-src/branches/PHP_5_4/ext/mysql/config.m4 U php/php-src/branches/PHP_5_4/ext/mysqli/config.m4 U php/php-src/branches/PHP_5_4/ext/pdo_mysql/config.m4 U php/php-src/trunk/ext/mysql/config.m4 U php/php-src/trunk/ext/mysqli/config.m4 U php/php-src/trunk/ext/pdo_mysql/config.m4 Modified: php/php-src/branches/PHP_5_4/NEWS === --- php/php-src/branches/PHP_5_4/NEWS 2011-09-07 12:59:04 UTC (rev 316349) +++ php/php-src/branches/PHP_5_4/NEWS 2011-09-07 13:33:56 UTC (rev 316350) @@ -15,6 +15,9 @@ sort functions (sort, rsort, ksort, krsort, asort, arsort and array_multisort). FR#55158 (Arpad) +- Improved MySQL extensions: + . ext/mysql, mysqli and pdo_mysql now use mysqlnd by defalt. (Johannes) + - Improved mbstring extension: . Added Shift_JIS/UTF-8 Emoji (pictograms) support. (Rui) . Added JIS X0213:2004 (Shift_JIS-2004, EUC-JP-2004, ISO-2022-JP-2004) Modified: php/php-src/branches/PHP_5_4/UPGRADING === --- php/php-src/branches/PHP_5_4/UPGRADING 2011-09-07 12:59:04 UTC (rev 316349) +++ php/php-src/branches/PHP_5_4/UPGRADING 2011-09-07 13:33:56 UTC (rev 316350) @@ -297,6 +297,9 @@ c. with changed behaviour +- The MySQL extensions (ext/mysql, mysqli and PDO_mysql) use mysqlnd + as defalt library now. It is still possible to use libmysql by + specifying a path to the configure options. - The session extension now can hook into the file upload feature in order to provide upload progress information through session variables. Modified: php/php-src/branches/PHP_5_4/ext/mysql/config.m4 === --- php/php-src/branches/PHP_5_4/ext/mysql/config.m4 2011-09-07 12:59:04 UTC (rev 316349) +++ php/php-src/branches/PHP_5_4/ext/mysql/config.m4 2011-09-07 13:33:56 UTC (rev 316350) @@ -41,8 +41,8 @@ PHP_ARG_WITH(mysql, for MySQL support, [ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base - directory. If mysqlnd is passed as DIR, - the MySQL native driver will be used [/usr/local]]) + directory, if no DIR is passed or the value is + mysqlnd the MySQL native driver will be used]) PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket, [ --with-mysql-sock[=DIR] MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer. @@ -53,7 +53,7 @@ [ --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix], no, no) fi -if test "$PHP_MYSQL" = "mysqlnd"; then +if test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL" = "mysqlnd"; then dnl enables build of mysqnd library PHP_MYSQLND_ENABLED=yes @@ -61,17 +61,15 @@ MYSQL_DIR= MYSQL_INC_DIR= - for i in $PHP_MYSQL /usr/local /usr; do -if test -r $i/include/mysql/mysql.h; then - MYSQL_DIR=$i - MYSQL_INC_DIR=$i/include/mysql - break -elif test -r $i/include/mysql.h; then - MYSQL_DIR=$i - MYSQL_INC_DIR=$i/include - break -fi - done + if test -r $PHP_MYSQL/include/mysql/mysql.h; then +MYSQL_DIR=$PHP_MYSQL +MYSQL_INC_DIR=$PHP_MYSQL/include/mysql +break + elif test -r $PHP_MYSQL/include/mysql.h; then +MYSQL_DIR=$PHP_MYSQL +MYSQL_INC_DIR=$PHP_MYSQL/include +break + fi if test -z "$MYSQL_DIR"; then AC_MSG_ERROR([Cannot find MySQL header files under $PHP_MYSQL. @@ -155,7 +153,7 @@ PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared) PHP_SUBST(MYSQL_SHARED_LIBADD) - if test "$PHP_MYSQL" = "mysqlnd"; then + if test "$PHP_MYSQL" = "yes" || test "$PHP_MYSQL" = "mysqlnd"; then PHP_ADD_EXTENSION_DEP(mysql, mysqlnd) AC_DEFINE([MYSQL_USE_MYSQLND], 1, [Whether mysqlnd is enabled]) fi Modified: php/php-src/branches/PHP_5_4/ext/mysqli/config.m4 === --- php/php-src/branches/PHP_5_4/ext/mysqli/config.m4 2011-09-07 12:59:04 UTC (rev 316349) +++ php/php-src/branches/PHP_5_4/ext/mysqli/config.m4 2011-09-07 13:33:56 UTC (rev 316350) @@ -4,24 +4,20 @@ PHP_ARG_WITH(mysqli, for MySQLi support, [ --with-mysqli[=FILE]Include MySQLi support. FILE is the path - to mysql_config. If mysqlnd is passed as FILE, - the MySQL native driver will be used [mysql_config]]) + to mysql_config. If no value or mysqlnd is passed + as FILE, the MySQL native driver will be used])
Re: [PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS
> - Removed features: > - . Removed magic_quotes_gpc, magic_quotes_runtime and magic_quotes_sybase > ini options. > - get_magic_quotes_gpc, get_magic_quotes_runtime are kept but always return > - false, set_magic_quotes_runtime raises an E_CORE_ERROR. (Pierrick, > Pierre) > + . Removed magic_quotes_gpc, magic_quotes_runtime and magic_quotes_sybase > + ini options. get_magic_quotes_gpc, get_magic_quotes_runtime are kept > + but always return false, set_magic_quotes_runtime raises an > + E_CORE_ERROR. (Pierrick, Pierre) maybe we should mention, that trying to enable magic_quotes through the ini files (or the -d for the cli) will also generate a fatal error AFAIR. -- Ferenc Kovács @Tyr43l - http://tyrael.hu -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/bug52041.phpt branches/PHP_5_4/Zend/zend_API.c branches/PHP_5_4/ext/standard/tests/file/005_variation2-win32.phpt branches/PHP_5_4/ext/stan
On Wed, Sep 7, 2011 at 14:33, Pierre Joye wrote: > pajoye Wed, 07 Sep 2011 12:33:22 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=316345 > > Log: > - reject paths with trainling spaces using the very good new zend arg > > Changed paths: > _U php/php-src/branches/PHP_5_4/Zend/tests/bug52041.phpt > U php/php-src/branches/PHP_5_4/Zend/zend_API.c Windows can mount other filesystems that do allow folders to be called " ". Please revert this. -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ext/iconv/
bjoriWed, 07 Sep 2011 12:32:56 + Revision: http://svn.php.net/viewvc?view=revision&revision=316344 Log: ignore another file generated by PHP_SETUP_ICONV php_iconv_aliased_libiconv.h Changed paths: _U php/php-src/branches/PHP_5_4/ext/iconv/ Property changes on: php/php-src/branches/PHP_5_4/ext/iconv ___ Modified: svn:ignore - #*# *.dsw *.la *.lo *.ncb *.opt *.plg *.tgz *~ #* deps libs Debug Debug_TS Makefile Makefile.fragments Makefile.global Makefile.objects Release Release_TS Release_TSDbg Release_TS_inline Release_inline acinclude.m4 aclocal.m4 autom4te.cache build config.cache config.guess config.h config.h.in config.log config.nice config.status config.sub configure configure.in conftest conftest.c include install-sh libtool ltmain.sh missing mkinstalldirs modules scan_makefile_in.awk *.gcda *.gcno php_have_bsd_iconv.h php_have_ibm_iconv.h php_have_libiconv.h php_php_iconv_h_path.h php_have_glibc_iconv.h php_php_iconv_impl.h php_have_iconv.h php_iconv_supports_errno.h + #*# *.dsw *.la *.lo *.ncb *.opt *.plg *.tgz *~ #* deps libs Debug Debug_TS Makefile Makefile.fragments Makefile.global Makefile.objects Release Release_TS Release_TSDbg Release_TS_inline Release_inline acinclude.m4 aclocal.m4 autom4te.cache build config.cache config.guess config.h config.h.in config.log config.nice config.status config.sub configure configure.in conftest conftest.c include install-sh libtool ltmain.sh missing mkinstalldirs modules scan_makefile_in.awk *.gcda *.gcno php_have_bsd_iconv.h php_have_ibm_iconv.h php_have_libiconv.h php_php_iconv_h_path.h php_have_glibc_iconv.h php_php_iconv_impl.h php_have_iconv.h php_iconv_supports_errno.h php_iconv_aliased_libiconv.h -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/ NEWS
bjoriWed, 07 Sep 2011 12:30:31 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316343
Log:
wrap lines, use real names, and FR not Req
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
Modified: php/php-src/branches/PHP_5_4/NEWS
===
--- php/php-src/branches/PHP_5_4/NEWS 2011-09-07 12:28:03 UTC (rev 316342)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-09-07 12:30:31 UTC (rev 316343)
@@ -6,60 +6,68 @@
. Implemented closure rebinding as parameter to bindTo. (Gustavo Lopes)
. Turn on html_errors by default again in php.ini-production like it was in
PHP 5.3, but only generate docref links when the docref_root INI setting is
-not empty.
- . Fixed bug #55378: Binary number literal returns float number though its
value
-is small enough. (Derick)
+not empty. (Derick)
+ . Fixed bug #55378: Binary number literal returns float number though its
+value is small enough. (Derick)
. Fixed bug #52461 (Incomplete doctype and missing xmlns).
(virsacer at web dot de, Pierre)
- . Added support for SORT_NATURAL and SORT_FLAG_CASE in array sort functions:
-sort, rsort, ksort, krsort, asort, arsort and array_multisort. Req #55158
(Arpad)
+ . Added support for SORT_NATURAL and SORT_FLAG_CASE in array
+sort functions (sort, rsort, ksort, krsort, asort, arsort and
+array_multisort). FR#55158 (Arpad)
- Improved mbstring extension:
. Added Shift_JIS/UTF-8 Emoji (pictograms) support. (Rui)
- . Added JIS X0213:2004 (Shift_JIS-2004, EUC-JP-2004, ISO-2022-JP-2004)
support. (Rui)
+ . Added JIS X0213:2004 (Shift_JIS-2004, EUC-JP-2004, ISO-2022-JP-2004)
+support. (Rui)
. Ill-formed UTF-8 check for security enhancements. (Rui)
. Added MacJapanese (Shift_JIS) and gb18030 encoding support. (Rui)
. Added encode/decode in hex format to mb_[en|de]code_numericentity(). (Rui)
- . Added user JIS X0213:2004 (Shift_JIS-2004, EUC-JP-2004, ISO-2022-JP-2004)
support. (Rui)
+ . Added user JIS X0213:2004 (Shift_JIS-2004, EUC-JP-2004, ISO-2022-JP-2004)
+support. (Rui)
. Added the user user defined area for CP936 and CP950 (Rui).
-- Improved NSAPI SAPI: (Uwe Schindler)
- . Don't set $_SERVER['HTTPS'] on unsecure connection (bug #55403).
+- Improved NSAPI SAPI:
+ . Fixed bug#55403 (Don't set $_SERVER['HTTPS'] on unsecure connection).
+(Uwe Schindler)
- Improved Reflection extension:
. Added ReflectionClass::newInstanceWithoutConstructor() to create a new
-instance of a class without invoking its constructor. FR #55490.
(Sebastian)
+instance of a class without invoking its constructor. FR #55490.
+(Sebastian)
- Improved intl extension:
. Fixed bug #55562 (grapheme_substr() returns false on big length). (Stas)
- Improved JSON extension:
- . Added new json_encode() option JSON_UNESCAPED_UNICODE. FR #53946. (Irker,
Gwynne)
+ . Added new json_encode() option JSON_UNESCAPED_UNICODE. FR #53946.
+(Alexander, Gwynne)
- Improved CLI SAPI:
- . Added friendly log messages - Req #55109 (Arpad)
+ . Added friendly log messages - FR #55109 (Arpad)
- Improved readline extension:
. Fixed bug #54450 (Enable callback support when built against libedit).
(fedora at famillecollet dot com, Hannes)
- Improved Session extension:
- . Expose session status via new function, session_status (Req #52982) (Arpad)
+ . Expose session status via new function, session_status (FR #52982) (Arpad)
- Improved XSL extension:
- . XSL doesn't stop transformation anymore, if a PHP function can't be called
(chregu)
+ . XSL doesn't stop transformation anymore, if a PHP function can't be called
+(Christian)
04 Aug 2011, PHP 5.4.0 Alpha 3
- Added features:
- . Short array syntax, see UPGRADING guide for full details (rsky0711 at gmail
- . com, sebastian.deutsch at 9elements . com, Pierre)
+ . Short array syntax, see UPGRADING guide for full details
+ (rsky0711 at gmail . com, sebastian.deutsch at 9elements . com, Pierre)
. Binary numbers format (0b001010). (Jonah dot Harris at gmail dot com)
. Support for Class::{expr}() syntax (Pierrick)
- Removed features:
- . Removed magic_quotes_gpc, magic_quotes_runtime and magic_quotes_sybase ini
options.
-get_magic_quotes_gpc, get_magic_quotes_runtime are kept but always return
-false, set_magic_quotes_runtime raises an E_CORE_ERROR. (Pierrick, Pierre)
+ . Removed magic_quotes_gpc, magic_quotes_runtime and magic_quotes_sybase
+ini options. get_magic_quotes_gpc, get_magic_quotes_runtime are kept
+but always return false, set_magic_quotes_runtime raises an
+E_CORE_ERROR. (Pierrick, Pierre)
- Changed E_ALL to include E_STRICT. (Stas)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/tests/lang/034.phpt branches/PHP_5_4/tests/lang/034.phpt trunk/tests/lang/034.phpt
bjoriWed, 07 Sep 2011 12:06:21 + Revision: http://svn.php.net/viewvc?view=revision&revision=316339 Log: Add skip message Changed paths: U php/php-src/branches/PHP_5_3/tests/lang/034.phpt U php/php-src/branches/PHP_5_4/tests/lang/034.phpt U php/php-src/trunk/tests/lang/034.phpt Modified: php/php-src/branches/PHP_5_3/tests/lang/034.phpt === --- php/php-src/branches/PHP_5_3/tests/lang/034.phpt2011-09-07 12:05:19 UTC (rev 316338) +++ php/php-src/branches/PHP_5_3/tests/lang/034.phpt2011-09-07 12:06:21 UTC (rev 316339) @@ -5,7 +5,7 @@ --SKIPIF-- --FILE-- Modified: php/php-src/branches/PHP_5_4/tests/lang/034.phpt === --- php/php-src/branches/PHP_5_4/tests/lang/034.phpt2011-09-07 12:05:19 UTC (rev 316338) +++ php/php-src/branches/PHP_5_4/tests/lang/034.phpt2011-09-07 12:06:21 UTC (rev 316339) @@ -5,7 +5,7 @@ --SKIPIF-- --FILE-- Modified: php/php-src/trunk/tests/lang/034.phpt === --- php/php-src/trunk/tests/lang/034.phpt 2011-09-07 12:05:19 UTC (rev 316338) +++ php/php-src/trunk/tests/lang/034.phpt 2011-09-07 12:06:21 UTC (rev 316339) @@ -5,7 +5,7 @@ --SKIPIF-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt branches/PHP_5_3/ext/zip/tests/bug53885.phpt
bjoriWed, 07 Sep 2011 12:05:19 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316338
Log:
Fix cleanup routines
Changed paths:
U
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
U
php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
U php/php-src/branches/PHP_5_3/ext/zip/tests/bug53885.phpt
U
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
U
php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
U php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt
U php/php-src/branches/PHP_5_4/ext/zip/tests/bug53885.phpt
U php/php-src/trunk/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
U php/php-src/trunk/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
U php/php-src/trunk/ext/spl/tests/SplFileObject_fputcsv.phpt
U php/php-src/trunk/ext/standard/tests/file/bug55124.phpt
U php/php-src/trunk/ext/zip/tests/bug53885.phpt
Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -10,7 +10,7 @@
#Test Fest Cesena (Italy) on 2009-06-20
--FILE--
--CLEAN--
--EXPECTF--
Modified: php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
===
--- php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_3/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -10,7 +10,7 @@
#Test Fest Cesena (Italy) on 2009-06-20
--FILE--
--CLEAN--
--EXPECTF--
Modified: php/php-src/branches/PHP_5_3/ext/zip/tests/bug53885.phpt
===
--- php/php-src/branches/PHP_5_3/ext/zip/tests/bug53885.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_3/ext/zip/tests/bug53885.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -15,5 +15,10 @@
$nx->statName("a",ZIPARCHIVE::FL_UNCHANGED);
?>
==DONE==
+--CLEAN--
+
--EXPECTF--
==DONE==
Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getGroup_basic.phpt
===
--- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getGroup_basic.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -10,7 +10,7 @@
#Test Fest Cesena (Italy) on 2009-06-20
--FILE--
--CLEAN--
--EXPECTF--
Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getOwner_basic.phpt
===
--- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileInfo_getOwner_basic.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -10,7 +10,7 @@
#Test Fest Cesena (Italy) on 2009-06-20
--FILE--
--CLEAN--
--EXPECTF--
Modified: php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt
===
--- php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_4/ext/spl/tests/SplFileObject_fputcsv.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -2,7 +2,7 @@
SplFileObject::fputcsv(): functionality tests
--FILE--
--CLEAN--
--EXPECT--
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt
===
--- php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/bug55124.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -8,7 +8,7 @@
if (is_dir('a/b')) {
rmdir('a/b');
}
-if (is_dir('/a')) {
+if (is_dir('./a')) {
rmdir('a');
}
chdir($old_dir_path);
Modified: php/php-src/branches/PHP_5_4/ext/zip/tests/bug53885.phpt
===
--- php/php-src/branches/PHP_5_4/ext/zip/tests/bug53885.phpt 2011-09-07 12:02:33 UTC (rev 316337)
+++ php/php-src/branches/PHP_5_4/ext/zip/tests/bug53885.phpt 2011-09-07 12:05:19 UTC (rev 316338)
@@ -15,5 +15,10 @@
$nx->statName("a",ZIPARCHIVE::FL_UNCHANGED);
?>
==DONE==
+--CLEAN--
+
--EXPECTF--
==DONE==
Modified: php/php-src/trunk/ext/spl/tests/SplFileInfo_getGroup_basic
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/soap/tests/schema/schema064.phpt branches/PHP_5_4/ext/soap/tests/schema/schema064.phpt trunk/ext/soap/tests/schema/schema064.phpt
pajoye Wed, 07 Sep 2011 11:26:59 + Revision: http://svn.php.net/viewvc?view=revision&revision=316336 Log: - skip on win, diff TZ format Changed paths: U php/php-src/branches/PHP_5_3/ext/soap/tests/schema/schema064.phpt U php/php-src/branches/PHP_5_4/ext/soap/tests/schema/schema064.phpt U php/php-src/trunk/ext/soap/tests/schema/schema064.phpt Modified: php/php-src/branches/PHP_5_3/ext/soap/tests/schema/schema064.phpt === --- php/php-src/branches/PHP_5_3/ext/soap/tests/schema/schema064.phpt 2011-09-07 11:15:05 UTC (rev 316335) +++ php/php-src/branches/PHP_5_3/ext/soap/tests/schema/schema064.phpt 2011-09-07 11:26:59 UTC (rev 316336) @@ -1,7 +1,11 @@ --TEST-- SOAP XML Schema 64: standard date/time types --SKIPIF-- - + --FILE-- + --FILE-- + --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/Zend/tests/bug39304.phpt branches/PHP_5_4/Zend/tests/isset_003.phpt trunk/Zend/tests/bug39304.phpt trunk/Zend/tests/isset_003.phpt
bjoriWed, 07 Sep 2011 10:44:32 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316330
Log:
Remove bogus skipif and make adjust the tests
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/tests/bug39304.phpt
U php/php-src/branches/PHP_5_4/Zend/tests/isset_003.phpt
U php/php-src/trunk/Zend/tests/bug39304.phpt
U php/php-src/trunk/Zend/tests/isset_003.phpt
Modified: php/php-src/branches/PHP_5_4/Zend/tests/bug39304.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/bug39304.phpt 2011-09-07
10:41:38 UTC (rev 316329)
+++ php/php-src/branches/PHP_5_4/Zend/tests/bug39304.phpt 2011-09-07
10:44:32 UTC (rev 316330)
@@ -1,13 +1,16 @@
--TEST--
Bug #39304 (Segmentation fault with list unpacking of string offset)
---SKIPIF--
-=')) die('skip ZendEngine
2.4 needed'); ?>
--FILE--
--EXPECTF--
Notice: Uninitialized string offset: 0 in %sbug39304.php on line 3
-Fatal error: Cannot use string offset as an array in %sbug39304.php on line 3
+Notice: Uninitialized string offset: 1 in %sbug39304.php on line 3
+
+Notice: Uninitialized string offset: 0 in %sbug39304.php on line 3
+I am alive
+
Modified: php/php-src/branches/PHP_5_4/Zend/tests/isset_003.phpt
===
--- php/php-src/branches/PHP_5_4/Zend/tests/isset_003.phpt 2011-09-07
10:41:38 UTC (rev 316329)
+++ php/php-src/branches/PHP_5_4/Zend/tests/isset_003.phpt 2011-09-07
10:44:32 UTC (rev 316330)
@@ -1,7 +1,5 @@
--TEST--
Testing isset accessing undefined array itens and properties
---SKIPIF--
-=')) die('skip ZendEngine
2.3 or below needed'); ?>
--FILE--
=')) die('skip ZendEngine
2.4 needed'); ?>
--FILE--
--EXPECTF--
Notice: Uninitialized string offset: 0 in %sbug39304.php on line 3
-Fatal error: Cannot use string offset as an array in %sbug39304.php on line 3
+Notice: Uninitialized string offset: 1 in %sbug39304.php on line 3
+
+Notice: Uninitialized string offset: 0 in %sbug39304.php on line 3
+I am alive
+
Modified: php/php-src/trunk/Zend/tests/isset_003.phpt
===
--- php/php-src/trunk/Zend/tests/isset_003.phpt 2011-09-07 10:41:38 UTC (rev
316329)
+++ php/php-src/trunk/Zend/tests/isset_003.phpt 2011-09-07 10:44:32 UTC (rev
316330)
@@ -1,7 +1,5 @@
--TEST--
Testing isset accessing undefined array itens and properties
---SKIPIF--
-=')) die('skip ZendEngine
2.3 or below needed'); ?>
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt trunk/ext/standard/tests/file/tempnam_variation7.phpt
bjoriWed, 07 Sep 2011 10:41:38 + Revision: http://svn.php.net/viewvc?view=revision&revision=316329 Log: The error message is different when built with zts Changed paths: U php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt U php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt === --- php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt 2011-09-07 10:40:12 UTC (rev 316328) +++ php/php-src/branches/PHP_5_4/ext/standard/tests/file/tempnam_variation7.phpt 2011-09-07 10:41:38 UTC (rev 316329) @@ -98,13 +98,13 @@ Warning: tempnam() expects parameter 1 to be a valid path, string given in %s on line %d -- File is not created -- -Warning: unlink(): No such file or directory in %s on line %d +Warning: unlink(): %s in %s on line %d -- Iteration 7 -- Warning: tempnam() expects parameter 1 to be a valid path, array given in %s on line %d -- File is not created -- -Warning: unlink(): No such file or directory in %s on line %d +Warning: unlink(): %s in %s on line %d -- Iteration 8 -- File name is => %s/tempnam_variation3.tmp%s File permissions are => 100600 Modified: php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt === --- php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt 2011-09-07 10:40:12 UTC (rev 316328) +++ php/php-src/trunk/ext/standard/tests/file/tempnam_variation7.phpt 2011-09-07 10:41:38 UTC (rev 316329) @@ -98,13 +98,13 @@ Warning: tempnam() expects parameter 1 to be a valid path, string given in %s on line %d -- File is not created -- -Warning: unlink(): No such file or directory in %s on line %d +Warning: unlink(): %s in %s on line %d -- Iteration 7 -- Warning: tempnam() expects parameter 1 to be a valid path, array given in %s on line %d -- File is not created -- -Warning: unlink(): No such file or directory in %s on line %d +Warning: unlink(): %s in %s on line %d -- Iteration 8 -- File name is => %s/tempnam_variation3.tmp%s File permissions are => 100600 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt branches/PHP_5_4/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt trunk/ext/imap/tests/imap_utf8_to_mutf7_basic.p
bjoriWed, 07 Sep 2011 10:39:55 + Revision: http://svn.php.net/viewvc?view=revision&revision=316327 Log: Update skipif Changed paths: U php/php-src/branches/PHP_5_3/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt U php/php-src/branches/PHP_5_4/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt U php/php-src/trunk/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt Modified: php/php-src/branches/PHP_5_3/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt === --- php/php-src/branches/PHP_5_3/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt 2011-09-07 10:39:27 UTC (rev 316326) +++ php/php-src/branches/PHP_5_3/ext/imap/tests/imap_utf8_to_mutf7_basic.phpt 2011-09-07 10:39:55 UTC (rev 316327) @@ -1,8 +1,8 @@ --TEST-- imap_utf8_to_mutf7 --SKIPIF-- - - + + --FILE-- - + + --FILE-- - + + --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_002.phpt trunk/ext/curl/tests/curl_basic_011.phpt
bjoriWed, 07 Sep 2011 10:38:53 + Revision: http://svn.php.net/viewvc?view=revision&revision=316325 Log: Sync tests between branches and fix the getcontent test Changed paths: U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_002.phpt U php/php-src/trunk/ext/curl/tests/curl_basic_011.phpt U php/php-src/trunk/ext/curl/tests/curl_basic_012.phpt U php/php-src/trunk/ext/curl/tests/curl_basic_013.phpt U php/php-src/trunk/ext/curl/tests/curl_multi_getcontent_basic3.phpt Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt === --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt 2011-09-07 10:38:23 UTC (rev 316324) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_multi_getcontent_basic3.phpt 2011-09-07 10:38:53 UTC (rev 316325) @@ -5,7 +5,7 @@ #TestFest Utrecht 20090509 --SKIPIF-- --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- --SKIPIF-- - + --FILE-- --SKIPIF-- - + --FILE-- --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt branches/PHP_5_3/ext/curl/tests/curl_basic_011.phpt branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_001.p
bjoriWed, 07 Sep 2011 10:34:58 + Revision: http://svn.php.net/viewvc?view=revision&revision=316323 Log: Update skipif message Changed paths: U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_basic_011.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_001.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_002.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_004.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_005.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_006.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_007.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic003.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic004.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_version_error.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_version_variation1.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_writeheader_callback.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_CURLOPT_READDATA.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_basic_011.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_001.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_004.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_005.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_006.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_007.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_multi_getcontent_basic3.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic002.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic003.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic004.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_version_error.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_version_variation1.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_writeheader_callback.phpt U php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt U php/php-src/trunk/ext/curl/tests/curl_basic_011.phpt U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_001.phpt U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_002.phpt U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_004.phpt U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_005.phpt U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_006.phpt U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_007.phpt U php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt U php/php-src/trunk/ext/curl/tests/curl_setopt_basic003.phpt U php/php-src/trunk/ext/curl/tests/curl_setopt_basic004.phpt U php/php-src/trunk/ext/curl/tests/curl_version_error.phpt U php/php-src/trunk/ext/curl/tests/curl_version_variation1.phpt U php/php-src/trunk/ext/curl/tests/curl_writeheader_callback.phpt Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt === --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Mattijs Hoitink mattijshoit...@gmail.com #Testfest Utrecht 2009 --SKIPIF-- - + --FILE-- --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- + --FILE-- + --FILE-- + --FILE-- + --FILE-- --FILE-- --FILE-- + --FILE-- + --FILE-- --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- + --FILE-- --FILE-- + --FILE-- + --FILE-- + --FILE-- --FILE-- --FILE-- + --FILE-- + --FILE-- --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- #testfest Utrecht 2009 --SKIPIF-- - + --FILE-- + --FILE-- + --FILE-- + --FILE--
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3/ext/tidy/tests/ 010.phpt 012.phpt 024.phpt 025.phpt
pajoye Wed, 07 Sep 2011 10:14:18 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316318
Log:
- force LF (svn prop and config)
Changed paths:
UU php/php-src/branches/PHP_5_3/ext/tidy/tests/010.phpt
UU php/php-src/branches/PHP_5_3/ext/tidy/tests/012.phpt
UU php/php-src/branches/PHP_5_3/ext/tidy/tests/024.phpt
UU php/php-src/branches/PHP_5_3/ext/tidy/tests/025.phpt
Modified: php/php-src/branches/PHP_5_3/ext/tidy/tests/010.phpt
===
--- php/php-src/branches/PHP_5_3/ext/tidy/tests/010.phpt2011-09-07
10:14:02 UTC (rev 316317)
+++ php/php-src/branches/PHP_5_3/ext/tidy/tests/010.phpt2011-09-07
10:14:18 UTC (rev 316318)
@@ -4,12 +4,12 @@
--FILE--
");
-var_dump($a->root());
-var_dump($a->body());
-var_dump($a->html());
-var_dump($a->head());
-
+$a = tidy_parse_string("", array('newline' => 'LF'));
+var_dump($a->root());
+var_dump($a->body());
+var_dump($a->html());
+var_dump($a->head());
+
?>
--EXPECT--
object(tidyNode)#2 (8) {
Property changes on: php/php-src/branches/PHP_5_3/ext/tidy/tests/010.phpt
___
Modified: svn:eol-style
- native
+ LF
Modified: php/php-src/branches/PHP_5_3/ext/tidy/tests/012.phpt
===
--- php/php-src/branches/PHP_5_3/ext/tidy/tests/012.phpt2011-09-07
10:14:02 UTC (rev 316317)
+++ php/php-src/branches/PHP_5_3/ext/tidy/tests/012.phpt2011-09-07
10:14:18 UTC (rev 316318)
@@ -25,7 +25,7 @@
}
- $a = tidy_parse_string("HiByeTest");
+ $a = tidy_parse_string("HiByeTest", array('newline' =>
'LF'));
$html = $a->html();
dump_nodes($html);
Property changes on: php/php-src/branches/PHP_5_3/ext/tidy/tests/012.phpt
___
Modified: svn:eol-style
- native
+ LF
Modified: php/php-src/branches/PHP_5_3/ext/tidy/tests/024.phpt
===
--- php/php-src/branches/PHP_5_3/ext/tidy/tests/024.phpt2011-09-07
10:14:02 UTC (rev 316317)
+++ php/php-src/branches/PHP_5_3/ext/tidy/tests/024.phpt2011-09-07
10:14:18 UTC (rev 316318)
@@ -18,7 +18,8 @@
';
$config = array(
-'new-blocklevel-tags' => 'wps:block,wps:var,wps:value'
+'new-blocklevel-tags' => 'wps:block,wps:var,wps:value',
+'newline' => 'LF'
);
$tidy = tidy_parse_string($contents, $config, 'utf8');
Property changes on: php/php-src/branches/PHP_5_3/ext/tidy/tests/024.phpt
___
Modified: svn:eol-style
- native
+ LF
Modified: php/php-src/branches/PHP_5_3/ext/tidy/tests/025.phpt
===
--- php/php-src/branches/PHP_5_3/ext/tidy/tests/025.phpt2011-09-07
10:14:02 UTC (rev 316317)
+++ php/php-src/branches/PHP_5_3/ext/tidy/tests/025.phpt2011-09-07
10:14:18 UTC (rev 316318)
@@ -5,16 +5,16 @@
--FILE--
');
+$tidy=tidy_parse_string('<% %>', array('newline' => 'LF'));
var_dump($tidy->Root()->child[0]->isAsp());
-$tidy=tidy_parse_string('<# #>');
+$tidy=tidy_parse_string('<# #>', array('newline' => 'LF'));
var_dump($tidy->Root()->child[0]->isJste());
$tidy=tidy_parse_string('text');
var_dump($tidy->Root()->child[0]->child[1]->child[0]->isText());
-$tidy=tidy_parse_string('');
+$tidy=tidy_parse_string('',
array('newline' => 'LF'));
$n = $tidy->Root()->child[0]->child[1]->child[0];
var_dump($n->isComment());
var_dump((string)$n);
Property changes on: php/php-src/branches/PHP_5_3/ext/tidy/tests/025.phpt
___
Modified: svn:eol-style
- native
+ LF
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/trunk/ext/tidy/tests/ 010.phpt 012.phpt 024.phpt 025.phpt
pajoye Wed, 07 Sep 2011 10:14:02 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316317
Log:
- force LF (svn prop and config)
Changed paths:
U php/php-src/trunk/ext/tidy/tests/010.phpt
U php/php-src/trunk/ext/tidy/tests/012.phpt
U php/php-src/trunk/ext/tidy/tests/024.phpt
U php/php-src/trunk/ext/tidy/tests/025.phpt
Modified: php/php-src/trunk/ext/tidy/tests/010.phpt
===
--- php/php-src/trunk/ext/tidy/tests/010.phpt 2011-09-07 10:13:33 UTC (rev
316316)
+++ php/php-src/trunk/ext/tidy/tests/010.phpt 2011-09-07 10:14:02 UTC (rev
316317)
@@ -4,12 +4,12 @@
--FILE--
");
-var_dump($a->root());
-var_dump($a->body());
-var_dump($a->html());
-var_dump($a->head());
-
+$a = tidy_parse_string("", array('newline' => 'LF'));
+var_dump($a->root());
+var_dump($a->body());
+var_dump($a->html());
+var_dump($a->head());
+
?>
--EXPECT--
object(tidyNode)#2 (8) {
Modified: php/php-src/trunk/ext/tidy/tests/012.phpt
===
--- php/php-src/trunk/ext/tidy/tests/012.phpt 2011-09-07 10:13:33 UTC (rev
316316)
+++ php/php-src/trunk/ext/tidy/tests/012.phpt 2011-09-07 10:14:02 UTC (rev
316317)
@@ -25,7 +25,7 @@
}
- $a = tidy_parse_string("HiByeTest");
+ $a = tidy_parse_string("HiByeTest", array('newline' =>
'LF'));
$html = $a->html();
dump_nodes($html);
Modified: php/php-src/trunk/ext/tidy/tests/024.phpt
===
--- php/php-src/trunk/ext/tidy/tests/024.phpt 2011-09-07 10:13:33 UTC (rev
316316)
+++ php/php-src/trunk/ext/tidy/tests/024.phpt 2011-09-07 10:14:02 UTC (rev
316317)
@@ -18,7 +18,8 @@
';
$config = array(
-'new-blocklevel-tags' => 'wps:block,wps:var,wps:value'
+'new-blocklevel-tags' => 'wps:block,wps:var,wps:value',
+'newline' => 'LF'
);
$tidy = tidy_parse_string($contents, $config, 'utf8');
Modified: php/php-src/trunk/ext/tidy/tests/025.phpt
===
--- php/php-src/trunk/ext/tidy/tests/025.phpt 2011-09-07 10:13:33 UTC (rev
316316)
+++ php/php-src/trunk/ext/tidy/tests/025.phpt 2011-09-07 10:14:02 UTC (rev
316317)
@@ -5,16 +5,16 @@
--FILE--
');
+$tidy=tidy_parse_string('<% %>', array('newline' => 'LF'));
var_dump($tidy->Root()->child[0]->isAsp());
-$tidy=tidy_parse_string('<# #>');
+$tidy=tidy_parse_string('<# #>', array('newline' => 'LF'));
var_dump($tidy->Root()->child[0]->isJste());
$tidy=tidy_parse_string('text');
var_dump($tidy->Root()->child[0]->child[1]->child[0]->isText());
-$tidy=tidy_parse_string('');
+$tidy=tidy_parse_string('',
array('newline' => 'LF'));
$n = $tidy->Root()->child[0]->child[1]->child[0];
var_dump($n->isComment());
var_dump((string)$n);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/ext/tidy/tests/010.phpt branches/PHP_5_4/ext/tidy/tests/012.phpt branches/PHP_5_4/ext/tidy/tests/024.phpt branches/PHP_5_4/ext/tidy/tests/025.phpt trunk/e
pajoye Wed, 07 Sep 2011 10:12:04 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316315
Log:
- force LF (svn prop and config)
Changed paths:
UU php/php-src/branches/PHP_5_4/ext/tidy/tests/010.phpt
UU php/php-src/branches/PHP_5_4/ext/tidy/tests/012.phpt
UU php/php-src/branches/PHP_5_4/ext/tidy/tests/024.phpt
UU php/php-src/branches/PHP_5_4/ext/tidy/tests/025.phpt
_U php/php-src/trunk/ext/tidy/tests/010.phpt
_U php/php-src/trunk/ext/tidy/tests/012.phpt
_U php/php-src/trunk/ext/tidy/tests/024.phpt
_U php/php-src/trunk/ext/tidy/tests/025.phpt
Modified: php/php-src/branches/PHP_5_4/ext/tidy/tests/010.phpt
===
--- php/php-src/branches/PHP_5_4/ext/tidy/tests/010.phpt2011-09-07
10:00:00 UTC (rev 316314)
+++ php/php-src/branches/PHP_5_4/ext/tidy/tests/010.phpt2011-09-07
10:12:04 UTC (rev 316315)
@@ -4,12 +4,12 @@
--FILE--
");
-var_dump($a->root());
-var_dump($a->body());
-var_dump($a->html());
-var_dump($a->head());
-
+$a = tidy_parse_string("", array('newline' => 'LF'));
+var_dump($a->root());
+var_dump($a->body());
+var_dump($a->html());
+var_dump($a->head());
+
?>
--EXPECT--
object(tidyNode)#2 (8) {
Property changes on: php/php-src/branches/PHP_5_4/ext/tidy/tests/010.phpt
___
Modified: svn:eol-style
- native
+ LF
Modified: php/php-src/branches/PHP_5_4/ext/tidy/tests/012.phpt
===
--- php/php-src/branches/PHP_5_4/ext/tidy/tests/012.phpt2011-09-07
10:00:00 UTC (rev 316314)
+++ php/php-src/branches/PHP_5_4/ext/tidy/tests/012.phpt2011-09-07
10:12:04 UTC (rev 316315)
@@ -25,7 +25,7 @@
}
- $a = tidy_parse_string("HiByeTest");
+ $a = tidy_parse_string("HiByeTest", array('newline' =>
'LF'));
$html = $a->html();
dump_nodes($html);
Property changes on: php/php-src/branches/PHP_5_4/ext/tidy/tests/012.phpt
___
Modified: svn:eol-style
- native
+ LF
Modified: php/php-src/branches/PHP_5_4/ext/tidy/tests/024.phpt
===
--- php/php-src/branches/PHP_5_4/ext/tidy/tests/024.phpt2011-09-07
10:00:00 UTC (rev 316314)
+++ php/php-src/branches/PHP_5_4/ext/tidy/tests/024.phpt2011-09-07
10:12:04 UTC (rev 316315)
@@ -18,7 +18,8 @@
';
$config = array(
-'new-blocklevel-tags' => 'wps:block,wps:var,wps:value'
+'new-blocklevel-tags' => 'wps:block,wps:var,wps:value',
+'newline' => 'LF'
);
$tidy = tidy_parse_string($contents, $config, 'utf8');
Property changes on: php/php-src/branches/PHP_5_4/ext/tidy/tests/024.phpt
___
Modified: svn:eol-style
- native
+ LF
Modified: php/php-src/branches/PHP_5_4/ext/tidy/tests/025.phpt
===
--- php/php-src/branches/PHP_5_4/ext/tidy/tests/025.phpt2011-09-07
10:00:00 UTC (rev 316314)
+++ php/php-src/branches/PHP_5_4/ext/tidy/tests/025.phpt2011-09-07
10:12:04 UTC (rev 316315)
@@ -5,16 +5,16 @@
--FILE--
');
+$tidy=tidy_parse_string('<% %>', array('newline' => 'LF'));
var_dump($tidy->Root()->child[0]->isAsp());
-$tidy=tidy_parse_string('<# #>');
+$tidy=tidy_parse_string('<# #>', array('newline' => 'LF'));
var_dump($tidy->Root()->child[0]->isJste());
$tidy=tidy_parse_string('text');
var_dump($tidy->Root()->child[0]->child[1]->child[0]->isText());
-$tidy=tidy_parse_string('');
+$tidy=tidy_parse_string('',
array('newline' => 'LF'));
$n = $tidy->Root()->child[0]->child[1]->child[0];
var_dump($n->isComment());
var_dump((string)$n);
Property changes on: php/php-src/branches/PHP_5_4/ext/tidy/tests/025.phpt
___
Modified: svn:eol-style
- native
+ LF
Property changes on: php/php-src/trunk/ext/tidy/tests/010.phpt
___
Modified: svn:eol-style
- native
+ LF
Property changes on: php/php-src/trunk/ext/tidy/tests/012.phpt
___
Modified: svn:eol-style
- native
+ LF
Property changes on: php/php-src/trunk/ext/tidy/tests/024.phpt
___
Modified: svn:eol-style
- native
+ LF
Property changes on: php/php-src/trunk/ext/tidy/tests/025.phpt
___
Modified: svn:eol-style
- native
+ LF
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/xml/tests/bug26614_libxml.phpt branches/PHP_5_4/ext/xml/tests/bug26614_libxml.phpt trunk/ext/xml/tests/bug26614_libxml.phpt
pajoye Wed, 07 Sep 2011 09:41:54 + Revision: http://svn.php.net/viewvc?view=revision&revision=316313 Log: - force LF Changed paths: _U php/php-src/branches/PHP_5_3/ext/xml/tests/bug26614_libxml.phpt _U php/php-src/branches/PHP_5_4/ext/xml/tests/bug26614_libxml.phpt _U php/php-src/trunk/ext/xml/tests/bug26614_libxml.phpt Property changes on: php/php-src/branches/PHP_5_3/ext/xml/tests/bug26614_libxml.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/xml/tests/bug26614_libxml.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/xml/tests/bug26614_libxml.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/tests/closure_036.phpt branches/PHP_5_4/Zend/tests/closure_038.phpt branches/PHP_5_4/Zend/tests/closure_039.phpt branches/P
On Wed, Sep 7, 2011 at 08:46, Stanislav Malyshev wrote: > stas Wed, 07 Sep 2011 06:46:27 + > > Revision: http://svn.php.net/viewvc?view=revision&revision=316300 > > Log: > Commit Gustavo's closure rebinding patch as desided by vote > > Changed paths: > U php/php-src/branches/PHP_5_4/NEWS > U php/php-src/branches/PHP_5_4/Zend/tests/closure_036.phpt Modified: php/php-src/branches/PHP_5_4/Zend/tests/closure_036.phpt === --- php/php-src/branches/PHP_5_4/Zend/tests/closure_036.phpt2011-09-07 05:19:12 UTC (rev 316299) +++ php/php-src/branches/PHP_5_4/Zend/tests/closure_036.phpt2011-09-07 06:46:27 UTC (rev 316300) @@ -1,5 +1,5 @@ --TEST-- -Closure 036: Rebinding closures +Closure 036: Rebinding closures, keep calling scope --FILE-- getIncrementor(); $cb = $ca->bindTo($b); -$cb2 = Closure::bind($b, $ca); +$cb2 = Closure::bind($ca, $b); That change seems a bit weird to me and quite big BC break. Please update the migration file with details on this. -Hannes -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/xmlwriter/tests/004.phpt branches/PHP_5_3/ext/xmlwriter/tests/OO_004.phpt branches/PHP_5_4/ext/xmlwriter/tests/004.phpt branches/PHP_5_4/ext/xmlwriter
pajoye Wed, 07 Sep 2011 09:37:56 + Revision: http://svn.php.net/viewvc?view=revision&revision=316312 Log: - force LF Changed paths: _U php/php-src/branches/PHP_5_3/ext/xmlwriter/tests/004.phpt _U php/php-src/branches/PHP_5_3/ext/xmlwriter/tests/OO_004.phpt _U php/php-src/branches/PHP_5_4/ext/xmlwriter/tests/004.phpt _U php/php-src/branches/PHP_5_4/ext/xmlwriter/tests/OO_004.phpt _U php/php-src/trunk/ext/xmlwriter/tests/004.phpt _U php/php-src/trunk/ext/xmlwriter/tests/OO_004.phpt Property changes on: php/php-src/branches/PHP_5_3/ext/xmlwriter/tests/004.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_3/ext/xmlwriter/tests/OO_004.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/xmlwriter/tests/004.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/xmlwriter/tests/OO_004.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/xmlwriter/tests/004.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/xmlwriter/tests/OO_004.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/xmlreader/tests/012.phpt branches/PHP_5_4/ext/xmlreader/tests/012.phpt trunk/ext/xmlreader/tests/012.phpt
pajoye Wed, 07 Sep 2011 09:19:28 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316311
Log:
- fix test for OS where dir sep is \
Changed paths:
U php/php-src/branches/PHP_5_3/ext/xmlreader/tests/012.phpt
U php/php-src/branches/PHP_5_4/ext/xmlreader/tests/012.phpt
U php/php-src/trunk/ext/xmlreader/tests/012.phpt
Modified: php/php-src/branches/PHP_5_3/ext/xmlreader/tests/012.phpt
===
--- php/php-src/branches/PHP_5_3/ext/xmlreader/tests/012.phpt 2011-09-07
09:16:57 UTC (rev 316310)
+++ php/php-src/branches/PHP_5_3/ext/xmlreader/tests/012.phpt 2011-09-07
09:19:28 UTC (rev 316311)
@@ -25,7 +25,9 @@
EOF;
$xmlstring = str_replace('012.dtd', dirname(__FILE__).'/012.dtd', $xmlstring);
-
+if (DIRECTORY_SEPARATOR == '\\') {
+ $xmlstring = str_replace('\\',"/", $xmlstring);
+}
$reader = new XMLReader();
$reader->XML($xmlstring);
$reader->setParserProperty(XMLReader::DEFAULTATTRS, true);
@@ -34,12 +36,15 @@
var_dump($reader->getAttribute('baz'));
$reader->close();
-?>
-===FILE===
-open(dirname(__FILE__) . '/012.xml');
+$reader->open($file);
+
//$reader->setParserProperty(XMLReader::DEFAULTATTRS, true);
while($reader->read() && $reader->nodeType != XMLReader::ELEMENT);
var_dump($reader->getAttribute('bar'));
@@ -61,7 +66,8 @@
NULL
string(0) ""
string(0) ""
-===FILE===
+
+Using URI:
string(0) ""
NULL
string(0) ""
Modified: php/php-src/branches/PHP_5_4/ext/xmlreader/tests/012.phpt
===
--- php/php-src/branches/PHP_5_4/ext/xmlreader/tests/012.phpt 2011-09-07
09:16:57 UTC (rev 316310)
+++ php/php-src/branches/PHP_5_4/ext/xmlreader/tests/012.phpt 2011-09-07
09:19:28 UTC (rev 316311)
@@ -25,7 +25,9 @@
EOF;
$xmlstring = str_replace('012.dtd', dirname(__FILE__).'/012.dtd', $xmlstring);
-
+if (DIRECTORY_SEPARATOR == '\\') {
+ $xmlstring = str_replace('\\',"/", $xmlstring);
+}
$reader = new XMLReader();
$reader->XML($xmlstring);
$reader->setParserProperty(XMLReader::DEFAULTATTRS, true);
@@ -34,12 +36,15 @@
var_dump($reader->getAttribute('baz'));
$reader->close();
-?>
-===FILE===
-open(dirname(__FILE__) . '/012.xml');
+$reader->open($file);
+
//$reader->setParserProperty(XMLReader::DEFAULTATTRS, true);
while($reader->read() && $reader->nodeType != XMLReader::ELEMENT);
var_dump($reader->getAttribute('bar'));
@@ -61,7 +66,8 @@
NULL
string(0) ""
string(0) ""
-===FILE===
+
+Using URI:
string(0) ""
NULL
string(0) ""
Modified: php/php-src/trunk/ext/xmlreader/tests/012.phpt
===
--- php/php-src/trunk/ext/xmlreader/tests/012.phpt 2011-09-07 09:16:57 UTC
(rev 316310)
+++ php/php-src/trunk/ext/xmlreader/tests/012.phpt 2011-09-07 09:19:28 UTC
(rev 316311)
@@ -25,7 +25,9 @@
EOF;
$xmlstring = str_replace('012.dtd', dirname(__FILE__).'/012.dtd', $xmlstring);
-
+if (DIRECTORY_SEPARATOR == '\\') {
+ $xmlstring = str_replace('\\',"/", $xmlstring);
+}
$reader = new XMLReader();
$reader->XML($xmlstring);
$reader->setParserProperty(XMLReader::DEFAULTATTRS, true);
@@ -34,12 +36,15 @@
var_dump($reader->getAttribute('baz'));
$reader->close();
-?>
-===FILE===
-open(dirname(__FILE__) . '/012.xml');
+$reader->open($file);
+
//$reader->setParserProperty(XMLReader::DEFAULTATTRS, true);
while($reader->read() && $reader->nodeType != XMLReader::ELEMENT);
var_dump($reader->getAttribute('bar'));
@@ -61,7 +66,8 @@
NULL
string(0) ""
string(0) ""
-===FILE===
+
+Using URI:
string(0) ""
NULL
string(0) ""
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/dom/tests/dom_xinclude.phpt branches/PHP_5_4/ext/dom/tests/dom_xinclude.phpt trunk/ext/dom/tests/dom_xinclude.phpt
pajoye Wed, 07 Sep 2011 09:03:07 +
Revision: http://svn.php.net/viewvc?view=revision&revision=316309
Log:
- fix test for OS where dir sep is \
Changed paths:
U php/php-src/branches/PHP_5_3/ext/dom/tests/dom_xinclude.phpt
U php/php-src/branches/PHP_5_4/ext/dom/tests/dom_xinclude.phpt
U php/php-src/trunk/ext/dom/tests/dom_xinclude.phpt
Modified: php/php-src/branches/PHP_5_3/ext/dom/tests/dom_xinclude.phpt
===
--- php/php-src/branches/PHP_5_3/ext/dom/tests/dom_xinclude.phpt
2011-09-07 08:44:05 UTC (rev 316308)
+++ php/php-src/branches/PHP_5_3/ext/dom/tests/dom_xinclude.phpt
2011-09-07 09:03:07 UTC (rev 316309)
@@ -10,10 +10,14 @@
$dom = new domdocument;
$data = file_get_contents(dirname(__FILE__)."/xinclude.xml");
-$data =
str_replace('compress.zlib://ext/dom/tests/','compress.zlib://'.dirname(__FILE__).'/',
$data);
+$reldir = str_replace(getcwd(),".",dirname(__FILE__));
+if (DIRECTORY_SEPARATOR == '\\') {
+ $reldir = str_replace('\\',"/", $reldir);
+}
+$data =
str_replace('compress.zlib://ext/dom/tests/','compress.zlib://'.$reldir."/",
$data);
+
$dom->loadXML($data);
-
$dom->xinclude();
print $dom->saveXML()."\n";
foreach ($dom->documentElement->childNodes as $node) {
Modified: php/php-src/branches/PHP_5_4/ext/dom/tests/dom_xinclude.phpt
===
--- php/php-src/branches/PHP_5_4/ext/dom/tests/dom_xinclude.phpt
2011-09-07 08:44:05 UTC (rev 316308)
+++ php/php-src/branches/PHP_5_4/ext/dom/tests/dom_xinclude.phpt
2011-09-07 09:03:07 UTC (rev 316309)
@@ -10,10 +10,14 @@
$dom = new domdocument;
$data = file_get_contents(dirname(__FILE__)."/xinclude.xml");
-$data =
str_replace('compress.zlib://ext/dom/tests/','compress.zlib://'.dirname(__FILE__).'/',
$data);
+$reldir = str_replace(getcwd(),".",dirname(__FILE__));
+if (DIRECTORY_SEPARATOR == '\\') {
+ $reldir = str_replace('\\',"/", $reldir);
+}
+$data =
str_replace('compress.zlib://ext/dom/tests/','compress.zlib://'.$reldir."/",
$data);
+
$dom->loadXML($data);
-
$dom->xinclude();
print $dom->saveXML()."\n";
foreach ($dom->documentElement->childNodes as $node) {
Modified: php/php-src/trunk/ext/dom/tests/dom_xinclude.phpt
===
--- php/php-src/trunk/ext/dom/tests/dom_xinclude.phpt 2011-09-07 08:44:05 UTC
(rev 316308)
+++ php/php-src/trunk/ext/dom/tests/dom_xinclude.phpt 2011-09-07 09:03:07 UTC
(rev 316309)
@@ -10,10 +10,14 @@
$dom = new domdocument;
$data = file_get_contents(dirname(__FILE__)."/xinclude.xml");
-$data =
str_replace('compress.zlib://ext/dom/tests/','compress.zlib://'.dirname(__FILE__).'/',
$data);
+$reldir = str_replace(getcwd(),".",dirname(__FILE__));
+if (DIRECTORY_SEPARATOR == '\\') {
+ $reldir = str_replace('\\',"/", $reldir);
+}
+$data =
str_replace('compress.zlib://ext/dom/tests/','compress.zlib://'.$reldir."/",
$data);
+
$dom->loadXML($data);
-
$dom->xinclude();
print $dom->saveXML()."\n";
foreach ($dom->documentElement->childNodes as $node) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.phpt branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.txt branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter_del
pajoye Wed, 07 Sep 2011 08:41:59 + Revision: http://svn.php.net/viewvc?view=revision&revision=316307 Log: - force LF Changed paths: _U php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.phpt _U php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.txt _U php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter_delimiter.phpt _U php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt _U php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.txt _U php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter_delimiter.phpt _U php/php-src/trunk/ext/iconv/tests/iconv_stream_filter.phpt _U php/php-src/trunk/ext/iconv/tests/iconv_stream_filter.txt _U php/php-src/trunk/ext/iconv/tests/iconv_stream_filter_delimiter.phpt Property changes on: php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter.txt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_3/ext/iconv/tests/iconv_stream_filter_delimiter.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.txt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter_delimiter.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/iconv/tests/iconv_stream_filter.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/iconv/tests/iconv_stream_filter.txt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/iconv/tests/iconv_stream_filter_delimiter.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/dom/tests/dom005.phpt branches/PHP_5_3/ext/dom/tests/test.html branches/PHP_5_4/ext/dom/tests/dom005.phpt branches/PHP_5_4/ext/dom/tests/test.html tru
pajoye Wed, 07 Sep 2011 08:18:20 + Revision: http://svn.php.net/viewvc?view=revision&revision=316305 Log: - force LF Changed paths: _U php/php-src/branches/PHP_5_3/ext/dom/tests/dom005.phpt _U php/php-src/branches/PHP_5_3/ext/dom/tests/test.html _U php/php-src/branches/PHP_5_4/ext/dom/tests/dom005.phpt _U php/php-src/branches/PHP_5_4/ext/dom/tests/test.html _U php/php-src/trunk/ext/dom/tests/dom005.phpt _U php/php-src/trunk/ext/dom/tests/test.html Property changes on: php/php-src/branches/PHP_5_3/ext/dom/tests/dom005.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_3/ext/dom/tests/test.html ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/dom/tests/dom005.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/dom/tests/test.html ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/dom/tests/dom005.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/dom/tests/test.html ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/simplexml/tests/bug51615.phpt branches/PHP_5_4/ext/simplexml/tests/bug51615.phpt trunk/ext/simplexml/tests/bug51615.phpt
pajoye Wed, 07 Sep 2011 08:12:08 + Revision: http://svn.php.net/viewvc?view=revision&revision=316304 Log: - add skipif for dom Changed paths: U php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug51615.phpt U php/php-src/branches/PHP_5_4/ext/simplexml/tests/bug51615.phpt U php/php-src/trunk/ext/simplexml/tests/bug51615.phpt Modified: php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug51615.phpt === --- php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug51615.phpt 2011-09-07 08:01:19 UTC (rev 316303) +++ php/php-src/branches/PHP_5_3/ext/simplexml/tests/bug51615.phpt 2011-09-07 08:12:08 UTC (rev 316304) @@ -1,7 +1,9 @@ --TEST-- Bug #51615 (PHP crash with wrong HTML in SimpleXML) --SKIPIF-- - + --FILE-- + --FILE-- + --FILE-- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/iconv/tests/eucjp2utf8.phpt branches/PHP_5_4/ext/iconv/tests/eucjp2utf8.phpt trunk/ext/iconv/tests/eucjp2utf8.phpt
pajoye Wed, 07 Sep 2011 08:01:19 + Revision: http://svn.php.net/viewvc?view=revision&revision=316303 Log: - force LF Changed paths: _U php/php-src/branches/PHP_5_3/ext/iconv/tests/eucjp2utf8.phpt _U php/php-src/branches/PHP_5_4/ext/iconv/tests/eucjp2utf8.phpt _U php/php-src/trunk/ext/iconv/tests/eucjp2utf8.phpt Property changes on: php/php-src/branches/PHP_5_3/ext/iconv/tests/eucjp2utf8.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/iconv/tests/eucjp2utf8.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/iconv/tests/eucjp2utf8.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/iconv/tests/eucjp2sjis.phpt branches/PHP_5_4/ext/iconv/tests/eucjp2sjis.phpt trunk/ext/iconv/tests/eucjp2sjis.phpt
pajoye Wed, 07 Sep 2011 07:51:37 + Revision: http://svn.php.net/viewvc?view=revision&revision=316302 Log: - force LF Changed paths: _U php/php-src/branches/PHP_5_3/ext/iconv/tests/eucjp2sjis.phpt _U php/php-src/branches/PHP_5_4/ext/iconv/tests/eucjp2sjis.phpt _U php/php-src/trunk/ext/iconv/tests/eucjp2sjis.phpt Property changes on: php/php-src/branches/PHP_5_3/ext/iconv/tests/eucjp2sjis.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/branches/PHP_5_4/ext/iconv/tests/eucjp2sjis.phpt ___ Modified: svn:eol-style - native + LF Property changes on: php/php-src/trunk/ext/iconv/tests/eucjp2sjis.phpt ___ Modified: svn:eol-style - native + LF -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
