[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/tsrm_win32.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Sun, 07 Feb 2010 21:09:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=294728
Log:
- fix leak
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293175-293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293974,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-07 21:07:10 UTC
(rev 294727)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-07 21:09:19 UTC
(rev 294728)
@@ -223,11 +223,13 @@
}
if(access(pathname, mode)) {
+ free(real_path);
return errno;
}
/* If only existence check is made, return now */
if (mode == 0) {
+ free(real_path);
return 0;
}
Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293175-293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293175-293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293894,293896-293897,293901-293906,293917-293918,293965-293966,293976-293977,293985,293998,294040,294053,294075,294077-294078,294081,294089,294094,294100,294102,294104,294126-294127,294129,294164,294251-294253,294255,294259-294261,294265,294267,294269,294272,294278,294285,294302-294304,294307-294308,294310,294312-294313,294315,294317,294320-294323,294333-294336,294353,294418,294421,294487,294498,294532,294571,294695,294697,294724
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/tsrm_win32.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:25:09 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=294509
Log:
- fix leak when the SID is already used and duplicated, windows only
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 09:23:22 UTC
(rev 294508)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 09:25:09 UTC
(rev 294509)
@@ -170,6 +170,7 @@
/* ConvertSidToStringSid(pTokenUser-User.Sid, ptcSidOwner); */
pResultSid = malloc(sid_len);
+
if (!pResultSid) {
goto Finished;
}
@@ -271,6 +272,9 @@
if (!DuplicateToken(thread_token,
SecurityImpersonation, TWG(impersonation_token))) {
goto Finished;
}
+ } else {
+ /* we already have it, free it then */
+ free(token_sid);
}
if (CWDG(realpath_cache_size_limit)) {
Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe,
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/tsrm_win32.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 09:31:09 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=294512
Log:
- fix leak
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294089,294094,294100,294102,294104
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 09:29:24 UTC
(rev 294511)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 09:31:09 UTC
(rev 294512)
@@ -170,13 +170,13 @@
/* ConvertSidToStringSid(pTokenUser-User.Sid, ptcSidOwner); */
pResultSid = malloc(sid_len);
-
if (!pResultSid) {
goto Finished;
}
if (!CopySid(sid_len, pResultSid, pTokenUser-User.Sid)) {
goto Finished;
}
+ HeapFree(GetProcessHeap(), 0, (LPVOID)pTokenUser);
return pResultSid;
Finished:
Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
+
/php/php-src/branches/PHP_5_3/tests/security/open_basedir_parse_ini_file.phpt:292562,292566,292571,292574,292716,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294089,294094,294100,294102,294104
/php/php-src/trunk/tests/security/open_basedir_parse_ini_file.phpt:265951
--
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_2/ TSRM/tsrm_win32.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Thu, 04 Feb 2010 19:54:04 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=294542
Log:
- fix write access check when write mode only is requested (not RW)
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418,294487
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293974,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418,294487
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 19:50:49 UTC
(rev 294541)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 19:54:04 UTC
(rev 294542)
@@ -303,7 +303,7 @@
fAccess = bucket-is_writable;
goto Finished;
}
- desired_access = FILE_GENERIC_READ | FILE_GENERIC_WRITE;
+ desired_access = FILE_GENERIC_WRITE;
} else if(mode = 4) {
if(bucket != NULL bucket-is_rvalid) {
fAccess = bucket-is_readable;
@@ -348,6 +348,11 @@
else if(desired_access == FILE_GENERIC_WRITE) {
bucket-is_wvalid = 1;
bucket-is_writable = fAccess;
+ } else if (desired_access == FILE_GENERIC_READ |
FILE_GENERIC_WRITE) {
+ bucket-is_rvalid = 1;
+ bucket-is_readable = fAccess;
+ bucket-is_wvalid = 1;
+ bucket-is_writable = fAccess;
}
}
Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418,294487
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293762,293768,293804,293862,293897,293901-293902,293906,293965,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294303,294307,294310,294312,294320-294323,294334,294418,294487
/php/php-src/trunk/ext/tidy/tests:284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
[PHP-CVS] svn: /php/php-src/branches/PHP_5_3_2/ TSRM/tsrm_win32.c tests/security/open_basedir_parse_ini_file.phpt
pajoye Fri, 05 Feb 2010 00:14:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=294546
Log:
- silent warning
Changed paths:
_U php/php-src/branches/PHP_5_3_2/
U php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
_U php/php-src/branches/PHP_5_3_2/ext/tidy/tests/
_U
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
Property changes on: php/php-src/branches/PHP_5_3_2
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334,294418,294421,294487
/php/php-src/trunk:284726
+
/php/php-src/branches/PHP_5_3:292504,292574,292594-292595,292611,292624,292630,292632-292635,292654,292677,292682-292683,292693,292716,292719,292762,292765,292771,292777,292823,293051,293075,293114,293126,293131,293144,293146,293152,293176,293180,293216,293235,293253,293268,293341,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293974,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334,294418,294421,294487,294532
/php/php-src/trunk:284726
Modified: php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c
===
--- php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-04 23:05:18 UTC
(rev 294545)
+++ php/php-src/branches/PHP_5_3_2/TSRM/tsrm_win32.c2010-02-05 00:14:18 UTC
(rev 294546)
@@ -348,7 +348,7 @@
else if(desired_access == FILE_GENERIC_WRITE) {
bucket-is_wvalid = 1;
bucket-is_writable = fAccess;
- } else if (desired_access == FILE_GENERIC_READ |
FILE_GENERIC_WRITE) {
+ } else if (desired_access == (FILE_GENERIC_READ |
FILE_GENERIC_WRITE)) {
bucket-is_rvalid = 1;
bucket-is_readable = fAccess;
bucket-is_wvalid = 1;
Property changes on: php/php-src/branches/PHP_5_3_2/ext/tidy/tests
___
Modified: svn:mergeinfo
-
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334,294418,294421,294487
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941
+
/php/php-src/branches/PHP_5_3/ext/tidy/tests:292562,292566,292571,292574,292635,292716,292719,292765,293146,293152,293176,293180,293216,293235,293253,293380,293400,293442,293447,293466,293487,293502,293538,293548,293558,293588,293590,293597,293627,293644,293653,293655,293699,293726-293728,293732,293735,293762,293768,293804,293815-293816,293862,293897,293901-293902,293906,293965,293976,293985,293998,294040,294053,294075,294089,294094,294100,294102,294104,294259,294267,294269,294272,294278,294285,294302-294303,294307,294310,294312-294313,294317,294320-294323,294334,294418,294421,294487,294532
/php/php-src/trunk/ext/tidy/tests:29815-29816,284726,287798-287941
Property changes on:
php/php-src/branches/PHP_5_3_2/tests/security/open_basedir_parse_ini_file.phpt
___
Modified: svn:mergeinfo
-
