2d14cc2a49
Use zval* instead of zval**
2013-10-28 14:44:07 +04:00
91b8a6752e
Improved performance of func_get_args() by eliminating useless copying
2013-10-28 13:17:55 +04:00
30d64b0efb
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-19 13:27:36 +08:00
1fe1f7305b
use $YACC instead of 'bison' as suggested by Yasuo
...
Conflicts:
Zend/acinclude.m4
2013-10-19 13:27:24 +08:00
865f221627
Merge branch 'PHP-5.4' into PHP-5.5
2013-10-16 18:37:49 +02:00
4c0bb6d76e
Fixed bug #65911 ($this not usable as static property)
...
In context of static accesses like classname::$this, the string
"$this" should not be handled like a $this variable, but as an
identifier for a static variable.
2013-10-16 18:33:14 +02:00
536260f2c5
Fix bug #65821 : By-ref foreach on property access of string offset segfaults
...
This removes the now unnecessary ZEND_FETCH_ADD_LOCK on the
container of a property fetch of a by-reference foreach.
2013-10-04 13:13:46 +02:00
6b68f44e6b
Fix bug #64979 : Wrong behavior of static variables in closure generators
2013-09-29 20:18:12 +02:00
1d1fb69c8b
Merge branch 'PHP-5.4' into PHP-5.5
2013-09-29 18:01:18 +02:00
f0c926564c
Fix bug #65322 : compile time errors won't trigger auto loading
...
Also fixes duplicate bugs #54054 and #42098 .
Furthermore this fixes incorrect error messages thrown from code
running inside an error handler when a compilation is in progress.
The error file and line are now correctly associated with the
file/line of the executor, rather than the compiler.
2013-09-29 17:58:25 +02:00
f7eff9cd41
Make message and format arguments const char * to avoid
...
build warning about invalid cast.
2013-09-23 13:21:57 +02:00
b2ee1b629e
Merge branch 'PHP-5.4' into PHP-5.5
2013-09-02 16:16:07 +08:00
6c48c6bc78
Typo....
2013-09-02 16:15:52 +08:00
dd1cbd140b
Merge branch 'PHP-5.4' into PHP-5.5
2013-09-02 16:02:59 +08:00
ed038d2ee3
Add a XFAIL test for #64896
2013-09-02 16:02:24 +08:00
e4fe53e200
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-30 11:20:46 +08:00
7da6498342
Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)
2013-08-30 11:20:24 +08:00
0f3977bc0f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
Conflicts:
NEWS
2013-08-29 11:19:02 +04:00
dfc6feb6e8
Fixed bug #61759 (class_alias() should accept classes with leading backslashes). (Julien)
2013-08-29 11:16:56 +04:00
e356d790cc
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-29 14:02:34 +08:00
747daa5354
Avoid compiler warning
2013-08-29 14:02:15 +08:00
f0cb67402f
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-29 14:01:54 +08:00
72027cd084
Fix bug #65579 (Using traits with get_class_methods causes segfault).
...
Specifically, this checks if there are trait aliases defined in the class scope
before attempting to dereference the first trait alias. This handles the case
where a trait alias was used in a child trait but no aliases exist in the
concrete class.
2013-08-28 20:33:42 -07:00
0119bbba6b
Fixed compiler warnings
...
warning: 'local_dval' may be used uninitialized in this function
[-Wmaybe-uninitialized]
warning: 'dval2' may be used uninitialized in this function
[-Wmaybe-uninitialized]
2013-08-27 15:44:30 +08:00
716fc80fda
Suppress static analyzer warnings in specialized executor
...
As things like if(0) will be removed by the compiler, no need
to see that tons of warnings with static analyzer enabled.
2013-08-23 17:41:07 +02:00
686402a865
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-23 13:28:59 +02:00
5ab6d215fc
Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases
2013-08-23 13:27:42 +02:00
592677d810
Fix intl build
...
Turns out that you can't use implicit void pointer casts if intl
is compiled.
2013-08-22 11:46:51 +02:00
fc16b92313
Fix bug #46311 : Pointer aliasing issue results in miscompile on gcc4.4
...
The code violated the strict aliasing restriction, because it
dereferenced the same pointer as zval** once and as void**
afterwards. Now both occurances dereference void** and cast to
zval* in the former case.
2013-08-22 10:56:50 +02:00
a4862503d4
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
2013-08-19 11:18:51 -07:00
bcf785fb66
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
2013-08-18 17:23:59 -07:00
14f5732096
Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace
2013-08-18 17:22:25 -07:00
265224778b
Use in preg_replace_callback() using variables by reference and test for bug #64979
2013-08-18 15:18:30 -07:00
47678c06c6
https://bugs.php.net/bug.php?id=64979
2013-08-18 15:09:43 -07:00
cb361ed27e
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-15 11:49:59 +08:00
8280393828
Fixed #65431 in zend_exception.c by Sixd
2013-08-15 11:47:44 +08:00
f3d18add08
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-14 11:44:37 +08:00
f4dc2240a0
Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
2013-08-14 11:42:39 +08:00
aa042d0c35
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-06 15:39:33 +08:00
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
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
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
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
5753b74fab
Make sure test.php isn't coming in from the include_path
2013-08-02 11:47:12 -04:00
1e942dde24
Merge branch 'PHP-5.4' into PHP-5.5
2013-08-02 18:39:18 +08:00
ce9169e360
Fixed bug Bug #65372 (Segfault in gc_zval_possible_root when return reference fails)
2013-08-02 18:37:15 +08:00
063e10b275
Fix comment
2013-07-23 12:41:24 +02:00
97637b2a4c
backward compatibility
2013-07-21 20:09:59 -07:00
4749457a49
HASH_KEY_NON_EXISTANT fix
2013-07-21 20:09:53 -07:00
629965abe2
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-21 16:19:13 +08:00
Dmitry Stogov