Commit Graph

205 Commits

Author SHA1 Message Date
Xinchen Hui
4b152e5470 Merge branch 'PHP-5.4' 2012-10-10 10:32:38 +08:00
Xinchen Hui
e081c55fb5 Merge branch 'PHP-5.3' into PHP-5.4 2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b Remove executable permission on phpt 2012-10-10 10:27:49 +08:00
Stanislav Malyshev
a3322f8927 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 17:00:25 -07:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07:00
Johannes Schlüter
b025b9d0cf Fix #62432 ReflectionMethod random corrupt memory on high concurrent
This fixes the same issue in multiple extensions. This isn't needed
in later branches as 5.4 introduced object_properties_init()
2012-06-27 23:26:33 +02:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Christian Stocker
777a29fce2 Added the xsl.security_prefs option to 5_4 and trunk and
mark it as deprecated for BC-reasons
Added tests for ini option and combination of both
2011-10-10 07:59:19 +00:00
Christian Stocker
65ee77c4b0 Added the xsl.security_prefs option to 5_4 and trunk and
mark it as deprecated for BC-reasons
Added tests for ini option and combination of both
2011-10-10 07:59:19 +00:00
Christian Stocker
eb039d5783 Added the xsl.security_prefs option to 5_4 and trunk and
mark it as deprecated for BC-reasons
Added tests for ini option and combination of both
2011-10-10 07:59:19 +00:00
Christian Stocker
c9b5d92821 Fix wrong comment
Add new xsl ini options to php.ini
2011-10-06 18:30:55 +00:00
Christian Stocker
192511f75d Added test for Bug 54446
Init a variable to a default value to avoid issues
2011-10-05 18:11:29 +00:00
Christian Stocker
b2287a42a0 Added xsl.security_prefs ini option to define forbidden operations within XSLT
stylesheets, default is not to enable write operations. This option won't be 
in 5.4, since there's a new method. Bug #54446
2011-10-05 09:56:01 +00:00
Christian Stocker
cc2fd64121 Added test for XSL bug 54446 2011-09-12 12:44:49 +00:00
Christian Stocker
f8ffb5af1d Added test for XSL bug 54446 2011-09-12 12:44:49 +00:00
Christian Stocker
2e2eb5e137 Revert r316043, the tests are different on purpose 2011-09-05 08:27:47 +00:00
Christian Stocker
72d0abc8d3 Revert r316043, the tests are different on purpose 2011-09-05 08:27:47 +00:00
Shein Alexey
2d52a6934a Synchronized fixed tests from 5.3 branch. 2011-09-02 18:01:20 +00:00
Shein Alexey
712628c47c Synchronized fixed tests from 5.3 branch. 2011-09-02 18:01:20 +00:00
Christian Stocker
bbecdf57d3 fix xsl tests 2011-08-31 09:16:04 +00:00
Christian Stocker
01e115324a - Set an empty string and avoid warnings and stopping of the transformation process
when a php function can't be called.
- Fixed tests.
2011-08-31 09:14:08 +00:00
Christian Stocker
6873ef7055 - Set an empty string and avoid warnings and stopping of the transformation process
when a php function can't be called.
- Fixed tests.
2011-08-31 09:14:08 +00:00
Christian Stocker
190e36b47a MFB. fix xsl date tests 2011-08-31 07:38:19 +00:00
Christian Stocker
4297b67aee fix xsl date tests 2011-08-29 11:44:30 +00:00
Christian Stocker
5250f01d15 fix xsl date tests 2011-08-29 11:44:30 +00:00
Ilia Alshanetsky
9c297247ef Another build fix relating to previous DOM commit 2011-08-08 16:49:43 +00:00
Ilia Alshanetsky
e35f670e2d Another build fix relating to previous DOM commit 2011-08-08 16:49:43 +00:00
Ilia Alshanetsky
0b3cb3f220 Fixed build 2011-08-08 16:06:40 +00:00
Ilia Alshanetsky
022d279a98 Fixed build 2011-08-08 16:06:40 +00:00
Pierrick Charron
caff611cf3 Remove unused variables 2011-08-07 06:37:22 +00:00
Pierrick Charron
e03d19a00e Remove unused variables 2011-08-07 06:37:22 +00:00
Felipe Pena
997f323e3a - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
707a8f70b8 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
9480eace41 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Felipe Pena
da376383e8 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Pierre Joye
4488350bb5 - fix build 2011-07-14 11:12:33 +00:00
Pierre Joye
894a746a80 - fix build 2011-07-14 11:12:33 +00:00
Christian Stocker
0c8c69e89b Added XsltProcessor::setSecurityPrefs($options) and getSecurityPrefs()
to define forbidden operations within XSLT stylesheets, default is not to
enable any write operations from XSLT anymore. Bug #54446

(second iteration of the code for trunk, first commit for 5.4 branch)
2011-07-12 04:58:38 +00:00
Christian Stocker
6be6c2d62d Added XsltProcessor::setSecurityPrefs($options) and getSecurityPrefs()
to define forbidden operations within XSLT stylesheets, default is not to
enable any write operations from XSLT anymore. Bug #54446

(second iteration of the code for trunk, first commit for 5.4 branch)
2011-07-12 04:58:38 +00:00
Christian Stocker
0511fa337e Added XsltProcessor::setSecurityPrefs($options) and getSecurityPrefs()
to define forbidden operations within XSLT stylesheets, default is not to 
enable any write operations from XSLT anymore. Bug #54446
2011-07-11 11:16:22 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Felipe Pena
4737910b69 - Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Pierre Joye
96b6130930 - fix leak introduced by the null poisoning patch 2010-12-18 12:05:55 +00:00
Pierre Joye
ce96fd6b07 - fix #39863, do not accept paths with NULL in them. See http://news.php.net/php.internals/50191, trunk will have the patch later (adding a macro and/or changing (some) APIs. Patch by Rasmus 2010-11-18 15:22:22 +00:00