summaryrefslogtreecommitdiff
path: root/Zend
Commit message (Collapse)AuthorAgeFilesLines
* use $YACC instead of 'bison' as suggested by YasuoMichael Wallner2013-10-191-1/+1
| | | | | Conflicts: Zend/acinclude.m4
* Fixed bug #65911 ($this not usable as static property)bwoebi2013-10-162-0/+21
| | | | | | 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.
* Fix bug #65322: compile time errors won't trigger auto loadingNikita Popov2013-09-293-1/+43
| | | | | | | | | 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.
* Typo....Xinchen Hui2013-09-021-1/+1
|
* Add a XFAIL test for #64896Xinchen Hui2013-09-021-0/+47
|
* Fixed bug #60598 (cli/apache sapi segfault on objects manipulation)Xinchen Hui2013-08-302-0/+35
|
* Fixed bug #61759 (class_alias() should accept classes with leading ↵Dmitry Stogov2013-08-292-9/+7
| | | | backslashes). (Julien)
* Avoid compiler warningXinchen Hui2013-08-291-1/+1
|
* Fix bug #65579 (Using traits with get_class_methods causes segfault).Adam Harvey2013-08-282-8/+38
| | | | | | | 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.
* Remove duplicate calls to set filename & lineno for the ↵Christopher Jones2013-08-231-2/+0
| | | | DTRACE_FUNCTION_ENTRY/RETURN cases
* Fixed bug #64503 (Compilation fails with error: conflicting types for ↵Xinchen Hui2013-08-191-5/+7
| | | | 'zendparse').
* Fix bug #65470 Segmentation fault in zend_error() with --enable-dtraceStanislav Malyshev2013-08-181-2/+4
|
* Fixed #65431 in zend_exception.c by SixdXinchen Hui2013-08-151-3/+3
|
* Fixed #65431 (Discarded qualifiers from pointer target warnings when using ↵Xinchen Hui2013-08-144-14/+14
| | | | --enable-dtrace) by Sixd
* Re-fix Bug #65372 (Segfault in gc_zval_possible_root when return reference ↵Xinchen Hui2013-08-062-0/+5
| | | | | | fails) Missed a zval_copy_ctor there
* non living code related typo fixesVeres Lajos2013-08-046-8/+8
|
* Make sure test.php isn't coming in from the include_pathRasmus Lerdorf2013-08-021-10/+10
|
* Fixed bug Bug #65372 (Segfault in gc_zval_possible_root when return ↵Xinchen Hui2013-08-023-15/+65
| | | | reference fails)
* Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in traitArpad Ray2013-07-202-2/+8
| | | | Also fix and test for get_defined_constants(true)
* Fixed bug #65291 - get_defined_constants() crash with __CLASS__ in traitArpad Ray2013-07-192-0/+29
|
* typo fixesVeres Lajos2013-07-154-4/+4
|
* less serious compatAbility fixesVeres Lajos2013-07-151-2/+2
|
* Fixed bug #65254 (Exception not catchable when exception thrown in autoload ↵Xinchen Hui2013-07-143-81/+166
| | | | with a namespace).
* fix assembly of safe_address() for x86 and x86_64Nuno Lopes2013-07-031-2/+2
|
* Merge branch 'PHP-5.3' into PHP-5.4Sebastian Bergmann2013-07-031-1/+1
|\
| * Add bison 2.6.4 to the list of supported versionsSebastian Bergmann2013-07-031-1/+1
| |
* | Fixed bug (is_callable() triggers Fatal Error)Xinchen Hui2013-06-242-2/+29
| | | | | | | | | | This bug is also exists in 5.4, and previous fix by dsp is not complete for __callStatic stituation, see test script
* | Fix non-specialized executor buildArd Biesheuvel2013-06-211-2/+0
| | | | | | | | | | Removed a couple of calls to FREE_OP2() that were left behind in the handlers for break and continue opcodes after commit 7628da98
* | Fix bug #64936 - clean doc comment state at the beginning and end of the scanStanislav Malyshev2013-06-163-342/+348
| |
* | Merge branch 'pull-request/341'Stanislav Malyshev2013-06-109-10/+10
| | | | | | | | | | * pull-request/341: (23 commits) typofixes
* | typo fixes (argument)Veres Lajos2013-06-101-2/+2
| |
* | Fixed bug #64988 (Class loading order affects E_STRICT warning)Xinchen Hui2013-06-102-2/+32
| |
* | Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4Dmitry Stogov2013-06-101-2/+2
|\ \ | | | | | | | | | | | | | | | * 'PHP-5.4' of git.php.net:php-src: PHPTests for the DOMDocument::loadHTMLfile method. They cover - The basic behaviour - When the method receives as argument a file which doesn't exist - When the argument is an empty string - When an empty file is loaded - When a not-well formed html file is loaded Fix spelling and correct typo.
| * | Fix spelling and correct typo.Carson McDonald2013-06-101-2/+2
| | |
* | | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-06-101-1/+1
|\ \ \ | |/ / |/| / | |/ | | * PHP-5.3: Fixed test script
| * Fixed test scriptDmitry Stogov2013-06-101-1/+1
| |
* | Fixed merge wronglyXinchen Hui2013-06-092-2/+2
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-06-093-0/+34
|\ \ | |/
| * Fixed bug #64966 (segfault in zend_do_fcall_common_helper_SPEC)Xinchen Hui2013-06-093-0/+34
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Xinchen Hui2013-06-052-4/+42
|\ \ | |/
| * Fixed bug #64960 (Segfault in gc_zval_possible_root)Xinchen Hui2013-06-052-4/+42
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Dmitry Stogov2013-05-291-1/+1
|\ \ | |/ | | | | | | | | | | | | * PHP-5.3: Fixed incorrect argument number Conflicts: Zend/zend_compile.c
| * Fixed incorrect argument numberDmitry Stogov2013-05-291-1/+1
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Sara Golemon2013-05-191-1/+1
|\ \ | |/ | | | | | | * PHP-5.3: Don't double-quote name of namespaced function.
| * Don't double-quote name of namespaced function.Sara Golemon2013-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | ZEND_NS_NAMED_FE(ns, zend_name, name, arg_info) was resulting in a function declaration of: ns\"zend_name"() including the errant quotes. This diff corrects that. There are currently no uses of ZEND_NS_NAMED_FE in core and reason to believe that there are no uses in the wild either.
* | Fixed bug #64720 (SegFault on zend_deactivate)Dmitry Stogov2013-05-213-1/+58
| |
* | fix bug #64660 - yyparse can return 2, not only 1Stanislav Malyshev2013-05-203-5/+16
| |
* | Merge branch 'PHP-5.3' into PHP-5.4Anatol Belski2013-05-124-1/+70
|\ \ | |/ | | | | | | * PHP-5.3: Fixed bug #64821 Custom Exceptions crash when internal properties overridden
| * Fixed bug #64821 Custom Exceptions crash when internal properties overriddenAnatol Belski2013-05-124-1/+70
| | | | | | | | | | | | If user inherits Exception and overrides the properties to arbitrary data types, or simply doesn't run parent::__construct(), here we go. Just convert everything to the appropriate data type, like Exception::__toString() does.
* | Fix bug #64729: compilation failure on x32Gustavo Lopes2013-04-302-6/+16
| |