Commit Graph

81476 Commits

Author SHA1 Message Date
Dmitry Stogov
15ba03fc80 Avoid repeatable zend_is_autogolobal() calls 2014-06-10 00:16:18 +04:00
Dmitry Stogov
7c045c61f0 Optimized for fast path 2014-06-10 00:15:44 +04:00
Dmitry Stogov
9a9bb8877e Improved ZTS support 2014-06-09 21:29:20 +04:00
Dmitry Stogov
371345bed6 Avoid reallocation 2014-06-09 17:36:37 +04:00
Dmitry Stogov
2d29f2d8d9 Comparison optimization 2014-06-09 17:00:22 +04:00
Dmitry Stogov
dbaef7c038 Avoid unnecessary memory allocation/deallocations and pcre calls 2014-06-09 15:42:32 +04:00
Dmitry Stogov
7bf4fa69be Avoid extra function call on hot path 2014-06-09 15:41:29 +04:00
Matteo Beccati
8cfdf20ccf Fixed DOM tests when using libxml2 versions patched against CVE-2014-0191
DOMDocument::substituteEntities needs to be set to true in order for
external entities to be parsed.
2014-06-09 07:08:04 +02:00
Dmitry Stogov
dd0e96cca3 Bundle pcre-8.35 with sljit support 2014-06-06 18:46:19 +04:00
Dmitry Stogov
e499c3d259 Introduced new BIND_GLOBAL instraction instead of FETCH_W+ASSIGN_REF pair that caused a lot of useles checks 2014-06-06 15:04:30 +04:00
Dmitry Stogov
e4581fd6b8 GC doesn't count scalars and immutable arrays in the same way 2014-06-05 21:05:07 +04:00
Dmitry Stogov
1593d942e7 Fixed compilation warnings 2014-06-05 20:58:21 +04:00
Dmitry Stogov
717839735f Merge branch 'master' into phpng
* master: (29 commits)
  drop exec perm on doc files
  fix test for 5.4/5.5
  restore correct behavior of DateTime
  fix test use invalid code
  add test for previous fix
  NEWS
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
  update news
  update NEWS
  Fix tests
  Fix possible segfault depending on memory location...
  Fixed startup segfault in non-debug builds Fixes issue #87
  PHP 5.4/5.5 compability in phpdbg_watch.c
  fix gcov data with some locales (again)
  fix gcov data with some locales (again)
  fix gcov data with some locales (again)
  Update NEWS
  Fixed startup segfault in non-debug builds Fixes issue #87
  ...
2014-06-05 20:54:50 +04:00
Remi Collet
e16097626a Merge branch 'PHP-5.6'
* PHP-5.6:
  drop exec perm on doc files
2014-06-05 17:46:21 +02:00
Remi Collet
6a5d5d1db4 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  drop exec perm on doc files
2014-06-05 17:45:59 +02:00
Remi Collet
e31b51f9a0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  drop exec perm on doc files
2014-06-05 17:45:41 +02:00
Remi Collet
56c9e22c1f drop exec perm on doc files 2014-06-05 17:45:22 +02:00
Remi Collet
ce3eae4c36 fix test for 5.4/5.5 2014-06-05 17:36:20 +02:00
Remi Collet
b16950b5d3 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix test for 5.4/5.5
2014-06-05 17:34:32 +02:00
Remi Collet
67f1a58ac9 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix test for 5.4/5.5
2014-06-05 17:34:09 +02:00
Remi Collet
127651e9ae fix test for 5.4/5.5 2014-06-05 17:33:40 +02:00
Dmitry Stogov
1b8916886b Speedup string equality check 2014-06-05 19:14:47 +04:00
Dmitry Stogov
730beec16e Simplify code 2014-06-05 18:42:17 +04:00
Remi Collet
f11f7f5601 restore correct behavior of DateTime 2014-06-05 14:04:44 +02:00
Dmitry Stogov
c1965f58d4 Use reference counting instead of zval duplication 2014-06-05 16:04:11 +04:00
Remi Collet
f1ef7018f0 fix test use invalid code 2014-06-05 14:01:20 +02:00
Remi Collet
aafbf93841 Merge branch 'PHP-5.6'
* PHP-5.6:
  add test for previous fix
2014-06-05 14:00:40 +02:00
Remi Collet
218df7e058 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  add test for previous fix
2014-06-05 14:00:29 +02:00
Remi Collet
ab848ea400 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  add test for previous fix
2014-06-05 14:00:15 +02:00
Remi Collet
15d8c80ead add test for previous fix 2014-06-05 14:00:00 +02:00
Remi Collet
2890284096 Merge branch 'PHP-5.6'
* PHP-5.6:
  NEWS
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
2014-06-05 13:47:14 +02:00
Remi Collet
ce22c03a72 NEWS 2014-06-05 13:46:55 +02:00
Remi Collet
2b3f4cc29e Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
2014-06-05 13:46:41 +02:00
Remi Collet
c61c24ad79 NEWS 2014-06-05 13:46:13 +02:00
Remi Collet
9ea9064779 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  NEWS
  Fix regression introduce in fix for bug #67118
2014-06-05 13:45:57 +02:00
Remi Collet
3f47368738 NEWS 2014-06-05 13:45:25 +02:00
Remi Collet
1fe9f1e4f5 Fix regression introduce in fix for bug #67118
The fix was correct but break some code (at least in Horde)
This is a temporary workaround to fix regressioni in 5.4, 5.5 and 5.6

This make php_date_initialize more consistent
- on success return 1 + time initiliazed
- on failure return 0 + time = zero
  which is check by DATE_CHECK_INITIALIZED by later method call

Will restore consistency with other date classes in master.
2014-06-05 13:39:46 +02:00
Stanislav Malyshev
e8e907279e Merge branch 'PHP-5.6'
* PHP-5.6:
  update news
  update NEWS
  fix gcov data with some locales (again)
2014-06-04 01:11:40 -07:00
Stanislav Malyshev
3d969932bf Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  update news
  update NEWS
  fix gcov data with some locales (again)
2014-06-04 01:11:07 -07:00
Stanislav Malyshev
4b4a5bc1d3 update news 2014-06-04 01:10:45 -07:00
Stanislav Malyshev
846e076492 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  update NEWS
2014-06-04 01:10:12 -07:00
Stanislav Malyshev
e06c4f7fe5 update NEWS 2014-06-04 01:09:37 -07:00
Dmitry Stogov
3d87391cc0 Reference counters in PHPNG may have different values 2014-06-04 09:57:17 +04:00
Bob Weinand
1e85b9e86b Merge branch 'PHP-5.6'
Conflicts:
	sapi/phpdbg/phpdbg.c
2014-06-04 02:20:35 +02:00
Bob Weinand
848df6fcbe Merge sapi/phpdbg into PHP-5.6 2014-06-04 02:18:39 +02:00
Bob Weinand
7b9367971d Fix tests 2014-06-04 02:15:50 +02:00
Bob Weinand
79519f7e30 Fix possible segfault depending on memory location... 2014-06-04 02:15:34 +02:00
Dmitry Stogov
6e7338700e Avoid useless merge 2014-06-04 02:11:26 +04:00
Bob Weinand
a1b0ae4247 Fixed startup segfault in non-debug builds
Fixes issue #87
2014-06-03 21:24:55 +00:00
Bob Weinand
241211975e PHP 5.4/5.5 compability in phpdbg_watch.c 2014-06-03 21:24:45 +00:00