Commit Graph

7193 Commits

Author SHA1 Message Date
Xinchen Hui
604d11ee6c Merge remote-tracking branch 'origin/PHP-5.4' 2012-05-03 18:41:45 +08:00
Xinchen Hui
75d23f5714 Merge remote-tracking branch 'origin/PHP-5.3' into PHP-5.4
* origin/PHP-5.3:
  Fix typo
2012-05-03 18:40:57 +08:00
Xinchen Hui
bbf8a50281 Fix typo
picked form pull request of reeze.xia@gmail.com
2012-05-03 18:39:03 +08:00
Felipe Pena
1c2c620a58 - Regenerated files 2012-04-30 15:57:09 -03:00
Felipe Pena
4deb0f1a0a - Regenerated files 2012-04-30 15:57:00 -03:00
Felipe Pena
45ef3c759e Merge branch 'PHP-5.4'
* PHP-5.4:
  - Fixed Windows build
2012-04-30 15:56:15 -03:00
Felipe Pena
79961dccab - Fixed Windows build 2012-04-30 15:55:57 -03:00
Felipe Pena
1622843162 - Regenerated files 2012-04-30 10:35:28 -03:00
Felipe Pena
ea23192910 - Regenerated files 2012-04-30 10:35:11 -03:00
Felipe Pena
73b6150992 Merge branch 'PHP-5.4'
* PHP-5.4:
  - Changed last commit to use VK_ESCAPE on Windows
2012-04-30 10:31:59 -03:00
Felipe Pena
3120387617 - Changed last commit to use VK_ESCAPE on Windows 2012-04-30 10:31:49 -03:00
Felipe Pena
bbe9eec9a2 Merge branch 'PHP-5.4'
* PHP-5.4:
  - Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@php.net
2012-04-29 19:36:10 -03:00
Felipe Pena
cc5b995c78 - Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@php.net 2012-04-29 19:35:52 -03:00
Xinchen Hui
6b9e88d9e6 Merge branch 'PHP-5.4'
* PHP-5.4:
  Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)
2012-04-18 18:15:29 +08:00
Xinchen Hui
da6465a268 Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash) 2012-04-18 18:13:27 +08:00
Xinchen Hui
565892d4c0 Implement const array/string dereference
RFC:https://wiki.php.net/rfc/constdereference
2012-04-17 10:06:17 +08:00
Stanislav Malyshev
363797e9af Merge branch 'PHP-5.4'
* PHP-5.4:
  Copy default properties of internal classes for different threads
2012-04-11 19:24:11 -07:00
Johannes Schlüter
82c05eeda9 Copy default properties of internal classes for different threads 2012-04-11 19:21:41 -07:00
Nikita Popov
b233de098d Fix bug #61681: Malformed grammar
Generate T_STRING_VARNAME only if it actually is one. This is only the case
for "${varname}" and "${varname[offset]}" so we can just add a check for
} or [ after the LABEL.
2012-04-09 18:26:38 +02:00
Nikita Popov
4cf90e06c9 Fix lexing of nested heredoc strings in token_get_all()
This fixes bug #60097.

Before two global variables CG(heredoc) and CG(heredoc_len) were used to
track the current heredoc label. In order to support nested heredoc
strings the *previous* heredoc label was assigned as the token value of
T_START_HEREDOC and the language_parser.y assigned that to CG(heredoc).

This created a dependency of the lexer on the parser. Thus the
token_get_all() function, which accesses the lexer directly without
also running the parser, was not able to tokenize nested heredoc strings
(and leaked memory). Same applies for the source-code highlighting
functions.

The new approach is to maintain a heredoc_label_stack in the lexer, which
contains all active heredoc labels.

As it is no longer required, T_START_HEREDOC and T_END_HEREDOC now don't
carry a token value anymore.

In order to make the work with zend_ptr_stack in this context more
convenient I added a new function zend_ptr_stack_top(), which retrieves the
top element of the stack (similar to zend_stack_top()).
2012-03-31 21:53:30 +02:00
Gustavo André dos Santos Lopes
298e9d2932 Merge branch '5.4' 2012-03-28 08:58:09 +01:00
Gustavo André dos Santos Lopes
68990224be Merge branch '5.3' into 5.4
Zend/zend_language_scanner.c and Zend/zend_language_scanner_defs.h had to be changed manually.
2012-03-28 08:57:19 +01:00
Gustavo André dos Santos Lopes
c6e15455a3 Revert "- fix bug #61504, fix build errors on windows and possibly other"
This reverts commit 74ee335e3a.
2012-03-28 08:41:18 +01:00
Pierre Joye
13bd9c2c3d Merge branch 'PHP-5.4'
* PHP-5.4:
  - fix bug #61504, fix build errors on windows and possibly other

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
2012-03-28 02:15:02 +02:00
Pierre Joye
c195596280 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  - fix bug #61504, fix build errors on windows and possibly other

Conflicts:
	Zend/zend_language_scanner.c
	Zend/zend_language_scanner_defs.h
2012-03-28 02:11:06 +02:00
Pierre Joye
74ee335e3a - fix bug #61504, fix build errors on windows and possibly other 2012-03-28 01:59:41 +02:00
Xinchen Hui
6ba2e662e4 Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)
The previous commit was reverted as Stas ask, so only commit this
to Truk now.
2012-03-24 19:41:11 +08:00
Xinchen Hui
d8f8e98d8e Improve set_exception_handler while doing reset 2012-03-24 19:38:40 +08:00
Xinchen Hui
aa7cdcd13d Merge branch 'PHP-5.4' of ../php-5.4 2012-03-24 19:28:43 +08:00
Xinchen Hui
872fdd153e Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4 2012-03-24 19:26:27 +08:00
Xinchen Hui
9c99a89e8e Revert "Implemented FR #60738 (Allow 'set_error_handler' to handle NULL)"
This reverts commit fcae164ea6.
2012-03-24 19:26:02 +08:00
Xinchen Hui
2d21149743 Revert "Merge from PHP-5.4"
This reverts commit 9a87fe1c52.
2012-03-24 19:25:21 +08:00
Xinchen Hui
690afaffc8 Merge branch 'PHP-5.4' of ../php-5.4 2012-03-24 15:16:51 +08:00
Xinchen Hui
7ffc442927 Merge branch 'PHP-5.3' of ../php-5.3 into PHP-5.4 2012-03-24 15:15:27 +08:00
Xinchen Hui
fcae164ea6 Implemented FR #60738 (Allow 'set_error_handler' to handle NULL) 2012-03-24 15:13:10 +08:00
Xinchen Hui
9a87fe1c52 Merge from PHP-5.4
Improve set_exception_handler
2012-03-24 14:33:00 +08:00
Xinchen Hui
4130f5a43c Improve set_exception_handler
Remove useless alloc/free and return_value copy while doing reset
exception handler
2012-03-24 11:54:50 +08:00
Xinchen Hui
caa40dd323 Merge branch 'PHP-5.4'
* PHP-5.4:
  Improve set_exception_handler
