clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
75,795 Commits 491 Branches 1,363 Tags 846 MiB
5dd41627be
Commit Graph

7696 Commits

Author SHA1 Message Date
Igor Wiedler
5dd41627be Add new 'use function' sequence for importing namespaced functions 
This is specified as the use_function RFC:

* https://wiki.php.net/rfc/use_function
 2013-08-22 15:51:25 +02:00
Nikita Popov
647059abc7 Merge branch 'PHP-5.5' 2013-08-22 11:47:55 +02:00
Nikita Popov
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
Christopher Jones
e212320a0c Remove duplicate calls to set filename & lineno for the DTRACE_FUNCTION_ENTRY/RETURN cases 2013-08-22 11:23:07 +02:00
Nikita Popov
4db494a3ab Merge branch 'PHP-5.5' 2013-08-22 11:01:19 +02:00
Nikita Popov
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
Stanislav Malyshev
ecd67ed3e5 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Fix bug #65470	Segmentation fault in zend_error() with --enable-dtrace
 2013-08-18 17:24:16 -07:00
Stanislav Malyshev
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
Stanislav Malyshev
14f5732096 Fix bug #65470 Segmentation fault in zend_error() with --enable-dtrace 2013-08-18 17:22:25 -07:00
Stanislav Malyshev
42214b6474 Merge branch 'PHP-5.5' 
* PHP-5.5:
  Use in preg_replace_callback() using variables by reference and test for bug #64979
  https://bugs.php.net/bug.php?id=64979
 2013-08-18 15:19:27 -07:00
Marcel Araujo
265224778b Use in preg_replace_callback() using variables by reference and test for bug #64979 2013-08-18 15:18:30 -07:00
Marcel Araujo
47678c06c6 https://bugs.php.net/bug.php?id=64979 2013-08-18 15:09:43 -07:00
Xinchen Hui
7d3ec0c3ca Merge branch 'PHP-5.5' 2013-08-15 11:50:54 +08:00
Xinchen Hui
cb361ed27e Merge branch 'PHP-5.4' into PHP-5.5 2013-08-15 11:49:59 +08:00
Xinchen Hui
8280393828 Fixed #65431 in zend_exception.c by Sixd 2013-08-15 11:47:44 +08:00
Xinchen Hui
b6fa0b40f7 Merge branch 'PHP-5.5' 2013-08-14 11:44:53 +08:00
Xinchen Hui
f3d18add08 Merge branch 'PHP-5.4' into PHP-5.5 2013-08-14 11:44:37 +08:00
Xinchen Hui
f4dc2240a0 Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd 2013-08-14 11:42:39 +08:00
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