Dmitry Stogov
52dac3e8cd
Fixed bug #65382 (Segfault in closure_030.phpt)
2013-08-12 10:53:20 +04:00
Michael Wallner
742a0106fe
use $YACC instead of 'bison' as suggested by Yasuo
2013-08-09 08:32:39 +02:00
Michael Wallner
1e30987a53
improve comments and messages as suggested
2013-08-09 08:31:40 +02:00
Michael Wallner
3903c182da
add excluded version exmaple
2013-08-08 21:45:08 +02:00
Michael Wallner
3e41201a6f
make the bison version check a blacklist
...
Let the bison version be checked by a blacklist (where no version
is blacklisted yet) and require at least bison 2.4
2013-08-08 14:27:32 +02:00
Xinchen Hui
9b38673776
Merge branch 'PHP-5.5'
2013-08-06 15:39:46 +08:00
Xinchen Hui
aa042d0c35
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-06 15:39:33 +08:00
Xinchen Hui
a831499b4a
Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
...
Missed a zval_copy_ctor there
2013-08-06 15:37:20 +08:00
Stanislav Malyshev
68e8326e0e
Merge branch 'PHP-5.5'
...
* PHP-5.5:
non living code related typo fixes
2013-08-04 16:07:13 -07:00
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Rasmus Lerdorf
0fce1b4f72
Merge commit '5753b74'
...
* commit '5753b74':
Make sure test.php isn't coming in from the include_path
2013-08-02 11:48:07 -04:00
Rasmus Lerdorf
a85e71e655
Merge commit '5753b74' into PHP-5.5
...
* commit '5753b74':
Make sure test.php isn't coming in from the include_path
2013-08-02 11:47:52 -04:00
Rasmus Lerdorf
5753b74fab
Make sure test.php isn't coming in from the include_path
2013-08-02 11:47:12 -04:00
Xinchen Hui
78673d1bad
Merge branch 'PHP-5.5'
2013-08-02 18:39:58 +08:00
Xinchen Hui
1e942dde24
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-02 18:39:18 +08:00
Xinchen Hui
ce9169e360
Fixed bug Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
2013-08-02 18:37:15 +08:00
Andrey Hristov
92d27ccb05
Constify streams API and a few other calls down the rabbit hole.
...
(`char *` to `const char *` for parameters and few return values)
In a few places int len moved to size_t len.
2013-07-30 12:49:36 +02:00
Johannes Schlüter
004163a914
Merge branch 'PHP-5.5'
2013-07-23 12:42:20 +02:00
Johannes Schlüter
063e10b275
Fix comment
2013-07-23 12:41:24 +02:00
Stanislav Malyshev
4467ada680
Merge branch 'pull-request/326'
...
* pull-request/326:
zend_register_null_constant fixed zend_register_bool_constant usage in macros use REGISTER_MAIN_* in zend_register_standard_constants
zend_API.h included ZVAL_* family in use
use Z_* family macros
zend_register_bool_constant patch
2013-07-21 23:19:33 -07:00
Stanislav Malyshev
02457554a3
Merge branch 'PHP-5.5'
...
* PHP-5.5:
backward compatibility
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:10:31 -07:00
Lajos Veres
97637b2a4c
backward compatibility
2013-07-21 20:09:59 -07:00
Veres Lajos
4749457a49
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:09:53 -07:00
Xinchen Hui
25eb44fcc1
Merge branch 'PHP-5.5'
2013-07-21 16:20:00 +08:00
Xinchen Hui
629965abe2
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-21 16:19:13 +08:00
Arpad Ray
b963249456
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
...
Also fix and test for get_defined_constants(true)
2013-07-20 11:05:13 +01:00
Arpad Ray
a015fa83a7
Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in trait
2013-07-19 19:19:48 +01:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
b79b13b4ef
less serious compatAbility fixes
2013-07-15 00:21:39 -07:00
Veres Lajos
1b06e0be96
typo fixes
2013-07-15 00:19:49 -07:00
Veres Lajos
d17e8ac32f
less serious compatAbility fixes
2013-07-15 00:19:39 -07:00
Veres Lajos
6c4af15d6c
typos (orig)
2013-07-15 00:19:32 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Veres Lajos
b8a2b254a1
typos (orig)
2013-07-15 00:18:32 -07:00
Veres Lajos
227556c6a2
less serious compatAbility fixes
2013-07-15 00:17:35 -07:00
Xinchen Hui
75808151e3
Merge branch 'PHP-5.5'
...
Conflicts:
Zend/zend_vm_execute.h
2013-07-14 12:01:50 +08:00
Xinchen Hui
2c4f823437
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
2013-07-14 11:53:56 +08:00
Xinchen Hui
ebad5178c4
Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace).
2013-07-14 11:47:06 +08:00
Stanislav Malyshev
184dea7033
fix version - not -dev anymore since 5.5.0 release
2013-07-12 17:23:22 -07:00
Ard Biesheuvel
e4192e4cb4
Merge branch 'PHP-5.5'
2013-07-04 10:32:55 +02:00
Ard Biesheuvel
47e21a2c40
Fix assembly of safe_address() for aarch64
2013-07-04 10:25:38 +02:00
Nuno Lopes
c652cc93ec
fix assembly of safe_address() for x86 and x86_64
2013-07-03 17:56:02 -04:00
Nuno Lopes
40cbceaf71
fix assembly of safe_address() for x86 and x86_64
2013-07-03 17:55:18 -04:00
Nuno Lopes
97e9d01dc7
fix assembly of safe_address() for x86 and x86_64
2013-07-03 17:53:46 -04:00
Sebastian Bergmann
9f5fc5c0ee
Sync list of supported bison version with PHP-5.5
2013-07-03 06:52:44 +02:00
Sebastian Bergmann
74d434c091
Merge branch 'PHP-5.3' into PHP-5.4
2013-07-03 06:37:04 +02:00
Sebastian Bergmann
50ac53e1b1
Add bison 2.6.4 to the list of supported versions
2013-07-03 06:36:54 +02:00
Nikita Popov
4d606cf01e
Merge branch 'PHP-5.5'
2013-06-29 21:57:36 +02:00
Nikita Popov
0f36224beb
Don't try to clean up generator stack on unclean shutdown
...
This fixes bugs #65035 and #65161 . In one of the bugs the issue is
that function_state.arguments is NULL, but the arg count is pushed
to the stack and the code tries to free it. In the other bug the
stack of the generator is freed twice, once in generator_close and
later during shutdown.
It's rather hard (if at all possible) to do a proper stack cleanup
on an unclean shutdown, so I'm just disabling it in this case.
2013-06-29 21:51:54 +02:00