2012-03-24 11:50:07 +08:00
Xinchen Hui
a2bca4e46f Improve set_exception_handler
Remove useless alloc/free and return_value copy while doing reset
exception handler
2012-03-24 11:46:29 +08:00
Xinchen Hui
3813f987d5 Merge branch 'PHP-5.4'
* PHP-5.4:
  Remove empty lines
2012-03-24 11:35:29 +08:00
Xinchen Hui
114d662d12 Remove empty lines 2012-03-24 11:35:13 +08:00
David Soria Parra
6e7284fb5b Merge branch 'PHP-5.4'
* PHP-5.4:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
2012-03-20 17:59:33 +01:00
David Soria Parra
c918ca57a7 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
Xinchen Hui
943a4fed4e reduce memory usage 2012-03-12 14:52:02 +00:00
Xinchen Hui
438a30f1e7 reduce memory usage 2012-03-12 14:52:02 +00:00
Xinchen Hui
d845cfb12e reduce memory usage 2012-03-12 14:52:02 +00:00
Ilia Alshanetsky
2cc64c28f0 Fixed bug #60569 (Nullbyte truncates Exception $message). 2012-03-11 18:15:13 +00:00
Ilia Alshanetsky
d4f05fbffc Fixed bug #60569 (Nullbyte truncates Exception $message). 2012-03-11 18:15:13 +00:00
Ilia Alshanetsky
3d9824a798 Fixed bug #60569 (Nullbyte truncates Exception $message). 2012-03-11 18:15:13 +00:00
Xinchen Hui
eac33b454c Typo when merging from trunk 2012-03-11 15:31:19 +00:00
Xinchen Hui
a38ffd5705 Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes) 2012-03-11 15:28:31 +00:00
Xinchen Hui
b7ae5e0d86 Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes) 2012-03-11 15:28:31 +00:00
Xinchen Hui
7536bf963d Fixed bug #61273 (call_user_func_array with more than 16333 arguments leaks / crashes) 2012-03-11 15:28:31 +00:00
Xinchen Hui
24603280d4 fix test 2012-03-11 14:44:07 +00:00
Derick Rethans
c9436c200e Fixed version numbers. 2012-03-06 18:34:10 +00:00
Derick Rethans
7afd050922 Fixed version numbers. 2012-03-06 18:34:10 +00:00
Derick Rethans
38e5089e85 Fixed version numbers. 2012-03-06 18:34:10 +00:00
Derick Rethans
ecf8986a9a Add the ZEND_DONT_UNLOAD_MODULES environment variable for debugging to 5.3 as
well.
2012-03-06 18:25:55 +00:00
Dmitry Stogov
e182aeec10 Fixed module numbering 2012-03-05 12:47:25 +00:00
Dmitry Stogov
56a3f7eca8 Fixed module numbering 2012-03-05 12:47:25 +00:00
Dmitry Stogov
ecdf201214 Fixed module numbering 2012-03-05 12:47:25 +00:00
Stefan Marr
520d07d86a Fixed Bug #61052 (Missing error check in trait 'insteadof' clause) 2012-03-04 19:34:19 +00:00
Stefan Marr
ffded0020b Fixed Bug #61052 (Missing error check in trait 'insteadof' clause) 2012-03-04 19:34:19 +00:00
Stefan Marr
34fe62619d Fixed Bug #60911 (Confusing error message when extending traits) 2012-03-04 18:33:33 +00:00
Stefan Marr
0ed3b00406 Fixed Bug #60911 (Confusing error message when extending traits) 2012-03-04 18:33:33 +00:00
Stefan Marr
60dfd64bf2 Fixed Bug #60717 (Order of traits in use statement can cause a fatal error)
# Compatibility is now correctly checked in both directions.
# Introduced helper method for the test.
2012-03-04 18:26:11 +00:00
Stefan Marr
0bb85e4b91 Fixed Bug #60717 (Order of traits in use statement can cause a fatal error)
# Compatibility is now correctly checked in both directions.
# Introduced helper method for the test.
2012-03-04 18:26:11 +00:00
Xinchen Hui
bacd820218 MFH: Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode) 2012-03-02 03:52:06 +00:00
Xinchen Hui
046e3e3889 MFH: Fixed bug #60573 (type hinting with "self" keyword causes weird errors) 2012-03-02 03:32:12 +00:00
Xinchen Hui
101e3e8aed MFH: Fixed bug #60978 (exit code incorrect) 2012-03-02 03:25:41 +00:00
Xinchen Hui
5f99d789b5 MFH: Fixed bug #60978 (exit code incorrect) 2012-03-02 03:25:41 +00:00
Xinchen Hui
0876d7bb89 MFH: Fixed bug #61011 (Crash when an exception is thrown by __autoload accessing a static property) 2012-03-02 03:12:15 +00:00
Xinchen Hui
213145a6da MFH: Fixed bug #61072 (Memory leak when restoring an exception handler). 2012-03-02 02:56:08 +00:00
Xinchen Hui
0e4d46a3a7 MFH: Fix bug #61165 (Segfault - strip_tags()) 2012-03-02 02:51:57 +00:00
Pierrick Charron
1953161b8c Fixed bug #61225 (Lexing 0b0*+<NUM> incorectly) 2012-03-02 02:36:31 +00:00
Pierrick Charron
f7cd0588a9 Fixed bug #61225 (Lexing 0b0*+<NUM> incorectly) 2012-03-02 02:36:31 +00:00
Xinchen Hui
5f4ae28459 Improve fix for #61165, the previous one cause #43450 test failed 2012-02-26 14:56:26 +00:00
Xinchen Hui
1923ecfe25 Improve fix for #61165, the previous one cause #43450 test failed 2012-02-26 14:56:26 +00:00
Xinchen Hui
c870ebe138 Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode) 2012-02-25 14:15:11 +00:00
Xinchen Hui
38b549ea2f Fixed bug #61087 (Memory leak in parse_ini_file when specifying invalid scanner mode) 2012-02-25 14:15:11 +00:00
Xinchen Hui
229e55632d Fixed bug #61011 (Crash when an exception is thrown by __autoload accessing a static property) 2012-02-25 13:56:59 +00:00
Olivier DOUCET
e613889d50 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
bdbcc1789d more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Olivier DOUCET
ce535f1819 more verbose skip reason in test files with not so obvious extension requirements 2012-02-25 12:10:41 +00:00
Xinchen Hui
2d424a88fc merge test to 5.3, and remove xfail since the bug was fixed 2012-02-25 05:18:40 +00:00
Xinchen Hui
7334a4b14f merge test to 5.3, and remove xfail since the bug was fixed 2012-02-25 05:18:40 +00:00
Xinchen Hui
cfa9c90b20 Fixed bug #61165 (Segfault - strip_tags()) 2012-02-25 04:36:08 +00:00
Xinchen Hui
1ee93c83ff Fixed bug #61165 (Segfault - strip_tags()) 2012-02-25 04:36:08 +00:00
Xinchen Hui
c1322d2505 Fix test 2012-02-25 03:19:27 +00:00
Xinchen Hui
a57140324d typo 2012-02-25 03:16:28 +00:00
Xinchen Hui
4b86d681bb test for bug #61011 2012-02-25 03:14:16 +00:00
Xinchen Hui
f86d90d27b Tests for bug #61165 2012-02-25 03:12:54 +00:00
Etienne Kneuss
c51f737994 Fix #61095 (Lexing 0x0*+<NUM> incorrectly) 2012-02-20 18:28:57 +00:00
Etienne Kneuss
eefefddc0e Fix #61095 (Lexing 0x0*+<NUM> incorrectly) 2012-02-20 18:28:57 +00:00
Etienne Kneuss
86fcb9659e Fix #61095 (Lexing 0x0*+<NUM> incorrectly) 2012-02-20 18:28:57 +00:00
Stanislav Malyshev
dab17da38a make ZEND_SIGNALS configurable, off by default
also make ZEND_SIGNALS enabled and disabled binary-compatible
2012-02-16 01:51:45 +00:00
Stanislav Malyshev
fa9540e1f1 make ZEND_SIGNALS configurable, off by default
also make ZEND_SIGNALS enabled and disabled binary-compatible
2012-02-16 01:51:45 +00:00
Dmitry Stogov
49ce9b9bff Added ability to reset user opcode handlers (Yoram) 2012-02-14 09:27:08 +00:00
Dmitry Stogov
e16ec62d20 Added ability to reset user opcode handlers (Yoram) 2012-02-14 09:27:08 +00:00
Xinchen Hui
8f7381a6ea Fixed bug #61072 (Memory leak when restoring an exception handler) 2012-02-14 05:35:34 +00:00
Xinchen Hui
5d683614f9 Fixed bug #61072 (Memory leak when restoring an exception handler) 2012-02-14 05:35:34 +00:00
Xinchen Hui
27df8b6ff0 Revert -r319102 and -r322922 in 5.4 branch since they introduce #60978
Fixed #60978 in trunk without reverting previous fix
#see http://news.php.net/php.internals/57789
2012-02-08 03:03:05 +00:00
Xinchen Hui
ff63c09e6f Revert -r319102 and -r322922 in 5.4 branch since they introduce #60978
Fixed #60978 in trunk without reverting previous fix
#see http://news.php.net/php.internals/57789
2012-02-08 03:03:05 +00:00
Rasmus Lerdorf
fe802ac2ad This test needs gc enabled 2012-02-05 06:09:22 +00:00
Rasmus Lerdorf
0c3685e223 This test needs gc enabled 2012-02-05 06:09:22 +00:00
Rasmus Lerdorf
6452b81b14 This test needs gc enabled 2012-02-05 06:09:22 +00:00
Dmitry Stogov
3fe072f8a9 Fixed (disabled) inline-caching for ZEND_OVERLOADED_FUNCTION methods 2012-01-30 10:51:02 +00:00
Dmitry Stogov
c95937e902 Fixed (disabled) inline-caching for ZEND_OVERLOADED_FUNCTION methods 2012-01-30 10:51:02 +00:00
Derick Rethans
33863b2cf8 - Reinstated correct return values after David's fix for #60218. 2012-01-29 15:25:40 +00:00
Derick Rethans
2c1285a573 - Reinstated correct return values after David's fix for #60218. 2012-01-29 15:25:40 +00:00
Derick Rethans
32edc70fe1 CS fixes. 2012-01-29 11:17:07 +00:00
Xinchen Hui
3a8a5bc843 WS, merged from trunk cause this issue, sorry 2012-01-26 01:28:37 +00:00
Xinchen Hui
bbd6ab2054 WS, merged from trunk cause this issue, sorry 2012-01-26 01:28:37 +00:00
Xinchen Hui
1207451239 Fixed bug #60825 (Segfault when running symfony 2 tests) 2012-01-26 01:21:35 +00:00
Xinchen Hui
6b1d3b3d10 Re-fixed bug #60825 (Segfault when running symfony 2 tests) 2012-01-24 14:39:45 +00:00
Xinchen Hui
a222954a45 Re-fixed bug #60825 (Segfault when running symfony 2 tests) 2012-01-24 14:39:45 +00:00
Xinchen Hui
cf54cc736b Fixed bug #60825 (Segfault when running symfony 2 tests) 2012-01-21 17:13:53 +00:00
Dmitry Stogov
3299a2673c Fixed Bug #60809 (TRAITS - PHPDoc Comment Style Bug)
Fixed some other traits related bugs (uninitialized variable, return => continue)
Removed some trait related redundant code and variables
2012-01-20 12:30:57 +00:00
Dmitry Stogov
f9e6af5ef1 Fixed Bug #60809 (TRAITS - PHPDoc Comment Style Bug)
Fixed some other traits related bugs (uninitialized variable, return => continue)
Removed some trait related redundant code and variables
2012-01-20 12:30:57 +00:00
Pierre Joye
902bbce03b - add test for bug #60771 2012-01-18 20:22:47 +00:00
Pierre Joye
d285c75819 - add test for bug #60771 2012-01-18 20:22:47 +00:00
Pierre Joye
1cc5588248 - add test for bug #60771 2012-01-18 20:22:47 +00:00
Dmitry Stogov
a1525977a0 Regenerated scanners 2012-01-17 08:11:32 +00:00
Dmitry Stogov
877f97cde1 Regenerated scanners 2012-01-17 08:11:32 +00:00
Dmitry Stogov
b515bfbdfb Improved traits implementation. Now to support __CLASS__ constant in traits php doesn't have to copy the complete compiled method, but can reuse the same code. The resolution of __CLASS__ constants in methods defined in traits are delayed till run-time. This approach also made possible to use __CLASS__ constant as default value for traits properties and method arguments. 2012-01-17 08:09:13 +00:00
Dmitry Stogov
032d140fd6 Improved traits implementation. Now to support __CLASS__ constant in traits php doesn't have to copy the complete compiled method, but can reuse the same code. The resolution of __CLASS__ constants in methods defined in traits are delayed till run-time. This approach also made possible to use __CLASS__ constant as default value for traits properties and method arguments. 2012-01-17 08:09:13 +00:00
Xinchen Hui
d74a258f24 Fixed Bug #60573 (type hinting with "self" keyword causes weird errors) 2012-01-16 09:53:45 +00:00
Rui Hirokawa
7ba37f7921 fixed failed tests (backport from PHP_5_4/trunk). 2012-01-14 09:07:10 +00:00
Xinchen Hui
b31c12435c Fixed bug #60627 (httpd.worker segfault on startup with php_value) 2012-01-04 08:25:06 +00:00
Xinchen Hui
1c4f227553 Fixed bug #60627 (httpd.worker segfault on startup with php_value) 2012-01-04 08:25:06 +00:00
Nuno Lopes
71843491d3 regen for r321655 2012-01-01 22:52:23 +00:00
Nuno Lopes
d3f0eaee02 regen for r321655 2012-01-01 22:52:23 +00:00
Nuno Lopes
3a06ca721c regen for r321655 2012-01-01 22:52:23 +00:00
Nuno Lopes
bac57c94fb fix memory leak in compile_string when there's a parse error (used e.g. in eval or assert) 2012-01-01 22:45:58 +00:00
Nuno Lopes
a542baa720 fix memory leak in compile_string when there's a parse error (used e.g. in eval or assert) 2012-01-01 22:45:58 +00:00
Nuno Lopes
8b23cae172 fix memory leak in compile_string when there's a parse error (used e.g. in eval or assert) 2012-01-01 22:45:58 +00: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
Dmitry Stogov
6e3f7b800d Fixed tests 2011-12-28 10:12:43 +00:00
Dmitry Stogov
90a8da866b Fixed tests 2011-12-28 10:12:43 +00:00
Dmitry Stogov
a68e858d69 Fixed bug #60613 (Segmentation fault with $cls->{expr}() syntax) 2011-12-28 09:59:39 +00:00
Dmitry Stogov
c058385112 Fixed bug #60613 (Segmentation fault with $cls->{expr}() syntax) 2011-12-28 09:59:39 +00:00
Xinchen Hui
84ce790437 Fix #60613 (Segmentation fault with $cls->{expr}() syntax)
#now the behavior is like 5.3, a COMPILER_ERROR will be triggered
2011-12-28 06:46:12 +00:00
Xinchen Hui
113c0a8cc7 Fix #60613 (Segmentation fault with $cls->{expr}() syntax)
#now the behavior is like 5.3, a COMPILER_ERROR will be triggered
2011-12-28 06:46:12 +00:00
Xinchen Hui
20e2db2ce3 Fix bug #60611 (Segmentation fault with Cls::{expr}() syntax) 2011-12-27 08:38:18 +00:00
Xinchen Hui
2f4875bf92 Fix bug #60611 (Segmentation fault with Cls::{expr}() syntax) 2011-12-27 08:38:18 +00:00
Stanislav Malyshev
327a5828cd Fix warning on non-numeric offsets 2011-12-22 03:22:42 +00:00
Stanislav Malyshev
0610ca459a Fix warning on non-numeric offsets 2011-12-22 03:22:42 +00:00
Xinchen Hui
c1d5a5d7ef Fixed bug #60558 (Invalid read and writes)
Re-Fixed bug #60536 (Traits Segfault)
#Thanks to tony2001, I found the previous fix -r321089 is actually not a correct one.
#The key problem there is because the traits didn't correct set the property_info.offset
#for private properties. so here come the new fix.
2011-12-19 16:48:18 +00:00
Xinchen Hui
2f62602c03 Fixed bug #60558 (Invalid read and writes)
Re-Fixed bug #60536 (Traits Segfault)
#Thanks to tony2001, I found the previous fix -r321089 is actually not a correct one.
#The key problem there is because the traits didn't correct set the property_info.offset
#for private properties. so here come the new fix.
2011-12-19 16:48:18 +00:00
Xinchen Hui
4a0c2b43f5 Revert previous bad fix, introduce memory leak 2011-12-19 12:00:09 +00:00
Xinchen Hui
7fcba87e68 Revert previous bad fix, introduce memory leak 2011-12-19 12:00:09 +00:00
Xinchen Hui
f3900513ca Codes standard & Remove useless empty lines 2011-12-19 10:05:48 +00:00
Xinchen Hui
1a4a527c37 Codes standard & Remove useless empty lines 2011-12-19 10:05:48 +00:00
Xinchen Hui
5256e7410e Fixed bug #60558 (Invalid read and writes) 2011-12-19 09:58:29 +00:00
Xinchen Hui
d589d33468 Fixed bug #60558 (Invalid read and writes) 2011-12-19 09:58:29 +00:00
Stanislav Malyshev
1f4f33afcf implement the solution for isset/string offsets, fix bug #60362 2011-12-19 02:05:03 +00:00
Stanislav Malyshev
622412d8e6 implement the solution for isset/string offsets, fix bug #60362 2011-12-19 02:05:03 +00:00
Stefan Marr
525dd55eed Fixed inconsistent and broken handling of private properties in traits.
# The handling of private properties in classes is now consistent with private properties in traits.
# Perviously, privates could cause strict warnings, are were not properly merged into the class when
# the parent class had a private property of the same name. Now, we introduce it without notice,
# since it is a new and independent property, just like in normal classes.
# This problem was diagnosed while working on Bug #60536.
2011-12-17 14:26:39 +00:00
Stefan Marr
3dc9f0abe6 Fixed inconsistent and broken handling of private properties in traits.
# The handling of private properties in classes is now consistent with private properties in traits.
# Perviously, privates could cause strict warnings, are were not properly merged into the class when
# the parent class had a private property of the same name. Now, we introduce it without notice,
# since it is a new and independent property, just like in normal classes.
# This problem was diagnosed while working on Bug #60536.
2011-12-17 14:26:39 +00:00
Xinchen Hui
db63456a8d Reduce memory usage 2011-12-17 03:57:01 +00:00
Xinchen Hui
ac2a2fd196 Reduce memory usage 2011-12-17 03:57:01 +00:00
Xinchen Hui
01dc47631e Fixed bug #60536 (Traits Segfault)
# this is a tough one, I think I should explain
# Zend use zend_object->properties_table both as zval ** and zval ***
# if a zend_object->properties is not initialized, the properties_table is zval **
# while in rebuild_object_properties, zend will store the zval ** to zend_object->properties
# then stash the zval ***(ie, zobj->properties_table[0] is zval ** now) to  zobj->properties_table[0] 
# so when a zend_object inherit form multi parent and these parent have a same property_info->offset 
# properties, will result in a repeat zval **->zval ** transform, which will lead to a segmentfault
# *may be* this fix is not the best fix, we should not use this tricky way, and rewrite this mechanism.
2011-12-16 19:02:52 +00:00
Xinchen Hui
707f658c33 Fixed bug #60536 (Traits Segfault)
# this is a tough one, I think I should explain
# Zend use zend_object->properties_table both as zval ** and zval ***
# if a zend_object->properties is not initialized, the properties_table is zval **
# while in rebuild_object_properties, zend will store the zval ** to zend_object->properties
# then stash the zval ***(ie, zobj->properties_table[0] is zval ** now) to  zobj->properties_table[0] 
# so when a zend_object inherit form multi parent and these parent have a same property_info->offset 
# properties, will result in a repeat zval **->zval ** transform, which will lead to a segmentfault
# *may be* this fix is not the best fix, we should not use this tricky way, and rewrite this mechanism.
2011-12-16 19:02:52 +00:00
Pierrick Charron
489b86ff56 Coding standard 2011-12-06 06:44:22 +00:00
Pierrick Charron
3f2bcb7723 Coding standard 2011-12-06 06:44:22 +00:00
Xinchen Hui
95784cf6c5 remove irrelevant codes in test 2011-12-05 12:46:38 +00:00
Xinchen Hui
b92996bea6 remove irrelevant codes in test 2011-12-05 12:46:38 +00:00
Xinchen Hui
2f8c502d22 Add xfaild test for a secluded issue 2011-12-05 12:44:12 +00:00
Xinchen Hui
f30db67f58 Add xfaild test for a secluded issue 2011-12-05 12:44:12 +00:00
Xinchen Hui
d18a61aefb Fix typo 2011-12-05 12:33:56 +00:00
Xinchen Hui
5927617335 Fix typo 2011-12-05 12:33:56 +00:00
Dmitry Stogov
1d6c98a136 Fixed bug #60444 (Segmentation fault with include & class extending) 2011-12-05 09:20:12 +00:00
Dmitry Stogov
30328dcbab Fixed bug #60444 (Segmentation fault with include & class extending) 2011-12-05 09:20:12 +00:00
Dmitry Stogov
6cfbcb2268 Expose zend_signal_handler_unblock() to DSO extensions to allow usage of HANDLE_UNBLOCK_INTERRUPTIONS macro 2011-12-02 12:14:16 +00:00
Dmitry Stogov
0d4930577a Expose zend_signal_handler_unblock() to DSO extensions to allow usage of HANDLE_UNBLOCK_INTERRUPTIONS macro 2011-12-02 12:14:16 +00:00
Dmitry Stogov
f10b3bb556 Fixed icorrect key length after updating constant index 2011-12-01 13:58:29 +00:00
Dmitry Stogov
dc18f8427c Fixed icorrect key length after updating constant index 2011-12-01 13:58:29 +00:00
Felipe Pena
bfb1d38b9c - Added tests for bug #60350
patch by: php@mickweiss.com
2011-11-30 21:04:07 +00:00
Felipe Pena
d2de045007 - Added tests for bug #60350
patch by: php@mickweiss.com
2011-11-30 21:04:07 +00:00
Felipe Pena
a89f1d3cfa - Fixed bug #60350 (No string escape code for ESC (ascii 27), normally \e)
patch by: php at mickweiss dot com
2011-11-30 19:42:59 +00:00
Felipe Pena
3970865954 - Fixed bug #60350 (No string escape code for ESC (ascii 27), normally \e)
patch by: php at mickweiss dot com
2011-11-30 19:42:59 +00:00
Stefan Marr
db0888dfc1 Fixed Bug #60369 Crash with static property in trait 2011-11-23 21:24:34 +00:00
Stefan Marr
35d38e4772 Fixed Bug #60369 Crash with static property in trait 2011-11-23 21:24:34 +00:00
Antony Dovgal
a093491652 export zend_on_timeout handler from ZE 2011-11-22 03:39:12 +00:00
Antony Dovgal
e14819439c export zend_on_timeout handler from ZE 2011-11-22 03:39:12 +00:00
Stanislav Malyshev
aeae94a6af fix is_a reflection 2011-11-20 22:20:03 +00:00
Stanislav Malyshev
0f0ffd38c9 fix is_a reflection 2011-11-20 22:20:03 +00:00
Felipe Pena
b3b3eb8c2f - Fix tests 2011-11-19 18:01:26 +00:00
Felipe Pena
2bd90344a6 - Fix tests 2011-11-19 18:01:26 +00:00
Felipe Pena
ebd7dc5f88 - Fix tests 2011-11-19 18:01:26 +00:00
Felipe Pena
31ef559712 - Fixed bug #43200 (Interface implementation / inheritence not possible in abstract classes) 2011-11-19 13:36:03 +00:00
Felipe Pena
14b5e775b0 - Fixed bug #43200 (Interface implementation / inheritence not possible in abstract classes) 2011-11-19 13:36:03 +00:00
Felipe Pena
bc810a443d - Fixed bug #43200 (Interface implementation / inheritence not possible in abstract classes) 2011-11-19 13:36:03 +00:00
Felipe Pena
420fbb8274 - CS 2011-11-18 13:56:41 +00:00
Felipe Pena
cc8573e7a5 - CS 2011-11-18 13:56:41 +00:00
Stefan Marr
e150100f36 Fixes Bug #54441 (Handling of changing modifiers on a trait alias)
# this now results also in a compilation error, since it would open the door for inconsistencies, and violates the DRY principle.
2011-11-18 13:49:07 +00:00
Stefan Marr
76772dc20d Fixes Bug #54441 (Handling of changing modifiers on a trait alias)
# this now results also in a compilation error, since it would open the door for inconsistencies, and violates the DRY principle.
2011-11-18 13:49:07 +00:00
Dmitry Stogov
f7278c161f Fixed bug #60138 (GC crash with referenced array in RecursiveArrayIterator) 2011-11-18 12:43:53 +00:00
Dmitry Stogov
c24716dfa4 Fixed bug #60138 (GC crash with referenced array in RecursiveArrayIterator) 2011-11-18 12:43:53 +00:00
Dmitry Stogov
a65abc12b6 Fixed bug #60138 (GC crash with referenced array in RecursiveArrayIterator) 2011-11-18 12:43:53 +00:00
Stanislav Malyshev
3735b0ade3 fix typo 2011-11-18 09:15:15 +00:00
Stanislav Malyshev
66877fbd15 fix typo 2011-11-18 09:15:15 +00:00
Stanislav Malyshev
9a69efb9fc fixes for bug #55748 2011-11-18 07:11:19 +00:00
Stanislav Malyshev
77d0643b68 fixes for bug #55748 2011-11-18 07:11:19 +00:00
Felipe Pena
2ba9ff7fac - Fix build 2011-11-17 21:07:52 +00:00
Felipe Pena
c5ec9dd650 - Fix build 2011-11-17 21:07:52 +00:00
Stefan Marr
5ef2c32822 Fixed Bug #60165 (Aliasing unexisting trait should throw/trigger the exception/error)
- aliases that are not actually matching anything are treated as errors now. This
  will make sure that all methods that are expected to be in a class are actually
  there, or in case a trait changed for instance, that the code breaks already
  on composition
