Xinchen Hui
74228c5151
Fixed bug #63305 (zend_mm_heap corrupted with traits)
2012-10-23 11:34:25 +08:00
Xinchen Hui
c018d09c33
Merge branch 'PHP-5.4'
2012-10-19 11:24:56 +08:00
Xinchen Hui
bb51549915
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-19 11:24:15 +08:00
Xinchen Hui
90bd54c46e
preg indenpent test script for #63055
2012-10-19 11:22:56 +08:00
Derick Rethans
c165a0b6ec
Merge branch 'PHP-5.4'
2012-10-18 17:54:03 +01:00
Derick Rethans
b58d45b67f
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
Zend/acinclude.m4
2012-10-18 17:53:55 +01:00
Derick Rethans
7aed21c557
SUpport newer bisons.
2012-10-18 17:53:21 +01:00
Xinchen Hui
84efca62ff
Merge branch 'PHP-5.4'
2012-10-18 20:12:00 +08:00
Xinchen Hui
1f8fd609b0
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 20:11:32 +08:00
Xinchen Hui
e88cdaa014
better fix for #63055
2012-10-18 20:10:35 +08:00
Xinchen Hui
4eece4c86a
Merge branch 'PHP-5.4'
2012-10-18 17:35:29 +08:00
Xinchen Hui
54cef2bb6d
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-18 17:33:52 +08:00
Xinchen Hui
b77873f7d2
Merge branch 'PHP-5.4'
2012-10-18 16:33:48 +08:00
Xinchen Hui
4d509708a4
I forgot that inconsistent is only avaliable in debug mode
2012-10-18 16:33:07 +08:00
Xinchen Hui
2fee6f1ee9
Merge branch 'PHP-5.4'
2012-10-18 16:06:47 +08:00
Xinchen Hui
08b9702f8a
Add comments
2012-10-18 16:06:20 +08:00
Xinchen Hui
804ab5dc48
Merge branch 'PHP-5.4'
2012-10-18 15:53:12 +08:00
Xinchen Hui
ccc519b7a9
Fixed bug #63055 (Segfault in zend_gc with SF2 testsuite)
...
This should also fixed various segfaults which the bt looks like cored in zval_mark_grey
2012-10-18 15:49:37 +08:00
Xinchen Hui
69a4301f6c
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:45:07 +08:00
Xinchen Hui
1b9e0de2cc
Remove executable permission on inc
2012-10-10 10:44:34 +08:00
Xinchen Hui
45e938ec34
Remove executable permission on phpt
2012-10-10 10:31:53 +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
Xinchen Hui
e4a8fa6a15
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e
Fixed bug #63236 (Executable permission on various source files)
2012-10-09 13:28:31 +08:00
Xinchen Hui
67611c67fa
Fixed bug #63219 (Segfault when aliasing trait method when autoloader throws excpetion)
2012-10-08 22:59:52 +08:00
Xinchen Hui
4e5e8c9da0
Merge branch 'PHP-5.4'
2012-10-10 10:45:34 +08:00
Xinchen Hui
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +08:00
Xinchen Hui
75a2c0d715
Merge branch 'PHP-5.4'
2012-10-09 13:30:22 +08:00
Xinchen Hui
6cd6a74c5a
Merge branch 'PHP-5.4'
2012-10-08 23:00:57 +08:00
Stanislav Malyshev
531e2533dd
Use zend_execute_internal always to call internal functions
2012-10-05 08:14:20 +02:00
Stanislav Malyshev
bda93f5405
use zend_execute_internal
2012-10-04 22:43:13 -07:00
Nikita Popov
aaabac2473
Merge branch 'PHP-5.4'
...
Conflicts:
Zend/zend_vm_def.h
2012-09-27 18:46:27 +02:00
Nikita Popov
592b232e83
Fix bug #63173 : Crash when invoking invalid array callback
...
The code did not check whether the zend_hash_index_find calls succeded,
so PHP crashed when an array callback was called that contains two elements
which don't have the indices 0 and 1.
2012-09-27 18:40:00 +02:00
Nikita Popov
5c7dd7811e
Simplify set_error_handler/set_exception_handler code
2012-09-22 21:46:29 +02:00
Nikita Popov
f28c128b20
Return previous error handler when resetting the error handler
...
set_error_handler(null) and set_exception_handler(null) now return the
previous error/exception handler instead of just returning bool(true).
This is consistent with the behavior of these functions with non-null
values.
2012-09-22 21:46:18 +02:00
Nikita Popov
c815dd74bc
Allow resetting the error handler
...
This allows the error handler to be reset using set_error_handler(null).
As the code suggests this behavior was already previously intended, but
the callback check was done too strictly.
2012-09-22 21:46:02 +02:00
Nikita Popov
4954aba2ed
Revert error/exception handler changes
...
This reverts the following two commits:
* 6ba2e662e4
* d8f8e98d8e
Laruence already did some partial changes to set_error_handler and
set_exception_handler. I'm reverting those modifications to apply the full
set of changes. (The modifications changed the code structure in a way that
would lead to more duplication with the new behavior.)
2012-09-22 21:41:51 +02:00
Nikita Popov
a31fa55b44
Fixed bug #63132
...
EG(arg_types_stack) is now also backed up when generators are used. This
allows the use of yield in nested method calls.
This commit adds two new functions to the zend_ptr_stack API:
zend_ptr_stack_push_from_memory
zend_ptr_stack_pop_into_memory
both taking the following arguments:
zend_ptr_stack *stack, int count, void **pointers
2012-09-22 19:15:53 +02:00
Dmitry Stogov
274cbe5238
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #63111 (is_callable() lies for abstract static method)
Fix folding
Conflicts:
NEWS
2012-09-21 15:14:29 +04:00
Dmitry Stogov
ed3a2eec9c
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63111 (is_callable() lies for abstract static method)
Conflicts:
NEWS
2012-09-21 14:18:37 +04:00
Dmitry Stogov
4db74b7f19
Fixed bug #63111 (is_callable() lies for abstract static method)
2012-09-21 13:07:14 +04:00
Xinchen Hui
fd0b3ea663
Fixed bug #61442 (exception threw in __autoload can not be catched)
2012-09-19 19:40:59 +08:00
Stanislav Malyshev
44e3a9be7e
Merge branch 'PHP-5.4'
...
* PHP-5.4:
update news
Support building PHP with the native client toolchain.
test should fail
2012-09-17 15:58:48 -07:00
Stuart Langley
2e24d9a2b3
Support building PHP with the native client toolchain.
...
The native client compiler defines the C macro __x86_64__, but the size
of an unsigned int is only 4 bytes. This causes the compile to fail
because the inline asm code compiled is for an 8 byte unsigned int. Add
the correct defines to fix this.
As detailed in:
http://code.google.com/p/nativeclient/issues/detail?id=2255
2012-09-17 15:52:55 -07:00
Nikita Popov
a47c11a13d
Fix two op_array -> function cast warnings
2012-09-16 22:01:07 +02:00
Nikita Popov
526db7db14
Replace code with zend_clean_and_cache_symbol_table() call
...
I replaced other instances of this code with the function call, but missed
this one.
2012-09-16 21:54:48 +02:00
Nikita Popov
fb03ce93d3
Fix invalid read / remove useless code
...
Generators follow a different cleanup path, so the extra check for freeing
the execute_data is unnecessary there. It actually caused problems because
op_array->fn_flags could be in freed memory at that time (in case op_array
came from a closure in an ArrayAccess container).
This fixes the valgrind warning in Zend/tests/bug54367.phpt.
2012-09-16 21:48:57 +02:00
Xinchen Hui
80b29dcfad
Merge branch 'PHP-5.4'
2012-09-15 11:51:48 +08:00
Xinchen Hui
ee620e9673
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-15 11:51:25 +08:00
Xinchen Hui
4c6678d605
Fixed bug #63093 (Segfault while load extension failed in zts-build).
2012-09-15 11:50:16 +08:00
Dmitry Stogov
d4d82aac39
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
Conflicts:
NEWS
2012-09-06 14:03:22 +04:00
Dmitry Stogov
6ba376f552
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Fixed bug #61767 (Shutdown functions not called in certain error situation) - Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
Conflicts:
NEWS
Zend/zend_object_handlers.c
2012-09-06 12:14:29 +04:00
Dmitry Stogov
b29dc146b9
- Fixed bug #61767 (Shutdown functions not called in certain error situation)
...
- Fixed bug #60909 (custom error handler throwing Exception + fatal error = no shutdown function)
2012-09-06 11:26:40 +04:00
Pierre Joye
2b7bddd82a
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
2012-09-05 13:00:41 +02:00
Pierre Joye
954e7a3b3c
- fix build, there was no tsrm context there, doing a fetch but this is horribly slow, this fix needs improvement (or simply add a TSRM context in the signature in master
2012-09-05 13:00:04 +02:00
Pierre Joye
4a7d1b4ed8
- fix build, declarations must be 1st in a contextgit checkout -f master
2012-09-05 12:53:29 +02:00
Dmitry Stogov
bceec038c8
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62907 (Double free when use traits)
Conflicts:
NEWS
2012-09-05 10:01:04 +04:00
Dmitry Stogov
6c0508f8d5
Fixed bug #62907 (Double free when use traits)
2012-09-05 09:58:22 +04:00
Dmitry Stogov
72473962a9
Fixed bug #62991 (Segfault with generator and closure)
2012-09-05 09:50:55 +04:00
Xinchen Hui
32a97dfae6
Merge branch 'PHP-5.4'
2012-09-02 16:53:31 +08:00
Xinchen Hui
069c448623
folder
2012-09-02 16:52:53 +08:00
Nikita Popov
dffffdeb3d
Fix leak when yielding array as key
...
The code was copy-pasted and I forgot to change OP1 to OP2 in that one
place.
2012-09-01 20:31:40 +02:00
Gustavo Lopes
53351d087d
Merge branch 'generators'
...
* generators: (70 commits)
Fix typos
Fix segfault when traversing a by-ref generator twice
Make sure that exception is thrown on rewind() after closing too
Remove implementation stubs for yield delegation
Fix several issues and allow rewind only at/before first yield
Run finally if generator is closed before finishing
Finally with return now works in generators too
Add dedicated opcode for returns from a generator
Disallow serialization and unserialization
Fix zts build (typo)
Drop Generator::close() method
Forgot to add test
Support trivial finally in generators (no yield, no return)
Fix implementation of Iterator interface
Add T_YIELD in tokenizer_data.c
Throw error also for return occuring before yield
Fix throwing of exceptions within a generator
Remove reference restrictions from foreach
Require parenthesis around yield expressions
Add some more tests
...
2012-09-01 19:07:20 +02:00
Xinchen Hui
b5d2c3174f
Merge branch 'PHP-5.4'
2012-08-31 11:25:21 +08:00
Xinchen Hui
66fad45724
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-31 11:24:10 +08:00
Xinchen Hui
5dc2cef370
Fixed bug #62976 (Notice: could not be converted to int when comparing some builtin classes)
2012-08-31 11:22:43 +08:00
Nikita Popov
dbc7809b17
Fix typos
2012-08-29 20:49:14 +02:00
Nikita Popov
bef79588d5
Fix segfault when traversing a by-ref generator twice
...
If you try to traverse an already closed generator an exception will now be
thrown.
Furthermore this changes the error for traversing a by-val generator by-ref
from an E_ERROR to an Exception.
2012-08-29 20:46:56 +02:00
Nikita Popov
cc07038fa9
Make sure that exception is thrown on rewind() after closing too
2012-08-29 20:31:34 +02:00
Lars Strojny
6b1073a3a7
Bug #62956 : fixing private method signature validation
...
In inheritance, if both methods are private, don not enforce the same
signature.
2012-08-28 14:10:25 +02:00
Lars Strojny
f82dd2c774
Bug #62956 : fixing private method signature validation
...
In inheritance, if both methods are private, don not enforce the same
signature.
2012-08-28 14:06:18 +02:00
Xinchen Hui
cec1786911
Fixed bug #62938 (zend_do_bind_catch() used without declaration)
2012-08-27 10:23:23 +08:00
Lars Strojny
8788cddfb3
Prefix RESULT_CODE enum with ZEND_
2012-08-26 20:06:47 +02:00
Gustavo Lopes
3d0857938d
zend_binary_strncasecmp_l used w/out declaration
2012-08-26 19:44:05 +02:00
Stuart Langley
e3ef84c59b
Strong types for the result codes SUCCESS & FAILURE. These are common
...
symbol names and using #defines can cause conflicts.
2012-08-26 17:15:27 +02:00
Nikita Popov
d60e3c6ef5
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
...
Conflicts:
Zend/zend_language_parser.y
Zend/zend_vm_execute.skl
2012-08-26 13:03:55 +02:00
Xinchen Hui
14c88ff82c
Merge branch 'PHP-5.4'
2012-08-26 18:28:58 +08:00
Xinchen Hui
e24194d157
Add test for #62907
2012-08-26 18:28:15 +08:00
Xinchen Hui
5ebbdecfea
Fixed bug #62930 , and more tests
2012-08-26 13:05:33 +08:00
Xinchen Hui
c6a5d192c8
tabs
2012-08-26 12:27:10 +08:00
Xinchen Hui
7c60aeef85
Fixed bug #62931 & #62932
2012-08-26 11:37:05 +08:00
Nikita Popov
bd70d15588
Remove implementation stubs for yield delegation
...
I decided to leave out yield delegation for an initial proposal, so remove
the stubs for it too.
2012-08-25 19:03:23 +02:00
Nikita Popov
f53225a99e
Fix several issues and allow rewind only at/before first yield
...
* Trying to resume a generator while it is already running now throws a
fatal error.
* Trying to use yield in finally while the generator is being force-closed
(by GC) throws a fatal error.
* Rewinding after the first yield now throws an Exception
2012-08-25 17:40:08 +02:00
Xinchen Hui
35951d4be0
Support list in foreach
...
RFC: https://wiki.php.net/rfc/foreachlist
2012-08-25 22:23:57 +08:00
Xinchen Hui
e888d48d9b
Merge branch 'PHP-5.4'
2012-08-25 21:55:36 +08:00
Xinchen Hui
383eafe482
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-25 21:50:08 +08:00
Xinchen Hui
d92a89fe52
Fixed bug (segfault while build with zts and GOTO vm-kind)
2012-08-25 21:47:53 +08:00
Xinchen Hui
326aa08753
Prefer no finally block for most situations
2012-08-25 21:14:51 +08:00
Nikita Popov
4d8edda341
Run finally if generator is closed before finishing
2012-08-24 19:10:09 +02:00
Nikita Popov
7cdf6367a5
Finally with return now works in generators too
2012-08-24 13:52:16 +02:00
Nikita Popov
68c1e1cfe9
Add dedicated opcode for returns from a generator
...
Generators don't have a return value, so it doesn't make sense to have
a shared implementation here.
2012-08-24 13:51:39 +02:00
Nikita Popov
6517ed0215
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
...
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2012-08-24 13:29:40 +02:00
Xinchen Hui
3ef3b80cdd
Merge branch 'PHP-5.4'
2012-08-23 16:13:57 +08:00
Xinchen Hui
87785c7d5a
tabs
2012-08-23 16:13:34 +08:00
Xinchen Hui
9b2ca07223
Merge branch 'PHP-5.4'
2012-08-23 16:07:13 +08:00
Xinchen Hui
d39aa984ad
Refix #62358 , previous has side-affect
2012-08-23 16:06:17 +08:00
Xinchen Hui
b8800d1701
Merge branch 'PHP-5.4'
2012-08-23 15:45:06 +08:00
Xinchen Hui
6d1bebfcb0
Fixed bug #62358 (Segfault when using traits a lot)
2012-08-23 15:41:49 +08:00
Felipe Pena
596e855feb
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)
2012-08-22 10:51:06 -03:00
Felipe Pena
7a56ac00a0
- Fixed bug #62892 (ReflectionClass::getTraitAliases crashes on importing trait methods as private)
2012-08-22 10:50:50 -03:00
Xinchen Hui
3938e5d616
Merge branch 'finally'
2012-08-22 18:33:37 +08:00
Xinchen Hui
60a29791e4
Fixed bug that jmp in try block jmp over finally block
...
Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
Xinchen Hui
3d4f91da4b
Merge branch 'master' into finally
2012-08-22 18:12:11 +08:00
Anatoliy Belsky
dac25a0d50
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Fixed bug #62313 Zend\tests\errmsg_021.phpt fails
2012-08-22 11:45:32 +02:00
Anatoliy Belsky
22f55d5665
Fixed bug #62313 Zend\tests\errmsg_021.phpt fails
2012-08-22 11:43:12 +02:00
Xinchen Hui
703a4e390d
stash
2012-08-22 13:51:44 +08:00
Sebastian Bergmann
0fa40bb999
Bump version.
2012-08-21 13:37:18 +02:00
Nikita Popov
f45a0f31c8
Disallow serialization and unserialization
2012-08-20 16:01:16 +02:00
Nikita Popov
1823b16fa1
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
...
Merging master to fix Windows build
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
2012-08-20 13:37:53 +02:00
Nikita Popov
9003cd1425
Fix zts build (typo)
2012-08-20 13:28:36 +02:00
Nikita Popov
05f10480c5
Drop Generator::close() method
2012-08-20 12:53:18 +02:00
Stanislav Malyshev
3336e1e78c
Merge branch 'pull-request/31'
...
* pull-request/31:
Fix lexing of nested heredoc strings in token_get_all()
2012-08-19 21:43:04 -07:00
Felipe Pena
a025abe388
Merge branch 'PHP-5.4'
...
* PHP-5.4:
- Value stored to var is never used
2012-08-19 12:44:54 -03:00
Felipe Pena
7a72405171
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
- Value stored to var is never used
2012-08-19 12:44:49 -03:00
Felipe Pena
001966c754
- Value stored to var is never used
2012-08-19 12:44:44 -03:00
Felipe Pena
b2a74b5bdb
- Remove unused vars
2012-08-18 11:28:00 -03:00
Xinchen Hui
57e7c7bd49
tab
2012-08-18 11:57:53 +08:00
Xinchen Hui
72b9b8f380
Make the codes clearer, and also check continue statement
2012-08-18 11:44:09 +08:00
Xinchen Hui
f2a8912e61
Refactor examing of jumping out of finally block
2012-08-18 00:16:34 +08:00
Xinchen Hui
2449365238
Fixed context info in error message
2012-08-17 21:18:20 +08:00
Xinchen Hui
acd402d4e7
typo
2012-08-16 23:01:58 +08:00
Xinchen Hui
0312d0a262
Prevents goto
out of a finally block
2012-08-16 18:17:26 +08:00
Xinchen Hui
154fe7486d
typo
2012-08-14 14:17:27 +08:00
Xinchen Hui
f82be0550b
add test for alone try block, and update test scripts summary
2012-08-14 14:08:38 +08:00
Xinchen Hui
c64f4e736c
Add functions declarations, use tabs
2012-08-14 08:59:40 +08:00
Anatoliy Belsky
baea290b6c
fix windows build
2012-08-13 19:44:45 +02:00
Nikita Popov
7195a5b376
Forgot to add test
2012-08-13 19:24:44 +02:00
Nikita Popov
ae716939eb
Support trivial finally in generators (no yield, no return)
...
The finally clause is now properly run when an exception is thrown in the
try-block. It is not yet run on `return` and also not run when the generator
is claused within a try block.
I'll add those two things as soon as laruence refactored the finally code.
2012-08-13 17:22:21 +02:00
Nikita Popov
f4ce364628
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport
...
This is just an intial merge. It does not yet make generators and finally
work together.
Conflicts:
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Zend/zend_vm_execute.skl
Zend/zend_vm_opcodes.h
2012-08-13 16:54:53 +02:00
Xinchen Hui
80d5ae3cea
Implemented 'finally' keywords for php
...
RFC: https://wiki.php.net/rfc/finally
FR: https://bugs.php.net/bug.php?id=32100
and I have got some improvment ideas(performance), will implemented
later. thanks
2012-08-13 21:48:39 +08:00
Xinchen Hui
253760bb6b
Merge branch 'PHP-5.4'
2012-08-12 21:00:01 +08:00
Xinchen Hui
dda0565b53
Merge branch 'PHP-5.3' into PHP-5.4
2012-08-12 20:58:45 +08:00
Xinchen Hui
4970926e45
Fixed bug #62763 (register_shutdown_function and extending class)
2012-08-12 20:58:09 +08:00
Xinchen Hui
9787e7af44
Merge branch 'PHP-5.4'
2012-08-12 12:02:17 +08:00
Xinchen Hui
75f6c8d42c
Revert "zend_make_printable_zval choses cast_object over __toString"
...
This reverts commit a5dfd41494
.
2012-08-12 12:02:06 +08:00
Xinchen Hui
32c1c5a19f
Revert "Test for bug 62328"
...
This reverts commit 222ab9da1a
.
2012-08-12 12:02:02 +08:00
Xinchen Hui
7b307fb930
Fixed bug #62328 (implementing __toString and a cast to string fails)
...
__toString should has a high priority
2012-08-12 11:50:28 +08:00
Xinchen Hui
d11fa44d62
Merge branch 'Bug-62328' of https://github.com/leight/php-src
2012-08-12 10:40:41 +08:00
Leigh
222ab9da1a
Test for bug 62328
2012-08-10 11:43:53 +01:00
Leigh
a5dfd41494
zend_make_printable_zval choses cast_object over __toString
...
https://bugs.php.net/bug.php?id=62328
Added a check to see if the object implements a __toString magic
method. This should be called instead of the cast_object method of
built-in classes when defined.
2012-08-10 11:09:25 +01:00
Stanislav Malyshev
04ac5065e0
Merge branch 'PHP-5.4'
...
* PHP-5.4:
Added Bison 2.5.1 to bison_version_list
2012-08-05 20:48:47 -07:00
Ryusuke SEKIYAMA
81c6a060a2
Added Bison 2.5.1 to bison_version_list
2012-08-05 20:48:42 -07:00
Xinchen Hui
ac88d108e6
Merge branch 'PHP-5.4'
2012-08-04 11:29:56 +08:00
Xinchen Hui
d289efb457
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
Zend/zend_API.h
2012-08-04 11:14:03 +08:00
Xinchen Hui
f4a315fce2
This becomes useless, since we have set that in the INIT macro
2012-08-04 11:03:21 +08:00
Xinchen Hui
03a1fcabf3
Fixed bug #62744 (dangling pointers made by zend_disable_class)
...
the test will be added while commit the fix for #62737
2012-08-04 10:41:26 +08:00
Nuno Lopes
aa8eabddd6
make default_exception_ce and error_exception_ce static
2012-08-02 06:53:09 -04:00
Nuno Lopes
81369bcc20
make default_exception_ce and error_exception_ce static
2012-08-02 11:44:15 +01:00
Xinchen Hui
6c7c2d0c03
Merge branch 'PHP-5.4'
2012-08-02 12:34:15 +08:00