[PHP-CVS] com php-src: Fix bug #61430 for trunk: sapi/fpm/fpm/fpm_shm.c
Commit:65062b47f35b858d6e6d0f91bacc929b470aa3a3
Author:Xinchen Hui Tue, 17 Apr 2012 11:23:28
+0800
Parents: 565892d4c09ff39e96d1de16a22be21242bb83e9
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=65062b47f35b858d6e6d0f91bacc929b470aa3a3
Log:
Fix bug #61430 for trunk
Bugs:
https://bugs.php.net/61430
Changed paths:
M sapi/fpm/fpm/fpm_shm.c
Diff:
diff --git a/sapi/fpm/fpm/fpm_shm.c b/sapi/fpm/fpm/fpm_shm.c
index 6acbddf..9226adf 100644
--- a/sapi/fpm/fpm/fpm_shm.c
+++ b/sapi/fpm/fpm/fpm_shm.c
@@ -35,7 +35,7 @@ void *fpm_shm_alloc(size_t size) /* {{{ */
return NULL;
}
- memset(mem, size, 0);
+ memset(mem, 0, size);
fpm_shm_size += size;
return mem;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Implement const array/string dereference: NEWS UPGRADING Zend/tests/const_dereference_001.phpt Zend/tests/const_dereference_002.phpt Zend/tests/const_dereference_003.phpt Zend/z
Commit:565892d4c09ff39e96d1de16a22be21242bb83e9
Author:Xinchen Hui Sun, 15 Apr 2012 11:40:38
+0800
Parents: 739eda38cd7eee7a93ee49b8a91a96e8ee25bcc0
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=565892d4c09ff39e96d1de16a22be21242bb83e9
Log:
Implement const array/string dereference
RFC:https://wiki.php.net/rfc/constdereference
Changed paths:
M NEWS
M UPGRADING
A Zend/tests/const_dereference_001.phpt
A Zend/tests/const_dereference_002.phpt
A Zend/tests/const_dereference_003.phpt
M Zend/zend_language_parser.y
M Zend/zend_vm_def.h
M Zend/zend_vm_execute.h
diff --git a/NEWS b/NEWS
index 6aa804c..ecfaa93 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ PHP
NEWS
. Drop Windows XP and 2003 support. (Pierre)
. World domination
. Improve set_exception_handler while doing reset.(Laruence)
+ . Support constant array/string dereferencing. (Laruence)
- Core:
. Implemented FR #60738 (Allow 'set_error_handler' to handle NULL).
diff --git a/UPGRADING b/UPGRADING
index 575ff1b..d6d6e9b 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -26,6 +26,8 @@ PHP X.Y UPGRADE NOTES
2. New Features
+- Support constant array/string dereferencing. (Laruence)
+ (https://wiki.php.net/rfc/constdereference)
2. Changes in SAPI modules
diff --git a/Zend/tests/const_dereference_001.phpt
b/Zend/tests/const_dereference_001.phpt
new file mode 100644
index 000..5fe6e4d
--- /dev/null
+++ b/Zend/tests/const_dereference_001.phpt
@@ -0,0 +1,21 @@
+--TEST--
+Const array deference
+--FILE--
+
+--EXPECTF--
+int(4)
+
+Notice: Undefined index: foo in %sconst_dereference_001.php on line %d
+NULL
+int(6)
+123
diff --git a/Zend/tests/const_dereference_002.phpt
b/Zend/tests/const_dereference_002.phpt
new file mode 100644
index 000..ff89519
--- /dev/null
+++ b/Zend/tests/const_dereference_002.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Const string dereference
+--FILE--
+
+--EXPECTF--
+int(4)
+
+Notice: Undefined index: foo in %sconst_dereference_003.php on line %d
+NULL
+int(6)
+123
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index d0730b7..893e013 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -789,8 +789,8 @@ expr_without_variable:
| T_EXIT exit_expr{ zend_do_exit(&$$, &$2 TSRMLS_CC); }
| '@' { zend_do_begin_silence(&$1 TSRMLS_CC); } expr {
zend_do_end_silence(&$1 TSRMLS_CC); $$ = $3; }
| scalar { $$ = $1; }
- | T_ARRAY '(' array_pair_list ')' { $$ = $3; }
- | '[' array_pair_list ']' { $$ = $2; }
+ | combined_scalar_offset { zend_do_end_variable_parse(&$1,
BP_VAR_R, 0 TSRMLS_CC); }
+ | combined_scalar { $$ = $1; }
| '`' backticks_expr '`' { zend_do_shell_exec(&$$, &$2
TSRMLS_CC); }
| T_PRINT expr { zend_do_print(&$$, &$2 TSRMLS_CC); }
| function is_reference '(' {
zend_do_begin_lambda_function_declaration(&$$, &$1, $2.op_type, 0 TSRMLS_CC); }
@@ -799,6 +799,15 @@ expr_without_variable:
parameter_list ')' lexical_vars '{'
inner_statement_list '}' { zend_do_end_function_declaration(&$2 TSRMLS_CC); $$
= $5; }
;
+combined_scalar_offset:
+ combined_scalar '[' dim_offset ']' {
zend_do_begin_variable_parse(TSRMLS_C); fetch_array_dim(&$$, &$1, &$3
TSRMLS_CC); }
+ | combined_scalar_offset '[' dim_offset ']' { fetch_array_dim(&$$, &$1,
&$3 TSRMLS_CC); }
+| T_CONSTANT_ENCAPSED_STRING '[' dim_offset ']' {
zend_do_begin_variable_parse(TSRMLS_C); fetch_array_dim(&$$, &$1, &$3
TSRMLS_CC); }
+
+combined_scalar:
+ T_ARRAY '(' array_pair_list ')' { $$ = $3; }
+| '[' array_pair_list ']' { $$ = $2; }
+
function:
T_FUNCTION { $$.u.op.opline_num = CG(zend_lineno); }
;
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 8cceb19..7b13b44 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1174,7 +1174,7 @@ ZEND_VM_HANDLER(89, ZEND_FETCH_IS, CONST|TMP|VAR|CV,
UNUSED|CONST|VAR)
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type,
BP_VAR_IS);
}
-ZEND_VM_HANDLER(81, ZEND_FETCH_DIM_R, VAR|CV, CONST|TMP|VAR|CV)
+ZEND_VM_HANDLER(81, ZEND_FETCH_DIM_R, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
USE_OPLINE
zend_free_op free_op1, free_op2;
@@ -1187,10 +1187,19 @@ ZEND_VM_HANDLER(81, ZEND_FETCH_DIM_R, VAR|CV,
CONST|TMP|VAR|CV)
EX_T(opline->op1.var).var.ptr_ptr) {
PZVAL_LOCK(*EX_T(opline->op1.var).var.ptr_ptr);
}
- container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_R);
- zend_fetch_dimension_address_read(&EX_T(opline->result.var), container,
GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_R TSRMLS_CC);
- FREE_OP2();
- FREE_OP1_VAR_PTR();
+
+if (OP1
[PHP-CVS] com php-src: Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*: ext/standard/tests/file/windows_links/bug48746.phpt ext/standard/tests/file/windows_links/bug48746_1.phpt
Commit:f3d86b314f4977f95844aa4eaa41759c8d71c247
Author:Anatoliy Belsky Mon, 16 Apr 2012 17:06:30
+0200
Parents: bceafee879785b176e6b4564908d0b2c82cb6a0b
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=f3d86b314f4977f95844aa4eaa41759c8d71c247
Log:
Fix bug 61746 Failing tests in ext/standard/tests/file/windows_links/*
Bugs:
https://bugs.php.net/61746
Changed paths:
M ext/standard/tests/file/windows_links/bug48746.phpt
M ext/standard/tests/file/windows_links/bug48746_1.phpt
M ext/standard/tests/file/windows_links/bug48746_2.phpt
Diff:
diff --git a/ext/standard/tests/file/windows_links/bug48746.phpt
b/ext/standard/tests/file/windows_links/bug48746.phpt
index 6c88c63..a47b7cb 100644
--- a/ext/standard/tests/file/windows_links/bug48746.phpt
+++ b/ext/standard/tests/file/windows_links/bug48746.phpt
@@ -17,13 +17,14 @@ if (count($output) == 0) {
?>
--FILE--
--FILE--
--FILE--
http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails: ext/libxml/tests/bug61367-read.phpt
Commit:bceafee879785b176e6b4564908d0b2c82cb6a0b
Author:Anatoliy Belsky Mon, 16 Apr 2012 15:45:03
+0200
Parents: 9c8907ec10aa7af751c9717293c707fe717831e4
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=bceafee879785b176e6b4564908d0b2c82cb6a0b
Log:
Fix bug 61720 ext\libxml\tests\bug61367-read.phpt fails
Bugs:
https://bugs.php.net/61720
https://bugs.php.net/61367
Changed paths:
M ext/libxml/tests/bug61367-read.phpt
Diff:
diff --git a/ext/libxml/tests/bug61367-read.phpt
b/ext/libxml/tests/bug61367-read.phpt
index 722b8e7..3deecfc 100644
--- a/ext/libxml/tests/bug61367-read.phpt
+++ b/ext/libxml/tests/bug61367-read.phpt
@@ -15,6 +15,7 @@ class StreamExploiter {
$doc->resolveExternals = true;
$doc->substituteEntities = true;
$dir = htmlspecialchars(dirname(getcwd()));
+ $dir = str_replace('\\', '/', $dir); // fix for windows
$doc->loadXML( <<
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails: ext/soap/tests/bugs/bug31422-win.phpt ext/soap/tests/bugs/bug31422.phpt
Commit:eaeeb0f5e88c7e68c6fc44abb597af10e7b925d7
Author:Anatoliy Belsky Mon, 16 Apr 2012 15:35:47
+0200
Parents: a688e69baed276ab65a0c96d7d5647dd0c4f3e37
Branches: master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=eaeeb0f5e88c7e68c6fc44abb597af10e7b925d7
Log:
Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails
Bugs:
https://bugs.php.net/61719
https://bugs.php.net/31422
Changed paths:
A ext/soap/tests/bugs/bug31422-win.phpt
M ext/soap/tests/bugs/bug31422.phpt
Diff:
diff --git a/ext/soap/tests/bugs/bug31422-win.phpt
b/ext/soap/tests/bugs/bug31422-win.phpt
new file mode 100644
index 000..ba8df07
--- /dev/null
+++ b/ext/soap/tests/bugs/bug31422-win.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Bug #31422 (No Error-Logging on SoapServer-Side)
+--SKIPIF--
+
+--INI--
+log_errors=1
+--FILE--
+"http://testuri.org";));
+$server->addfunction("Add");
+
+$HTTP_RAW_POST_DATA = <<
+http://schemas.xmlsoap.org/soap/encoding/";
+ xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:si="http://soapinterop.org/xsd";>
+
+http://testuri.org";>
+ 22
+ 33
+
+
+
+EOF;
+
+$server->handle($HTTP_RAW_POST_DATA);
+echo "ok\n";
+?>
+--EXPECTF--
+
+http://schemas.xmlsoap.org/soap/envelope/";>SOAP-ENV:ServerHello
+PHP Warning: fopen() expects at least 2 parameters, 0 given in
%sbug31422-win.php on line %d
+PHP Fatal error: Hello in %sbug31422-win.php on line %d
diff --git a/ext/soap/tests/bugs/bug31422.phpt
b/ext/soap/tests/bugs/bug31422.phpt
index c4cf7e9..c8ddcfe 100644
--- a/ext/soap/tests/bugs/bug31422.phpt
+++ b/ext/soap/tests/bugs/bug31422.phpt
@@ -1,7 +1,12 @@
--TEST--
Bug #31422 (No Error-Logging on SoapServer-Side)
--SKIPIF--
-
+
--INI--
log_errors=1
error_log=
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails: ext/soap/tests/bugs/bug31422-win.phpt ext/soap/tests/bugs/bug31422.phpt
Commit:9c8907ec10aa7af751c9717293c707fe717831e4
Author:Anatoliy Belsky Mon, 16 Apr 2012 15:38:46
+0200
Parents: 1c435ae498bb89c466e5c74e3be8c85cff17835a
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=9c8907ec10aa7af751c9717293c707fe717831e4
Log:
Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails
Bugs:
https://bugs.php.net/61719
https://bugs.php.net/31422
Changed paths:
A ext/soap/tests/bugs/bug31422-win.phpt
M ext/soap/tests/bugs/bug31422.phpt
Diff:
diff --git a/ext/soap/tests/bugs/bug31422-win.phpt
b/ext/soap/tests/bugs/bug31422-win.phpt
new file mode 100644
index 000..ba8df07
--- /dev/null
+++ b/ext/soap/tests/bugs/bug31422-win.phpt
@@ -0,0 +1,47 @@
+--TEST--
+Bug #31422 (No Error-Logging on SoapServer-Side)
+--SKIPIF--
+
+--INI--
+log_errors=1
+--FILE--
+"http://testuri.org";));
+$server->addfunction("Add");
+
+$HTTP_RAW_POST_DATA = <<
+http://schemas.xmlsoap.org/soap/encoding/";
+ xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:si="http://soapinterop.org/xsd";>
+
+http://testuri.org";>
+ 22
+ 33
+
+
+
+EOF;
+
+$server->handle($HTTP_RAW_POST_DATA);
+echo "ok\n";
+?>
+--EXPECTF--
+
+http://schemas.xmlsoap.org/soap/envelope/";>SOAP-ENV:ServerHello
+PHP Warning: fopen() expects at least 2 parameters, 0 given in
%sbug31422-win.php on line %d
+PHP Fatal error: Hello in %sbug31422-win.php on line %d
diff --git a/ext/soap/tests/bugs/bug31422.phpt
b/ext/soap/tests/bugs/bug31422.phpt
index 459da78..40e8973 100644
--- a/ext/soap/tests/bugs/bug31422.phpt
+++ b/ext/soap/tests/bugs/bug31422.phpt
@@ -1,7 +1,12 @@
--TEST--
Bug #31422 (No Error-Logging on SoapServer-Side)
--SKIPIF--
-
+
--INI--
log_errors=1
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/soap/tests/bugs/bug31422.phpt
Commit:4ac6862fc461ff475994a2c3f001cde353034ca3 Author:Anatoliy Belsky Mon, 16 Apr 2012 15:40:10 +0200 Parents: 5d1565088fe57c7d0dc711e7a1271bc7c8bd948a 9c8907ec10aa7af751c9717293c707fe717831e4 Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4ac6862fc461ff475994a2c3f001cde353034ca3 Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix bug 61719 ext\soap\tests\bugs\bug31422.phpt fails Bugs: https://bugs.php.net/61719 https://bugs.php.net/31422 Changed paths: MM ext/soap/tests/bugs/bug31422.phpt Diff: diff --cc ext/soap/tests/bugs/bug31422.phpt index c4cf7e9,40e8973..c8ddcfe --- a/ext/soap/tests/bugs/bug31422.phpt +++ b/ext/soap/tests/bugs/bug31422.phpt @@@ -1,10 -1,14 +1,15 @@@ --TEST-- Bug #31422 (No Error-Logging on SoapServer-Side) --SKIPIF-- - + --INI-- log_errors=1 +error_log= --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails: ext/ldap/tests/ldap_set_rebind_proc_error.phpt
Commit:1c435ae498bb89c466e5c74e3be8c85cff17835a Author:Anatoliy Belsky Mon, 16 Apr 2012 15:25:20 +0200 Parents: 47e7755785e49836ca9b0e5376ec81fa209b9386 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1c435ae498bb89c466e5c74e3be8c85cff17835a Log: Fix bug 61718 ext\ldap\tests\ldap_set_rebind_proc_error.phpt fails Bugs: https://bugs.php.net/61718 Changed paths: M ext/ldap/tests/ldap_set_rebind_proc_error.phpt Diff: diff --git a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt index 3b4cd69..966612f 100644 --- a/ext/ldap/tests/ldap_set_rebind_proc_error.phpt +++ b/ext/ldap/tests/ldap_set_rebind_proc_error.phpt @@ -5,6 +5,16 @@ Patrick Allaert # Belgian PHP Testfest 2009 --SKIPIF-- + --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug 61716 tests\basic\021.phpt fails: tests/basic/021.phpt
Commit:4fa1743009888ab209539598a564ad0d8f5fc7cc Author:Anatoliy Belsky Mon, 16 Apr 2012 15:14:26 +0200 Parents: aaed0af418e153de27d698b1a529914d86637d20 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4fa1743009888ab209539598a564ad0d8f5fc7cc Log: Fix bug 61716 tests\basic\021.phpt fails Bugs: https://bugs.php.net/61716 Changed paths: M tests/basic/021.phpt Diff: diff --git a/tests/basic/021.phpt b/tests/basic/021.phpt index e79ac7d..eeaf588 100644 --- a/tests/basic/021.phpt +++ b/tests/basic/021.phpt @@ -2,6 +2,7 @@ Bug #37276 (problems witch $_POST array) --INI-- file_uploads=1 +upload_tmp_dir=. --POST_RAW-- Content-Type: multipart/form-data; boundary=---20896060251896012921717172737 -20896060251896012921717172737 -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails: ext/ldap/tests/ldap_sasl_bind_basic.phpt
Commit:47e7755785e49836ca9b0e5376ec81fa209b9386 Author:Anatoliy Belsky Mon, 16 Apr 2012 15:20:03 +0200 Parents: 4fa1743009888ab209539598a564ad0d8f5fc7cc Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=47e7755785e49836ca9b0e5376ec81fa209b9386 Log: Fix bug 61717 ext\ldap\tests\ldap_sasl_bind_basic.phpt fails Bugs: https://bugs.php.net/61717 Changed paths: M ext/ldap/tests/ldap_sasl_bind_basic.phpt Diff: diff --git a/ext/ldap/tests/ldap_sasl_bind_basic.phpt b/ext/ldap/tests/ldap_sasl_bind_basic.phpt index 6ed14a5..efa1f82 100644 --- a/ext/ldap/tests/ldap_sasl_bind_basic.phpt +++ b/ext/ldap/tests/ldap_sasl_bind_basic.phpt @@ -6,6 +6,13 @@ Patrick Allaert --SKIPIF-- + --FILE-- http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug 61683 tests\basic\bug20539.phpt fails: tests/basic/bug20539.phpt
Commit:aaed0af418e153de27d698b1a529914d86637d20 Author:Anatoliy Belsky Mon, 16 Apr 2012 14:38:16 +0200 Parents: 163c1a393f9163b1741f43dd0ab279c3c8c810ca Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=aaed0af418e153de27d698b1a529914d86637d20 Log: Fix bug 61683 tests\basic\bug20539.phpt fails Bugs: https://bugs.php.net/61683 https://bugs.php.net/20539 Changed paths: M tests/basic/bug20539.phpt Diff: diff --git a/tests/basic/bug20539.phpt b/tests/basic/bug20539.phpt index 67cef3a..1406ce0 100644 --- a/tests/basic/bug20539.phpt +++ b/tests/basic/bug20539.phpt @@ -11,7 +11,8 @@ session.save_path=./tests/basic/ --EXPECT-- good :) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails: ext/zlib/tests/gzencode_variation1-win32.phpt
Commit:163c1a393f9163b1741f43dd0ab279c3c8c810ca
Author:Anatoliy Belsky Mon, 16 Apr 2012 14:04:29
+0200
Parents: c981016e416507134e5fa8469a08d31346ff19b5
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=163c1a393f9163b1741f43dd0ab279c3c8c810ca
Log:
Fix bug 61680 ext\zlib\tests\gzencode_variation1-win32.phpt fails
Bugs:
https://bugs.php.net/61680
Changed paths:
M ext/zlib/tests/gzencode_variation1-win32.phpt
Diff:
diff --git a/ext/zlib/tests/gzencode_variation1-win32.phpt
b/ext/zlib/tests/gzencode_variation1-win32.phpt
index efb223b..5ff5778 100644
--- a/ext/zlib/tests/gzencode_variation1-win32.phpt
+++ b/ext/zlib/tests/gzencode_variation1-win32.phpt
@@ -19,19 +19,28 @@ if (!extension_loaded("zlib")) {
* Alias to functions:
*/
+if(!function_exists("gzdecode")) {
+ function gzdecode($data)
+ {
+ return gzinflate(substr($data,10,-8));
+ }
+}
+
+
include(dirname(__FILE__) . '/data.inc');
echo "*** Testing gzencode() : variation ***\n";
echo "\n-- Testing multiple compression --\n";
-$output = gzencode($data);
-var_dump(bin2hex(gzencode($output)));
+$output = gzencode(gzencode($data));
+$back = gzdecode(gzdecode($output));
+var_dump($data === $back);
?>
===Done===
--EXPECT--
*** Testing gzencode() : variation ***
-- Testing multiple compression --
-string(3658)
"1f8b080b010e07f1f81f8b080b6d574d6fe4c80dbdeb57d4ad2f3dfe01eb83e1ec22980e309b4562c067b64449159754dafab0b6e7d7e73d96da1e4c72184c4b2ab2c8f7c847fa25baabba98dc1a8b2b7c38bb324b713ee37f757f56cdc5c7f5b17b9d152f923b157c5ae335e0b75fedd0e2d781c6b98ea3a6ee05affe1dfc3a6527f8f09c52dcb38ba38bb5249934d6ecfe1e53a9ab76ff4c342cf2a64ed2028349fc9a8b139755685352acb82b9fbb67f8bade5cdcb698e1fcec94b7ceba3cb897e806cfc8114350dd1ebbdfa35b62d2478b0056d23ed809b9b95d696d91ce2aa97c911e3fa539c43f84c887554a4d125c9e63ff96711cc08c0866263cb37a0bbe2122ae8f6baecb2284abfb4ddf916db8354cddeef37c1afe5fa02fc7afb3db34f5b3acbdf2eb905490d8f38d7468d253a323d5ebb903760d7944d3b2024e834a99ddce77669bdd823cfbb8e899d4ad4c799677452e6029e80023a03b2374005590641f7d3877df2ad09f3c0e82a54d6a5644fd63049a37ed4bc362016fd9f51264f1e5c630727421ae930b7ed416e93e47b7c71a400390361ffbecb7561bb98f69b5da289e91becc27f08b3b724cb8704f9144d366431d0cb870c56b205deaa2e17636063761a911039fb7e4bf9f06c4f0aecd2ec80e8b41831ca7515e31286166458ea3ef71f2ce7cde2ae269c96d60525724a9c9170b713ed5750758f3cd2a361fc8b288fc92358ce884692e8ea0fe59bd969a0da2eed5831b715749eaae7178f3ebd30fb88c92105f367cce2c882955dc6bf8eca0d5d57540b3092894743ba0fd5b2dad021836191f1afc0bba14dde1642cb0b1aa6879c38907dcefa0720082b801bec61417469219175267dfa047df35b0bd1332001c28cdfafd3bcabe91e74368cdd8d8478e494c190e7ee90c67f2bde288e68ab6b15e883c995be4f8feb6c6dda4278e4f38578ddbdc7be36788daf0c3cb1d1819c73822f7000a0d1813fa94153b572315e51343b536bc64977dff163cebfd8418773261f524017e251fccc60ae29a5770ae097594d52e9c1229d87ce967a36401c46b69945afb249d101c9d420ffa9a123e232c20e76467d5d169202a2dd4c582949e013e745df7958d4b0cc4fd4377a737cd4feea797407f314d423e0634cb9a618fdf5dc64fd422181fd59c9230c9f6f9d18dc8fc23e9cccbc7188733b04aa57de83ebea0be3633cff5fa1ff83269be7f44f5a8d84550cc703255fd345dd402034d0b3e11a73ec6e3d4a77f4f685b614329f1b3132ae7af33d02e1e55e291fa6574b758d1f0200e7423dbc852211818043a7c9ce80aa9d59fce0401959f5ea2cf71fde90824f8c9192dbe9d329db143794675ddcf257dd7755273b67340414e3ccad12e3f661f8aad9cf9957dc1275d10a51d3934fa81e68dc6768fb8ee23e373936c8e13feab8b0f50d227f7af76f561fb0950f3d099bbc316c3892a42fb36806d8660e800fa4f43fd4b962d2097d71933a54b77ff948677848eb17bb3a88b621682cfb3bbb49cf42fed6b3944124ad8358ca688aa44dd5f2144c7c9ab16f25b9aca9654ef357ec9ad55c40d324d6cc3d9e3920b863c231d31a95d937fb5520f9c816c79b7dcecc593fb9593cc05a51ebb1eeddd5b49eb437769738d0f64adc579d372b8b7f7c0208487ee3915ebf5766e148ebd77cf4e01f3ec285047011e55838968b6494d517fe29224777b24dd3ddf933101695b102e87db805eef291b74dcfd91628fb2a53f93dbd2968ef2e598746c9204f89fba1f0246fc671610a0591806e46a1346f77c40d910a47c5e20ffb23f003c04b648327a4ed98032c1965bd35bb0044f5344248f56fdb99aa61d6451d68e33489a83bffbe6573541b2da5f64681ea12090f778b2075374778810f73965fa3626a9d41f4df2f83f7c34658cec921b5a9bde49dd5007ec882b02adc514f81aa85898b5cc98e1b137733c0a8789b7f5648d2d231b80bf74978f25d61ce08a8abd11801fd8f995e066676307192ff7641f1cc6e0dee68565b8b22ac3889cd067bf732754a6b270af1044c6a8776811a4f6d8bd0477a9f516064201b920b92d7cd4dc7eee13e6b3eb3528a82f9abb3f388ebe6a8f871393461b73816ec54c99d604174bc5a6801de13908f86aea6a7d0fea107d682bcf1ec348b83872e6b8a316ecd02eb8f8dc86a609bf59a2dd03f1dfa4079436d55e24617be1a2854d008b2b2b1705e2078a7f3946318df1c24f6bf70d4b456eca286ec2b585b28262cc048a098c3e2d5f325a92bb36f691afdc14c822da1b116c9c1c07bb362eb0a04b78834c812134230ebf2044ac2e3c0e3ad00f848dc5010f3bf917ec2fc700b7bf26dacea8440620e04f90f4d97d6dd77cfde8a05c7d3930f1e5811fb8ec5c70964dcc8187ec90e32fdd6b64eec7586413b7d55bed65c4cce39a9b6c15e70e9da94e53fc904e6286f01f5b5562c94211befbc23507e01b2a3865e2f45b5d7b591f290087a5605b82495b4e3
[PHP-CVS] com php-src: Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail: ext/standard/tests/file/windows_acls/common.inc
Commit:9a4cb732ed15088fff7b2cbbb23ef955bbaaadb2
Author:Anatoliy Belsky Mon, 16 Apr 2012 13:30:58
+0200
Parents: 21d314a767561204cdeba896b85e61e1bb6cafac
Branches: PHP-5.3 PHP-5.4 master
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=9a4cb732ed15088fff7b2cbbb23ef955bbaaadb2
Log:
Fix bug 61743 tests in ext\standard\tests\file\windows_acls\* fail
Bugs:
https://bugs.php.net/61743
Changed paths:
M ext/standard/tests/file/windows_acls/common.inc
Diff:
diff --git a/ext/standard/tests/file/windows_acls/common.inc
b/ext/standard/tests/file/windows_acls/common.inc
index c427601..c9be2f1 100644
--- a/ext/standard/tests/file/windows_acls/common.inc
+++ b/ext/standard/tests/file/windows_acls/common.inc
@@ -19,7 +19,13 @@ function skipif() {
}
function get_username(){
- return getenv('USERNAME');
+ $user = getenv('USERNAME');
+
+ if (!$user) {
+ $user = get_current_user();
+ }
+
+ return $user;
}
function get_domainname()
@@ -28,6 +34,7 @@ function get_domainname()
}
function icacls_set($path, $mode, $perm) {
+ $icacls = 'c:\\Windows\\System32\\icacls.exe';
$user = get_username();
$path_escaped = '"' . $path . '"';
$perm_entry = array();
@@ -38,7 +45,7 @@ function icacls_set($path, $mode, $perm) {
if ($perm & PHPT_ACL_FULL) $perm_entry[] = 'F';
// Deny all
- $cmd = 'icacls ' . $path_escaped . ' /inheritance:r /deny ' . $user .
':(F,M,R,RX,W)';
+ $cmd = $icacls . ' ' . $path_escaped . ' /inheritance:r /deny ' . $user
. ':(F,M,R,RX,W)';
exec($cmd);
if ($perm & PHPT_ACL_NONE) {
@@ -47,11 +54,9 @@ function icacls_set($path, $mode, $perm) {
permission for the USER. Just granting permission doesn't
remove the previously denied permission.
*/
- $cmd = 'icacls ' . $path_escaped . ' /' . 'remove:d';
- $cmd .= ' ' . $user;
+ $cmd = $icacls . ' ' . $path_escaped . ' /remove:d ' . $user;
exec($cmd);
- $cmd = 'icacls ' . $path_escaped . ' /' . 'remove:g';
- $cmd .= ' ' . $user;
+ $cmd = $icacls . ' ' . $path_escaped . ' /remove:g ' . $user;
exec($cmd);
return;
}
@@ -64,7 +69,7 @@ function icacls_set($path, $mode, $perm) {
// Deny all
- $cmd = 'icacls ' . $path_escaped . ' /deny ' . $user . ':(F,M,R,RX,W)';
+ $cmd = $icacls . ' ' . $path_escaped . ' /deny ' . $user .
':(F,M,R,RX,W)';
exec($cmd);
/*
@@ -72,11 +77,9 @@ function icacls_set($path, $mode, $perm) {
permission for the USER. Just granting permission doesn't
remove the previously denied permission.
*/
- $cmd = 'icacls ' . $path_escaped . ' /' . 'remove:d';
- $cmd .= ' ' . $user;
+ $cmd = $icacls . ' ' . $path_escaped . ' /remove:d ' . $user;
exec($cmd);
- $cmd = 'icacls ' . $path_escaped . ' /' . 'remove:g';
- $cmd .= ' ' . $user;
+ $cmd = $icacls . ' ' . $path_escaped . ' /remove:g ' . $user;
exec($cmd);
@@ -91,15 +94,12 @@ function icacls_set($path, $mode, $perm) {
permission for the USER. Just granting permission doesn't
remove the previously denied permission.
*/
- $cmd = 'icacls ' . $path_escaped . ' /' . 'remove:d';
- $cmd .= ' ' . get_username();
+ $cmd = $icacls . ' ' . $path_escaped . ' /remove:d ' . $user;
exec($cmd);
- $cmd = 'icacls ' . $path_escaped . ' /' . 'remove:g';
- $cmd .= ' ' . get_username();
+ $cmd = $icacls . ' ' . $path_escaped . ' /remove:g ' . $user;
exec($cmd);
- $cmd = 'icacls ' . $path_escaped . ' /' . $mode;
- $cmd .= ' ' . get_username();
+ $cmd = $icacls . ' ' . $path_escaped . ' /' . $mode . ' ' .
$user;
$cmd .= ':' . '(' . implode($perm_entry, ',') . ')';
exec($cmd);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: Fix bug 61676 ext\tidy\tests\bug54682.phpt fails: ext/tidy/tests/bug54682.phpt
Commit:c981016e416507134e5fa8469a08d31346ff19b5 Author:Anatoliy Belsky Mon, 16 Apr 2012 13:38:13 +0200 Parents: 9a4cb732ed15088fff7b2cbbb23ef955bbaaadb2 Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c981016e416507134e5fa8469a08d31346ff19b5 Log: Fix bug 61676 ext\tidy\tests\bug54682.phpt fails Bugs: https://bugs.php.net/61676 https://bugs.php.net/54682 Changed paths: M ext/tidy/tests/bug54682.phpt Diff: diff --git a/ext/tidy/tests/bug54682.phpt b/ext/tidy/tests/bug54682.phpt index 8244406..2bebe11 100644 --- a/ext/tidy/tests/bug54682.phpt +++ b/ext/tidy/tests/bug54682.phpt @@ -10,4 +10,4 @@ $nx->diagnose(); ?> --EXPECTF-- -Warning: tidy::__construct(): Cannot Load '*' into memory in %s on line %d +Warning: tidy::__construct(): Cannot Load '*' into memory%win %s on line %d -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] com php-src: change the bug summary: NEWS ext/session/tests/bug61728.phpt
Commit:ed09d26f94ffb96dbaf6750cf19e5e1c5d34cd6a
Author:Xinchen Hui Mon, 16 Apr 2012 19:23:12
+0800
Parents: 3b42f184cdcf512fdc1f944052bfa296f17a035f
Branches: PHP-5.4
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=ed09d26f94ffb96dbaf6750cf19e5e1c5d34cd6a
Log:
change the bug summary
Changed paths:
M NEWS
M ext/session/tests/bug61728.phpt
Diff:
diff --git a/NEWS b/NEWS
index 2b65382..2eafb98 100644
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,7 @@ PHP
NEWS
(merge after 5.3.11 release)
- Core:
- . Fixed bug #61728 (php-fpm SIGSEGV running friendica on nginx). (Laruence)
+ . Fixed bug #61728 (PHP crash when calling ob_start in request_shutdown
phase). (Laruence)
. Fixed bug #61660 (bin2hex(hex2bin($data)) != $data). (Nikita Popov)
. Fixed bug #61650 (ini parser crashes when using ${} ini variables
(without apache2)). (Laruence)
diff --git a/ext/session/tests/bug61728.phpt b/ext/session/tests/bug61728.phpt
index 30b876e..3f8dbeb 100644
--- a/ext/session/tests/bug61728.phpt
+++ b/ext/session/tests/bug61728.phpt
@@ -1,5 +1,5 @@
--TEST--
-Bug #61728 (php-fpm SIGSEGV running friendica on nginx)
+Bug #61728 (PHP crash when calling ob_start in request_shutdown phase)
--SKIPIF--
--FILE--
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
