Xinchen Hui
92046b7ef1
Merge branch 'PHP-5.5'
2013-02-16 22:25:37 +08:00
Xinchen Hui
75742d57eb
Exceptions triggered by undefined variable should be handled before FATAL error
...
this is a enhancement of the fix for bug #64135
2013-02-16 22:22:22 +08:00
Ard Biesheuvel
0fcde51c35
Merge branch 'PHP-5.5'
2013-02-13 13:52:30 +01:00
Ard Biesheuvel
65fa9f2c4b
Merge branch 'PHP-5.4' into PHP-5.5
2013-02-13 13:50:53 +01:00
Ard Biesheuvel
050aae2860
Fixed bug #64197 (_Offsetof() macro used but not defined on ARM/Clang)
...
Updated the code to test for __ARMCC_VERSION instead of __arm, as
that is a more reliable indicator of whether the ARMCC compiler is
being used.
2013-02-13 12:22:50 +01:00
Ard Biesheuvel
7c1e19ed76
Merge branch 'PHP-5.5'
2013-02-11 14:45:17 +01:00
Ard Biesheuvel
e2453276e9
Low-level ARM optimizations
...
- added ARM versions of zend_mm_high_bit()/zend_mm_low_bit()
- improved safe_address()
2013-02-11 14:36:58 +01:00
Ard Biesheuvel
aa12cdc361
Improve x86 inline assembler
...
- added cc annotation to inline asm that clobbers the condition
flags
- remove hardcoded constants (IS_LONG,IS_DOUBLE)
- remove hardcoded offsets (zval->value, zval->type)
2013-02-11 13:53:27 +01:00
Andrey Hristov
faa79150f6
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-02-11 12:07:55 +01:00
Remi Collet
dc47ec0490
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64142 (dval to lval different behavior on ppc64)
2013-02-11 09:13:27 +01:00
Remi Collet
e67a2b9e47
Fixed bug #64142 (dval to lval different behavior on ppc64)
...
See discussion on internals
http://marc.info/?t=136042277700003&r=1&w=2
2013-02-11 09:10:51 +01:00
Xinchen Hui
5fcae352ed
Merge branch 'PHP-5.5'
2013-02-07 23:50:35 +08:00
Xinchen Hui
7948eea6f9
Forgot test script
2013-02-07 23:49:35 +08:00
Xinchen Hui
7fb07acf98
Merge branch 'PHP-5.5'
2013-02-07 23:46:15 +08:00
Xinchen Hui
290509755a
Fixed bug #64135 (Exceptions from set_error_handler are not always propagated)
2013-02-07 23:44:46 +08:00
Remi Collet
9f7b121da3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
revert
revert
2013-02-05 12:29:34 +01:00
Remi Collet
7b75a941ef
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
revert
2013-02-05 12:29:01 +01:00
Remi Collet
e7ce002c01
revert
2013-02-05 12:28:47 +01:00
Ard Biesheuvel
d0e0a51c4c
Add ARM optimized versions of safe_address()
...
The function safe_address() uses inline assembler to detect
overflow in size/offset calculations, as detecting this in
plain C is a lot more work.
2013-02-05 12:14:55 +01:00
Remi Collet
c2a2f5e3ff
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS
Fixed bug #64142 (dval to lval different behavior on ppc64)
2013-02-04 15:27:54 +01:00
Remi Collet
79956330fe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #64142 (dval to lval different behavior on ppc64)
2013-02-04 15:27:07 +01:00
Remi Collet
6533094d9e
Fixed bug #64142 (dval to lval different behavior on ppc64)
...
On x86_64:
(long)(double)9223372036854775807+1 = -9223372036854775808
On ppc64
(long)(double)9223372036854775807-1 = 9223372036854775807
2013-02-04 15:19:32 +01:00
Nikita Popov
86ee2c60c4
Merge branch 'PHP-5.5'
2013-02-01 19:53:23 +01:00
Nikita Popov
114245c1b9
Fix bug #63830 : Segfault on undefined function call in nested generator
...
This also reverses the destruction order of the pushed arguments to
align with how it is done everywhere else.
I'm not exactly sure whether this is the right way to fix it, but it
seems to work fine.
2013-02-01 19:53:04 +01:00
Nikita Popov
5c3c31127e
Merge branch 'PHP-5.5'
2013-02-01 18:36:10 +01:00
Nikita Popov
3ee20e450f
Fix segfault when cloning generator with properties
...
Rule of thumb: Always implement the object clone handler rather
than the object storage clone handler. Actually I think we should
drop the latter. It's nearly never usable.
2013-02-01 18:33:26 +01:00
Nikita Popov
ea56a894e8
Merge branch 'PHP-5.5'
2013-01-30 23:55:59 +01:00
Nikita Popov
8b972efe5f
Fix potential segfault when finally in a generator is run during shutdown
...
If a generator is destroyed in a finally block it will resume the generator to run that finally
block before freeing the generator. This was done in the object storage free handler.
Running user code in the free handler isn't safe though because the free handlers may be run
during request shutdown, already after several key components have been shut down.
This is avoided by doing the finally handling in the dtor handler. These handlers are run at the
start of the shutdown sequence.
2013-01-30 23:52:02 +01:00
Jelle Zijlstra
09e73fd80e
Fix build problem in C++11
2013-01-30 19:08:45 +01:00
Jelle Zijlstra
86b3643807
Fix build problem in C++11
2013-01-30 19:08:24 +01:00
Jelle Zijlstra
31468401b7
Fix build problem in C++11
2013-01-30 19:07:52 +01:00
Johannes Schlüter
ac8fcecd5c
Merge branch 'PHP-5.5'
2013-01-29 19:50:44 +01:00
Johannes Schlüter
78d3e66f3a
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-29 19:50:14 +01:00
Johannes Schlüter
1433854681
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-29 19:49:43 +01:00
Johannes Schlüter
ec53b60072
Merge branch 'PHP-5.3' of git.php.net:/php-src into PHP-5.3
2013-01-29 19:49:13 +01:00
Johannes Schlüter
93fd9c704b
Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)
2013-01-29 19:47:45 +01:00
Stanislav Malyshev
59cc4d7679
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #60833 - self, parent, static behave inconsistently case-sensitive
Conflicts:
UPGRADING
2013-01-27 18:07:42 -08:00
Stanislav Malyshev
184db665eb
fix bug #60833 - self, parent, static behave inconsistently case-sensitive
2013-01-27 18:02:51 -08:00
Gustavo Lopes
ddc98aa814
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix bug #64023 (__toString() & SplFileInfo)
2013-01-23 13:26:15 +01:00
Gustavo Lopes
fc7b054c2d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #64023 (__toString() & SplFileInfo)
2013-01-23 13:24:50 +01:00
Gustavo Lopes
b8b3bb08b2
Merge branch 'bug64023' into PHP-5.4
...
* bug64023:
Fix bug #64023 (__toString() & SplFileInfo)
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-01-22 12:24:33 +01:00
Gustavo Lopes
aa0adce47d
Fix bug #64023 (__toString() & SplFileInfo)
...
Defining a __toString() method was having no effect when concatenating
the object. This was because the cast_object() handler would ignore
__toString().
Using echo() directly would actually use __toString(), but this was a
bug: the ECHO handler would try zend_std_cast_object_tostring() before
cast_object(), but cast_object() should have priority as
zend_std_cast_object_tostring() assumes an object with a
zend_class_entry.
2013-01-22 11:33:29 +01:00
Felipe Pena
6c8f9c3451
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed ZTS build
2013-01-18 22:15:22 -02:00
Felipe Pena
e23fca8910
- Fixed ZTS build
2013-01-18 22:15:08 -02:00
Lars Strojny
087a188702
Merge branch 'PHP-5.5' of git://github.com/php/php-src into PHP-5.5
2013-01-19 01:06:13 +01:00
Lars Strojny
b1ddfcbee3
Merge branch 'PHP-5.5'
2013-01-19 01:01:39 +01:00
Lars Strojny
8991ed016f
Class Name Resolution As Scalar Via "class" Keyword
2013-01-19 01:00:47 +01:00
Stanislav Malyshev
f02373fc5a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #63462 (Magic methods called twice for unset protected properties)
2013-01-18 13:45:40 -08:00
Stanislav Malyshev
cd619b47f3
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
...
* 'PHP-5.5' of git.php.net:php-src:
Fixed bug #63988 (Two Date tests fail) only for PHP-5.5
- Fixed ZTS build
Dereferencing process-handles no longer waits on those processes.
revert change. now it doesn't compile again...someone should fix ext/date...
Use two dtors thus allow allocation based on the alloc model of the connection.
plug a leak - forgot ot use the dtor already written
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
Revert "Update fputcsv() to escape all characters equally."
Add support for connect attributes, as of MySQL 5.6
Bug #62489 : dba_insert not working as expected
UPGRADING.INTERNALS: document zend_qsort_r
Add zend_qsort_r & use it in strtr
NEWS for bug #63893
Update README.PARAMETER_PARSING_API
Export zend_parse_parameter()
Expose zend_parse_arg() as zend_parse_parameter()
zend_parse_parameters: allow ! for non pointers
2013-01-18 13:42:19 -08:00
Stanislav Malyshev
deeacc7106
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #63462 (Magic methods called twice for unset protected properties)
NEWS for bug #64011 . See 77ee200
Fix bug #64011 (get_html_translation_table())
Fix News
Update the arguments in the prototype of fpm_socket_unix_test_connect().
fixed build
NEWS for bug #63893
Fixed inconsequential bug in strtr()
Revert "Apply the fputcsv test fix to SplFileObject_fputcsv.phpt. Mea culpa."
Revert "Update fputcsv() to escape all characters equally."
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
2013-01-18 13:42:04 -08:00
Stanislav Malyshev
9e7c2e5906
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix bug #63462 (Magic methods called twice for unset protected properties)
2013-01-18 13:35:09 -08:00
Stanislav Malyshev
33b104c778
fix bug #63462 (Magic methods called twice for unset protected properties)
2013-01-18 13:29:43 -08:00
Xinchen Hui
87d5701065
Fix skipif section
2013-01-18 15:12:51 +08:00
Ard Biesheuvel
0b8ec19629
Added ARM accelerated implementations for ZEND_SIGNED_MULTIPLY_LONG()
...
Added inline assembler implementations:
- for 32-bit ARM, as the existing C implementation uses 64-bit
integer arithmetic, which relies on software emulation by libgcc;
- for 64-bit ARM, as the existing C implementation uses long doubles
to check for overflow before using the integer result.
Also updated my email address and fixed some whitespace
2013-01-17 18:04:05 +01:00
Ard Biesheuvel
abb12f5d7b
Added test cases for ZEND_SIGNED_MULTIPLY_LONG()
...
Before making changes to the implementation of
ZEND_SIGNED_MULTIPLY_LONG(), add some test cases
to make sure the various implementations remain
equivalent.
2013-01-17 17:41:58 +01:00
Gustavo Lopes
979ca53734
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Update README.PARAMETER_PARSING_API
Export zend_parse_parameter()
Expose zend_parse_arg() as zend_parse_parameter()
zend_parse_parameters: allow ! for non pointers
2013-01-16 23:37:42 +01:00
Gustavo Lopes
b8603035d0
Merge remote-tracking branch 'cataphract/zpp_improv' into PHP-5.5
...
See https://wiki.php.net/rfc/zpp_improv
* cataphract/zpp_improv:
Update README.PARAMETER_PARSING_API
Export zend_parse_parameter()
Expose zend_parse_arg() as zend_parse_parameter()
zend_parse_parameters: allow ! for non pointers
2013-01-16 23:37:06 +01:00
Gustavo Lopes
5466fd1866
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed inconsequential bug in strtr()
UPGRADING.INTERNALS: document zend_qsort_r
Add zend_qsort_r & use it in strtr
NEWS for bug #63893
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
2013-01-15 21:47:33 +01:00
Gustavo Lopes
1bd193ed36
Merge remote-tracking branch 'remotes/cataphract/strtr_wu94_55' into PHP-5.5
...
* remotes/cataphract/strtr_wu94_55:
Fixed inconsequential bug in strtr()
UPGRADING.INTERNALS: document zend_qsort_r
Add zend_qsort_r & use it in strtr
NEWS for bug #63893
Remove _GNU_SOURCE, add local heap sort
The compiler can figure this out
Remove unused block
strtr() with 2nd param array - optimization
Refactoring, bugs & leaks
Optimize strtr w/ 2nd arg array
2013-01-15 21:45:22 +01:00
Andrey Hristov
c4fe37bd8c
Merge branch 'PHP-5.5'
...
Conflicts:
NEWS
2013-01-15 10:12:54 +01:00
Adam Harvey
be1700d467
Fix compile failure introduced by the fix for bug #46408 .
2013-01-15 10:08:26 +08:00
Lars Strojny
92965b033a
Bug #46408 : Fix double formatting for PostgreSQL bound parameters
2013-01-14 21:23:52 +01:00
Gustavo Lopes
22390d3393
Add zend_qsort_r & use it in strtr
2013-01-14 17:24:16 +01:00
Xinchen Hui
7a31692253
Merge branch 'PHP-5.5'
2013-01-14 17:09:05 +08:00
Xinchen Hui
be07f815f2
Use zend_unmangle_property_name_ex to save strlen
2013-01-14 17:08:21 +08:00
Xinchen Hui
f6260b36dd
Merge branch 'PHP-5.5'
2013-01-14 16:24:26 +08:00
Xinchen Hui
62059c16ee
Fixed bug #63980 (object members get trimmed by zero bytes)
2013-01-14 16:23:22 +08:00
Stanislav Malyshev
308d817fb6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix bug #63982 : isset() inconsistently produces a fatal error on protected property
different OSes have different messages, and that's not what the test is about anyway
2013-01-13 17:29:06 -08:00
Stanislav Malyshev
30fd25bb49
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix bug #63982 : isset() inconsistently produces a fatal error on protected property
different OSes have different messages, and that's not what the test is about anyway
2013-01-13 17:27:05 -08:00
Stanislav Malyshev
1a96fe0b32
fix bug #63982 : isset() inconsistently produces a fatal error on protected property
2013-01-13 17:08:52 -08:00
Stanislav Malyshev
c6203da6c2
different OSes have different messages, and that's not what the test is about anyway
2013-01-13 16:58:27 -08:00
Gustavo Lopes
07590e6e45
Export zend_parse_parameter()
2013-01-09 17:00:04 +01:00
Dmitry Stogov
0132cb694d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed compilator bug that might cause jump depended on unitialized value
2013-01-09 17:53:05 +04:00
Dmitry Stogov
c3ebd6305e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed compilator bug that might cause jump depended on unitialized value
2013-01-09 17:52:48 +04:00
Dmitry Stogov
625000ab44
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed compilator bug that might cause jump depended on unitialized value
2013-01-09 17:36:44 +04:00
Dmitry Stogov
d4650c5d69
Fixed compilator bug that might cause jump depended on unitialized value
2013-01-09 17:16:47 +04:00
Dmitry Stogov
149cc8d69d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63882 (zend_std_compare_objects crash on recursion)
2013-01-09 11:33:44 +04:00
Dmitry Stogov
326f896739
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63882 (zend_std_compare_objects crash on recursion)
Conflicts:
NEWS
2013-01-09 11:32:40 +04:00
Dmitry Stogov
f9e8678dd3
Fixed bug #63882 (zend_std_compare_objects crash on recursion)
2013-01-09 11:30:50 +04:00
Xinchen Hui
8a2208a33c
Merge branch 'PHP-5.5'
2013-01-04 11:06:26 +08:00
Xinchen Hui
c4f2a20f15
Merge branch 'PHP-5.4' into PHP-5.5
2013-01-04 11:05:53 +08:00
Xinchen Hui
aff5d084a5
Merge branch 'PHP-5.3' into PHP-5.4
2013-01-04 11:03:52 +08:00
Xinchen Hui
c3e6de2227
Fixed bug #63899 (Use after scope error in zend_compile)
2013-01-04 11:02:21 +08:00
Stanislav Malyshev
6da86acfae
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Bug #43177 : If an eval() has a parse error, the overall exit status and return code should not be affected.
fix NEWS
2013-01-01 21:21:42 -08:00
Stanislav Malyshev
80a9a80a52
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Bug #43177 : If an eval() has a parse error, the overall exit status and return code should not be affected.
fix NEWS
Conflicts:
main/main.c
2013-01-01 21:20:35 -08:00
Stanislav Malyshev
36e19c9cab
Bug #43177 : If an eval() has a parse error, the overall exit status and return code should not be affected.
...
Without this fix, a webpage using eval() may return code 500. That might display
fine and the 500 go unnoticed, but using AJAX or wget, the 500 will cause problems.
2013-01-01 21:18:59 -08:00
Xinchen Hui
642721b38a
Merge branch 'PHP-5.5'
2013-01-01 16:39:03 +08:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
831fbcf385
Happy New Year
2013-01-01 16:23:31 +08:00
Pierrick Charron
ae5d86270f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
2012-12-29 23:16:53 -05:00
Pierrick Charron
8228597ecc
Fixed bug #63874 (Segfaul if php_strip_whitespace has heredoc)
...
T_END_HEREDOC don't carry a token value anymore since commit 4cf90e06c
Bugfix by Nikita for bug #60097
2012-12-29 23:11:37 -05:00
Pierrick Charron
663434cd76
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-26 10:17:37 -05:00
Pierrick Charron
b35ffdeae1
Revert "Remove a useless memory write in zend_llist_del_element"
...
This reverts commit fad960a404
as
required by Stas and Christopher
2012-12-26 10:13:56 -05:00
Pierrick Charron
d87ad19683
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove a useless memory write in zend_llist_del_element
2012-12-25 20:59:38 -05:00
Pierrick Charron
5a97c30efe
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Remove a useless memory write in zend_llist_del_element
2012-12-25 20:59:20 -05:00
Pierrick Charron
c12ab5c306
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Remove a useless memory write in zend_llist_del_element
2012-12-25 20:57:21 -05:00
Pierrick Charron
fad960a404
Remove a useless memory write in zend_llist_del_element
...
The zend_llist_element *next pointer is not necessary and removing
it will also remove a write on memory
2012-12-25 20:45:24 -05:00
Dmitry Stogov
ba6317b05e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
spelling
2012-12-25 16:24:09 +04:00
Dmitry Stogov
8e6bf9e5e5
spelling
2012-12-25 16:23:52 +04:00
Dmitry Stogov
245dbb043e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
spelling
2012-12-25 16:22:22 +04:00
Dmitry Stogov
7625a3b3b4
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
spelling
2012-12-25 16:22:07 +04:00
Dmitry Stogov
7e2629635b
spelling
2012-12-25 16:21:25 +04:00
Dmitry Stogov
8728ca65c6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed ZTS build
2012-12-25 13:39:13 +04:00
Dmitry Stogov
016f3c8610
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed ZTS build
2012-12-25 13:39:02 +04:00
Dmitry Stogov
f0b459b7c4
Fixed ZTS build
2012-12-25 13:38:14 +04:00
Dmitry Stogov
f3ea497377
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed deprecated fields
2012-12-25 10:50:35 +04:00
Dmitry Stogov
bc0425c025
Removed deprecated fields
2012-12-25 10:47:43 +04:00
Dmitry Stogov
3b17a09017
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Traits refactoring
2012-12-25 10:34:07 +04:00
Dmitry Stogov
b8c719c068
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Traits refactoring
2012-12-25 10:33:01 +04:00
Dmitry Stogov
3f8c729e69
Traits refactoring
2012-12-25 10:23:08 +04:00
Nikita Popov
fd25d48494
Merge branch 'PHP-5.5'
2012-12-24 00:30:26 +01:00
Nikita Popov
be7b0bc3ec
Implement Generator::throw() method
...
Generator::throw($exception) throws an exception into the generator. The
exception is thrown at the current point of suspension within the generator.
It basically behaves as if the current yield statement were replaced with
a throw statement and the generator subsequently resumed.
2012-12-24 00:27:55 +01:00
Nikita Popov
1f4c71b760
Merge branch 'PHP-5.5'
2012-12-21 17:34:14 +01:00
Nikita Popov
14f133036c
Fix crash when last yielded value is a closure
...
If zend_generator_close is called from within zend_generator_resume (e.g.
due to a return statement) then all the EGs will still be using the values
from the generator. That's why the stack frame has to be the last thing
that is dtored, otherwise some other dtor that is using
EG(current_execute_data) might access the already freed memory segment.
This was the case with the closure dtor.
The fix is to move the dtors for key and value to the start of the handler.
This way the stack frame is the last thing that is freed.
2012-12-21 17:28:20 +01:00
Nikita Popov
4509016309
Merge branch 'PHP-5.5'
2012-12-21 01:58:29 +01:00
Nikita Popov
ffb848b275
Fix bug #63822 : Crash when using closures with ArrayAccess
...
op_array->T was used after the closure's op_array was already freed. This just
swaps the freeing order.
2012-12-21 01:56:37 +01:00
Nikita Popov
68730388ae
Merge branch 'PHP-5.5'
2012-12-20 20:36:06 +01:00
Nikita Popov
3e78c6ad25
Do not add a ref to EX(object) on generator clone
...
If a ref has to be added it will be already added while walking the call
slots.
2012-12-20 20:33:18 +01:00
Nikita Popov
0e781e2309
Merge branch 'PHP-5.5'
2012-12-19 15:23:52 +01:00
Nikita Popov
2768315856
Add missing zend_do_free call
...
This is a followup to d53f1bf8ab
. When the yield *statement* is used its
return value still needs to be freed.
2012-12-19 15:21:34 +01:00
Nikita Popov
5f7c478d53
Merge branch 'PHP-5.5'
2012-12-18 21:41:55 +01:00
Nikita Popov
d53f1bf8ab
Fix leak when generator ignores sent value
...
When the return value of yield wasn't used it was leaked.
This is fixed by using a TMP_VAR return value instead of VAR. TMP_VARs are
automatically freed when they aren't used.
2012-12-18 21:39:02 +01:00
Xinchen Hui
210d428f99
ixed bug that exception won't be catched
...
Related failed test Zend/tests/bug35437.phpt (after he latest
execute_data improvement, run with non CALL vm kind)
2012-12-18 15:34:47 +08:00
Xinchen Hui
d3ec9ceb25
Revert "Fixed bug that exception won't be catched"
...
This reverts commit 28db07a0e3
.
Unexpected vm kind change
2012-12-18 15:27:54 +08:00
Xinchen Hui
28db07a0e3
Fixed bug that exception won't be catched
...
related failed test Zend/tests/bug35437.phpt (after he latest
execute_data improvement, run with non CALL vm kind)
2012-12-18 15:20:58 +08:00
Xinchen Hui
72f7543668
Merge branch 'PHP-5.5'
2012-12-14 17:27:21 +08:00
Xinchen Hui
a73a6be764
Fix warning of no return in non-void function
2012-12-14 17:26:42 +08:00
Xinchen Hui
3acc729707
Merge branch 'PHP-5.5'
2012-12-14 17:23:07 +08:00
Xinchen Hui
9fb5cfdeb1
Fixed warning of no return in non-void funciton
2012-12-14 17:21:43 +08:00
Xinchen Hui
359d91a807
Add test for bug #63741
2012-12-14 16:52:56 +08:00
Xinchen Hui
a4678099a1
Add test for bug #63741
2012-12-14 16:51:34 +08:00
Dmitry Stogov
ec4ff07415
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed uninitialized EX(call)->called_scope
2012-12-14 12:11:23 +04:00
Dmitry Stogov
e65b966aac
Fixed uninitialized EX(call)->called_scope
2012-12-14 12:10:29 +04:00
Johannes Schlüter
f8a2407655
Merge branch 'PHP-5.5'
2012-12-13 22:50:55 +01:00
Johannes Schlüter
2098cc7e9d
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-13 22:45:47 +01:00
Johannes Schlüter
ef37055c34
Merge branch 'PHP-5.3' into PHP-5.4
2012-12-13 22:40:23 +01:00
Johannes Schlüter
a11606b18f
Fix Bug #63762 Sigsegv when Exception::$trace is changed by user
2012-12-13 22:39:35 +01:00
Dmitry Stogov
432902a875
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed unreachable code
2012-12-13 17:51:41 +04:00
Dmitry Stogov
d5c2da5756
Removed unreachable code
2012-12-13 17:51:04 +04:00
Dmitry Stogov
7dd16bcff4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed unnecessary checks
2012-12-13 17:30:39 +04:00
Dmitry Stogov
438cd86378
Removed unnecessary checks
2012-12-13 17:29:30 +04:00
Dmitry Stogov
cc118f78d7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Removed redundand checks from release build
2012-12-13 14:47:23 +04:00
Dmitry Stogov
ff1e1d7a8e
Removed redundand checks from release build
2012-12-13 14:46:44 +04:00
Dmitry Stogov
7b84d129d7
Merge branch 'PHP-5.5'
...
* PHP-5.5:
An exception thrown in try or catch block is disacarded by return statement in finally block.
2012-12-13 02:52:23 +04:00
Dmitry Stogov
6b0b4bf8eb
An exception thrown in try or catch block is disacarded by return statement in finally block.
2012-12-13 02:48:51 +04:00
Dmitry Stogov
e7364e14da
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Restored proper generators behaviour in conjunction with "finally". (Nikita)
2012-12-12 17:50:01 +04:00
Dmitry Stogov
9c96fe52d9
Restored proper generators behaviour in conjunction with "finally". (Nikita)
2012-12-12 17:47:55 +04:00
Dmitry Stogov
2025021ed5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- generators API exported for extensions - improved RETURN sequence to avoid redundant check if op_array is a generator
2012-12-11 17:28:09 +04:00
Dmitry Stogov
a9a5f7aca6
- generators API exported for extensions
...
- improved RETURN sequence to avoid redundant check if op_array is a generator
2012-12-11 17:25:32 +04:00
Xinchen Hui
80e585027e
Merge branch 'PHP-5.5'
2012-12-10 20:31:01 +08:00
Xinchen Hui
70b65f3100
Merge branch 'PHP-5.4' into PHP-5.5
2012-12-10 20:30:39 +08:00
Xinchen Hui
3d86e6d881
Fixed bug #63726 (Memleak with static properties and internal/user classes)
...
No test scripts provided (will try to find one)
2012-12-10 20:29:51 +08:00
Xinchen Hui
ad553a7af2
Fixed bug #63726 (Memleak with static properties and internal/user classes)
2012-12-10 20:28:27 +08:00
Dmitry Stogov
3067f54b27
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Generatirs are going to be used less than regular functions
2012-12-06 13:20:49 +04:00
Dmitry Stogov
e3b2a5cf74
Generatirs are going to be used less than regular functions
2012-12-06 13:14:31 +04:00
Sebastian Bergmann
4f4262e9be
Merge branch 'PHP-5.5'
2012-12-06 09:44:20 +01:00
Sebastian Bergmann
8ca4288fd2
Leftover: Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files.
2012-12-06 09:43:27 +01:00
Sebastian Bergmann
6fc2ecaaf2
Merge branch 'PHP-5.5'
2012-12-06 09:30:47 +01:00
Sebastian Bergmann
eab14993fe
Invoke re2c with --no-generation-date to prevent unintentional / unnecessary changes in generated files.
2012-12-06 09:28:35 +01:00
Dmitry Stogov
55e1a9786a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed comments
2012-12-05 16:03:37 +04:00
Dmitry Stogov
27528b601f
Fixed comments
2012-12-05 16:02:47 +04:00
Dmitry Stogov
77a9b9ac22
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Slight performance improvement
2012-12-05 13:36:28 +04:00
Dmitry Stogov
fa30e4754b
Slight performance improvement
2012-12-05 13:23:37 +04:00
David Soria Parra
808afd6db3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Pass zend_execute_data instead of zend_op_array
2012-12-05 00:46:30 +01:00
David Soria Parra
288f8734f6
Pass zend_execute_data instead of zend_op_array
2012-12-05 00:45:23 +01:00
David Soria Parra
e4c1aa33ab
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Overwrite execute_ex instead of execute in dtrace_execute
Enable dtrace probes on linux as they are compatible with systemtap
2012-12-04 21:02:23 +01:00
David Soria Parra
15a251a424
Overwrite execute_ex instead of execute in dtrace_execute
2012-12-04 21:01:32 +01:00
Dmitry Stogov
4d5859558a
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Increased version numbers
2012-12-04 10:48:49 +04:00
Dmitry Stogov
9e39a636da
Increased version numbers
2012-12-04 10:48:09 +04:00
Dmitry Stogov
f4263c2d0f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Moved zend_create_execute_data_from_op_array() implementation from zend_vm_execute.skl to zend_execute.c
2012-12-04 10:43:59 +04:00
Dmitry Stogov
61dbf35cfc
Moved zend_create_execute_data_from_op_array() implementation from zend_vm_execute.skl to zend_execute.c
2012-12-04 10:42:19 +04:00
Dmitry Stogov
3f47131fc6
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Optimized access to temporary and compiled VM variables
2012-12-04 10:35:52 +04:00
Dmitry Stogov
7651d64556
Optimized access to temporary and compiled VM variables
2012-12-04 10:14:39 +04:00
Felipe Pena
80004db65d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed ZTS build
2012-11-30 09:07:47 -02:00
Felipe Pena
5db372fbdc
- Fixed ZTS build
2012-11-30 09:07:35 -02:00
Dmitry Stogov
8cbe4f7e17
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63066 (Calling an undefined method in a generator results in a seg fault) (fixed with previous commit).
2012-11-30 14:16:38 +04:00
Dmitry Stogov
66b8ece02a
Fixed bug #63066 (Calling an undefined method in a generator results in a seg fault) (fixed with previous commit).
2012-11-30 14:14:36 +04:00
Dmitry Stogov
3985f06115
Merge branch 'PHP-5.5'
...
* PHP-5.5:
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 14:03:23 +04:00
Dmitry Stogov
70f83f35d0
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more.
...
. Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 13:39:23 +04:00
Dmitry Stogov
8b7df4bbd8
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63635 (Segfault in gc_collect_cycles)
2012-11-29 13:48:44 +04:00
Dmitry Stogov
3c1888f584
Fixed bug #63635 (Segfault in gc_collect_cycles)
2012-11-29 13:06:12 +04:00
Dmitry Stogov
f877d7fee6
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63635 (Segfault in gc_collect_cycles)
Conflicts:
NEWS
2012-11-29 12:38:34 +04:00
Dmitry Stogov
92e2f29381
Fixed bug #63635 (Segfault in gc_collect_cycles)
2012-11-29 12:25:20 +04:00
Nikita Popov
6e1b84a646
Merge branch 'PHP-5.5'
2012-11-24 19:24:40 +01:00
Nikita Popov
60871e51ad
Fix bug #63596 : finally in generators segfaults
...
EX(fast_ret) wasn't initialized in this case so the code ended up
dereferencing an invalid pointer after the jump.
2012-11-24 19:24:09 +01:00
Dmitry Stogov
ffc1f5b2cd
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Improved "finally" im[plementation
2012-11-22 15:39:48 +04:00
Dmitry Stogov
eb4825b50b
Improved "finally" im[plementation
2012-11-22 15:17:05 +04:00
Dmitry Stogov
51abbe5dea
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63468 (wrong called method as callback with inheritance)
Add actual branch version number to UPGRADING
Put the new php.ini directives together.
Move the deprecated functions up to the Deprecated Functionality section so they're more visible.
Conflicts:
UPGRADING
2012-11-20 13:17:21 +04:00
Dmitry Stogov
8f65c76d2e
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63468 (wrong called method as callback with inheritance)
Conflicts:
NEWS
2012-11-20 12:58:16 +04:00
Dmitry Stogov
111aa9fd2e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63468 (wrong called method as callback with inheritance)
Conflicts:
NEWS
2012-11-20 12:54:40 +04:00
Dmitry Stogov
396c1e990a
Fixed bug #63468 (wrong called method as callback with inheritance)
2012-11-20 12:51:55 +04:00
Pierrick Charron
82183b7f62
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Regenerate Zend ini scanner
2012-11-16 18:29:59 -05:00
Pierrick Charron
8c97c79d77
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Regenerate Zend ini scanner
Conflicts:
Zend/zend_ini_scanner.c
Zend/zend_ini_scanner_defs.h
2012-11-16 18:28:04 -05:00
Pierrick Charron
99edb55e41
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Regenerate Zend ini scanner
Conflicts:
Zend/zend_ini_scanner.c
Zend/zend_ini_scanner_defs.h
2012-11-16 18:24:42 -05:00
Pierrick Charron
c886691100
Regenerate Zend ini scanner
...
Regenerate both zend_ini_scanner.c and zend_ini_scanner_defs.h
2012-11-16 18:16:21 -05:00
Pierrick Charron
a4c52f0678
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
2012-11-16 18:09:51 -05:00
Pierrick Charron
30d659144a
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
2012-11-16 18:08:19 -05:00
Pierrick Charron
15ab75be8a
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
2012-11-16 18:07:02 -05:00
Pierrick Charron
6dff07aa8c
Fixed bug #63512 parse_ini_file() with INI_SCANNER_RAW removes quotes from value
...
Restore the old behavior but keep bug 51094 fixed
2012-11-16 18:04:14 -05:00