- Precedence declarations are also checked to ensure that the method
  which is supposed to take precedence actually exists, however,
  the other traits mentioned in the declaration are not regarded.
  We are more lenient here, since this avoids unnecessary fragility.
- fixed another seamingly unrelated test which broke in the progress
  but wasn't clear before either.
2011-11-17 21:04:15 +00:00
Stefan Marr
c5ba229617 Fixed Bug #60165 (Aliasing unexisting trait should throw/trigger the exception/error)
- aliases that are not actually matching anything are treated as errors now. This
  will make sure that all methods that are expected to be in a class are actually
  there, or in case a trait changed for instance, that the code breaks already
  on composition
- Precedence declarations are also checked to ensure that the method
  which is supposed to take precedence actually exists, however,
  the other traits mentioned in the declaration are not regarded.
  We are more lenient here, since this avoids unnecessary fragility.
- fixed another seamingly unrelated test which broke in the progress
  but wasn't clear before either.
2011-11-17 21:04:15 +00:00
Felipe Pena
7735ef1c2d - Fixed bug #60099 (__halt_compiler() works in braced namespaces) 2011-11-16 17:41:40 +00:00
Felipe Pena
caa863dc42 - Fixed bug #60099 (__halt_compiler() works in braced namespaces) 2011-11-16 17:41:40 +00:00
Felipe Pena
3c7a573a2c - Fixed bug #60099 (__halt_compiler() works in braced namespaces) 2011-11-16 17:41:40 +00:00
David Soria Parra
ce06b4397c Fix #60218 (instantiating unknown class leads to memory leak in cli) 2011-11-12 17:05:08 +00:00
David Soria Parra
c4d5231a36 Fix #60218 (instantiating unknown class leads to memory leak in cli) 2011-11-12 17:05:08 +00:00
Stanislav Malyshev
10f20585fc fix bug #55475 - implement is_a BC solution 2011-11-09 05:27:45 +00:00
Stanislav Malyshev
3598185a74 fix bug #55475 - implement is_a BC solution 2011-11-09 05:27:45 +00:00
Rasmus Lerdorf
c3e56a152c Here too 2011-11-08 20:37:09 +00:00
Rasmus Lerdorf
9597bc0801 This really shouldn't fail, but if it does, like on OSX under Valgrind,
let's just issue a warning.
2011-11-08 20:32:29 +00:00
Dmitry Stogov
cacf363957 Fixed bug #60104 (Segmentation Fault in pdo_sqlite when using sqliteCreateFunction()) 2011-11-08 10:11:25 +00:00
Dmitry Stogov
e86830273b Fixed bug #60104 (Segmentation Fault in pdo_sqlite when using sqliteCreateFunction()) 2011-11-08 10:11:25 +00:00
Felipe Pena
eebaaf423f - Added class member access on instantiation (e.g. (new foo)->bar()) support 2011-11-06 13:25:45 +00:00
Felipe Pena
ff48763f4b - Added class member access on instantiation (e.g. (new foo)->bar()) support 2011-11-06 13:25:45 +00:00
Stefan Marr
5745f95372 Fixed inconsistent whitespace.
# Belongs to svn rev. 318793.
2011-11-05 02:05:28 +00:00
Stefan Marr
b632cd196e Fixed inconsistent whitespace.
# Belongs to svn rev. 318793.
2011-11-05 02:05:28 +00:00
Stefan Marr
7334dfd7eb Fixed Bug #60217 (Requiring the same method from different traits)
- also added test to check for inconsistent abstract method definitions, they need to be compatible
2011-11-05 01:46:40 +00:00
Stefan Marr
12cf1b7978 Fixed Bug #60217 (Requiring the same method from different traits)
- also added test to check for inconsistent abstract method definitions, they need to be compatible
2011-11-05 01:46:40 +00:00
Antony Dovgal
fadba4d1c4 use jmp_addr only when it's initialized 2011-11-03 08:39:12 +00:00
Antony Dovgal
36103d1236 use jmp_addr only when it's initialized 2011-11-03 08:39:12 +00:00
Xinchen Hui
cae2f1381f Fix bug #60169 Conjunction of ternary and list crashes PHP 2011-11-03 03:59:41 +00:00
Xinchen Hui
a9dbbf6dea Fix bug #60169 Conjunction of ternary and list crashes PHP 2011-11-03 03:59:41 +00:00
Ferenc Kovacs
6c01aacc0d adding memory check for FreeBSD also, TODO: refactor the free memory check into a function in an include file 2011-11-02 21:27:03 +00:00
Ferenc Kovacs
5bf6eaf3f4 adding memory check for FreeBSD also, TODO: refactor the free memory check into a function in an include file 2011-11-02 21:27:03 +00:00
Ferenc Kovacs
c60a2a711a adding memory check for FreeBSD also, TODO: refactor the free memory check into a function in an include file 2011-11-02 21:27:03 +00:00
Antony Dovgal
ed276758f7 fix folding, ws and cs 2011-11-02 21:12:13 +00:00
Antony Dovgal
6acbe5155e fix folding, ws and cs 2011-11-02 21:12:13 +00:00
Antony Dovgal
8d520d6296 initialize variable and fix segfaulting tests 2011-11-02 21:05:36 +00:00
Antony Dovgal
bff7cbc87c initialize variable and fix segfaulting tests 2011-11-02 21:05:36 +00:00
Dmitry Stogov
e95bb57da9 Fixed bug #60139 (Anonymous functions create cycles not detected by the GC) 2011-11-02 06:31:33 +00:00
Dmitry Stogov
e0f781f496 Fixed bug #60139 (Anonymous functions create cycles not detected by the GC) 2011-11-02 06:31:33 +00:00
Dmitry Stogov
b64e91ddeb Fixed bug #60139 (Anonymous functions create cycles not detected by the GC) 2011-11-02 06:31:33 +00:00
Ferenc Kovacs
67e148a2ff allocating more than 2GB memory is slow. 2011-11-01 21:27:57 +00:00
Ferenc Kovacs
8412709f37 allocating more than 2GB memory is slow. 2011-11-01 21:27:57 +00:00
Ferenc Kovacs
236bf63b8b allocating more than 2GB memory is slow. 2011-11-01 21:27:57 +00:00
Stefan Marr
7cd55955d1 Fixed Bug #60153 (Interface method prototypes not enforced when implementd via traits.)
# Moved the freeing of overriden functions to a point after the check.
# The new check comes after the normal inheritance check to give the first check
# the opportunity to abort with a more detailed error.
# Also fixed a small type in an unrelated test.
2011-11-01 15:25:24 +00:00
Stefan Marr
4591498df7 Fixed Bug #60153 (Interface method prototypes not enforced when implementd via traits.)
# Moved the freeing of overriden functions to a point after the check.
# The new check comes after the normal inheritance check to give the first check
# the opportunity to abort with a more detailed error.
# Also fixed a small type in an unrelated test.
2011-11-01 15:25:24 +00:00
Stefan Marr
ce0ddd5a34 Added missing consistency check for abstract methods required by one trait and implemented by another. 2011-11-01 13:42:53 +00:00
Stefan Marr
9b0d73af1d Added missing consistency check for abstract methods required by one trait and implemented by another. 2011-11-01 13:42:53 +00:00
Stefan Marr
3b74bba724 Fixed Bug #60145 (Usage of trait's use statement inside interfaces not properly checked.) 2011-11-01 00:39:10 +00:00
Stefan Marr
b5f15ef561 Fixed Bug #60145 (Usage of trait's use statement inside interfaces not properly checked.) 2011-11-01 00:39:10 +00:00
Stefan Marr
ada5cda0ec Fixed Bug #60173 (Wrong error message on reflective trait instantiation) 2011-10-31 22:59:00 +00:00
Stefan Marr
2e5d5e5ac6 Fixed Bug #60173 (Wrong error message on reflective trait instantiation) 2011-10-31 22:59:00 +00:00
Xinchen Hui
55656b2cda Update tests 2011-10-31 06:52:45 +00:00
Xinchen Hui
63812d1849 Update tests 2011-10-31 06:52:45 +00:00
Xinchen Hui
3b99aa995d Test for #60174 (Notice when array in method prototype error) 2011-10-31 06:04:43 +00:00
Xinchen Hui
378ad2f447 Test for #60174 (Notice when array in method prototype error) 2011-10-31 06:04:43 +00:00
Xinchen Hui
725af4c2dd Fixed bug #60174 (Notice when array in method prototype error)
this should also exists in ext/reflection. since the new warning of "array to string convert" is introduced in zend_make_printable_zval which is used in ext/reflection too
2011-10-31 03:47:11 +00:00
Xinchen Hui
5921e73a37 Fixed bug #60174 (Notice when array in method prototype error)
this should also exists in ext/reflection. since the new warning of "array to string convert" is introduced in zend_make_printable_zval which is used in ext/reflection too
2011-10-31 03:47:11 +00:00
Xinchen Hui
9d98b3e39a tests for 60169 2011-10-30 06:28:24 +00:00
Xinchen Hui
01ebd32c05 tests for 60169 2011-10-30 06:28:24 +00:00
Ferenc Kovacs
6c67aa07b4 check the available memory on linux and skip if it is not enough 2011-10-23 00:07:01 +00:00
Ferenc Kovacs
c67c8cb965 check the available memory on linux and skip if it is not enough 2011-10-23 00:07:01 +00:00
Ferenc Kovacs
b6aa3964d8 check the available memory on linux and skip if it is not enough 2011-10-23 00:07:01 +00:00
Ferenc Kovacs
1b556f6114 shave off 900M memory from this test 2011-10-22 23:47:52 +00:00
Ferenc Kovacs
121ebbccc0 shave off 900M memory from this test 2011-10-22 23:47:52 +00:00
Ferenc Kovacs
9798694c03 shave off 900M memory from this test 2011-10-22 23:47:52 +00:00
Ferenc Kovacs
8e40498ae0 this was somehow missed from r318288 2011-10-22 22:35:17 +00:00
Stanislav Malyshev
d81ea16ef1 Changed silent conversion of array to string to produce a notice. (Patrick) 2011-10-21 06:08:47 +00:00
Stanislav Malyshev
ed12ebc79c Changed silent conversion of array to string to produce a notice. (Patrick) 2011-10-21 06:08:47 +00:00
Arnaud Le Blanc
ea5a61e39b Improved ternary operator performance when returning arrays 2011-10-18 19:42:42 +00:00
Arnaud Le Blanc
07b7ba8b40 Improved ternary operator performance when returning arrays 2011-10-18 19:42:42 +00:00
Stanislav Malyshev
05c5c8958e Bug #55754 - Only variables should be passed by reference for ZEND_SEND_PREFER_REF params 2011-10-16 00:34:01 +00:00
Stanislav Malyshev
70a6a67c1e Bug #55754 - Only variables should be passed by reference for ZEND_SEND_PREFER_REF params 2011-10-16 00:34:01 +00:00
Stefan Marr
7e4b9800f4 Fixed Bug #55554 (Legacy constructors not handled properly) [TRAITS] [DOC]
# The handling of legacy constructors defined by traits was corrected.
# They are now properly registered and used on instantiation.
# The situation for conflicting legacy and __construct constructors is
# mostly identical. If they are defined in the class, they override conflicts
# and do not collide. However, in case different styles are mixed, between
# class and trait definition, we assume a programmer's mistake and report
# a collision.
#
# BTW: +1 for all the fixed tests! `make test` is fun again.
2011-10-09 11:13:27 +00:00
Stefan Marr
e14354af21 Fixed Bug #55554 (Legacy constructors not handled properly) [TRAITS] [DOC]
# The handling of legacy constructors defined by traits was corrected.
# They are now properly registered and used on instantiation.
# The situation for conflicting legacy and __construct constructors is
# mostly identical. If they are defined in the class, they override conflicts
# and do not collide. However, in case different styles are mixed, between
# class and trait definition, we assume a programmer's mistake and report
# a collision.
#
# BTW: +1 for all the fixed tests! `make test` is fun again.
2011-10-09 11:13:27 +00:00
Stefan Marr
9d30c4896f Use ZEND_ constants instead of plain strings for names of magic methods.
# No functional changes.
2011-10-08 23:47:16 +00:00
Stefan Marr
469fc0a341 Use ZEND_ constants instead of plain strings for names of magic methods.
# No functional changes.
2011-10-08 23:47:16 +00:00
Xinchen Hui
4ffc16611d Remove unecessary codes 2011-10-07 04:14:31 +00:00
Xinchen Hui
50bf7a1182 Remove unecessary codes 2011-10-07 04:14:31 +00:00
Xinchen Hui
2e925f6f19 Fixed bug #55825, and add test script 2011-10-03 17:01:17 +00:00
Xinchen Hui
37e1ed68e5 Fixed bug #55825, and add test script 2011-10-03 17:01:17 +00:00
Stanislav Malyshev
bf9c99227e update proto 2011-09-26 03:57:22 +00:00
Stanislav Malyshev
f50f54a6ea update proto 2011-09-26 03:57:22 +00:00
Xinchen Hui
c58f254354 Improve the warning message of incompatible arguments. (#55719)
And fix tests related.
2011-09-23 15:08:11 +00:00
Xinchen Hui
8cefbca521 Improve the warning message of incompatible arguments. (#55719)
And fix tests related.
2011-09-23 15:08:11 +00:00
Rasmus Lerdorf
92f68921cf Re-committing Alan's is_a revert/fix for bug #55475
Dmitry had done so earlier, but reverted pending discussion.
It is completely clear that this should never have been changed in the
5.3 branch in the first place giving the number of things that broke
because of it.
2011-09-23 09:52:09 +00:00
Felipe Pena
0ebd2309b1 - Fixed bug #55705 (Omitting a callable typehinted argument causes a segfault)
patch by: laruence@php
2011-09-17 00:16:11 +00:00
Felipe Pena
5441cd1f0d - Fixed bug #55705 (Omitting a callable typehinted argument causes a segfault)
patch by: laruence@php
2011-09-17 00:16:11 +00:00
Pierrick Charron
495a7b34ee Fixed test bug #55713 (Christopher Jones) 2011-09-16 18:29:22 +00:00
Pierrick Charron
ee534ac62f Fixed test bug #55713 (Christopher Jones) 2011-09-16 18:29:22 +00:00
Pierrick Charron
63293044f9 Fixed test bug #55713 (Christopher Jones) 2011-09-16 18:29:22 +00:00
Dmitry Stogov
16c87163f0 Fixed bug #55644 (Math ops tests fail, diff min int value) 2011-09-16 07:59:34 +00:00
Dmitry Stogov
c3741ad973 Fixed bug #55644 (Math ops tests fail, diff min int value) 2011-09-16 07:59:34 +00:00
Etienne Kneuss
d8052a1544 Fix folding 2011-09-15 14:50:38 +00:00
Etienne Kneuss
c2a92317f4 Fix folding 2011-09-15 14:50:38 +00:00
Dmitry Stogov
77bda2614d Fixed bug #50982 (incorrect assumption of PAGE_SIZE size) 2011-09-15 11:30:17 +00:00
Dmitry Stogov
653e374b6b Fixed bug #50982 (incorrect assumption of PAGE_SIZE size) 2011-09-15 11:30:17 +00:00
Dmitry Stogov
a223328b52 Fixed bug #50982 (incorrect assumption of PAGE_SIZE size) 2011-09-15 11:30:17 +00:00
Dmitry Stogov
59ad27b0aa Reverted the fix for #55475 (is_a() triggers autoloader) before the common decision 2011-09-15 10:59:39 +00:00