php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 09:28:21 +02:00
Code Issues Packages Projects Releases Wiki Activity
106,850 Commits 549 Branches 1,485 Tags
165dadace333a454d189f066400a753190198d2e
Commit Graph

106850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitry Stogov 165dadace3 Cleanup 2018-03-01 15:51:50 +03:00
Dmitry Stogov 5994b8ac95 Improve GC color checks 2018-03-01 11:55:26 +03:00
Dmitry Stogov 077d227500 Implemented simple adaptive GC threshold selection. 2018-03-01 11:04:28 +03:00
Dmitry Stogov fd348ec43f GC improvement 2018-03-01 03:17:21 +03:00
Dmitry Stogov 4631a5e2e1 Tunning for new GC_TYPE_INFO layout 2018-02-28 13:25:29 +03:00
Xinchen Hui 6a59f3714a Merge branch 'PHP-7.2' 
* PHP-7.2:
  Update NEWS
  Fixed bug #76025 (Segfault while throwing exception in error_handler).
 2018-02-28 18:07:15 +08:00
Xinchen Hui 07fb188492 Update NEWS 2018-02-28 18:07:05 +08:00
Xinchen Hui 858ebd9285 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed bug #76025 (Segfault while throwing exception in error_handler).
 2018-02-28 18:06:49 +08:00
Xinchen Hui d5c171311d Fixed bug #76025 (Segfault while throwing exception in error_handler). 2018-02-28 18:06:37 +08:00
Dmitry Stogov 31e5c34542 typo 2018-02-28 10:16:51 +03:00
George Wang 1777db1fdf Merge branch 'PHP-7.2' 2018-02-27 23:34:01 -05:00
George Wang 66e3912f3a Merge branch 'PHP-7.1' into PHP-7.2 2018-02-27 23:33:36 -05:00
George Wang d4387fca0a revert last change, for PHP7 no need to do strlen() + 1 for hash look up. 2018-02-27 23:31:43 -05:00
George Wang 17e49ba79a Merge branch 'PHP-7.2' 2018-02-27 23:21:32 -05:00
George Wang 3af5722e11 Merge branch 'PHP-7.1' into PHP-7.2 2018-02-27 23:21:04 -05:00
George Wang 2b033607f3 [BUGFIX] calling php_ini_activate_per_host_config() with correct name length. 2018-02-27 23:18:51 -05:00
Bob Weinand dfa383497a Merge remote-tracking branch 'origin/PHP-7.2' 2018-02-28 02:36:18 +01:00
Bob Weinand 15d611e451 Merge branch 'PHP-7.1' into PHP-7.2 2018-02-28 02:35:44 +01:00
Bob Weinand 3f32bd9f43 Fix pcntl build on mac 
Apparently on mac WIF*(x) macros resolve to (*(int*)&x) (_W_INT macro in sys/wait.h), forcing the value to be a lvalue
 2018-02-28 02:13:28 +01:00
Bob Weinand c1882ef004 Fixed build (extern php_stripslashes) 2018-02-28 01:47:40 +01:00
Dmitry Stogov f1d5168a74 Simplify GC_FLAGS cand CG_INFO checks 2018-02-28 02:36:50 +03:00
Ferenc Kovacs 7c91b83518 Merge branch 'PHP-7.2' 2018-02-28 00:08:14 +01:00
Ferenc Kovacs fe181463a7 Merge branch 'PHP-7.1' into PHP-7.2 2018-02-28 00:05:10 +01:00
Ferenc Kovacs b53e547d85 Merge branch 'PHP-7.0' into PHP-7.1 2018-02-28 00:02:48 +01:00
Ferenc Kovacs c28a6253e5 Merge branch 'PHP-5.6' into PHP-7.0 2018-02-28 00:00:12 +01:00
Ferenc Kovacs 3db7427b71 5.6.35 is next 2018-02-27 23:57:06 +01:00
Dmitry Stogov c9e1419fd2 Change CG_TYPE_INFO() layout to provide more room for GC_INFO() 2018-02-28 00:53:30 +03:00
Dmitry Stogov 6f483dc94c Use macros to update specific parts of GC_TYPE_INFO() (direct assignments to GC_TYPE(), GC_FLAGS() and GC_INFO() are prohibited) 2018-02-28 00:52:12 +03:00
Anatol Belski 42022bc943 Constify readonly var 2018-02-27 20:50:37 +01:00
George Wang 2ec012fa2a Merge branch 'PHP-7.2' 
Conflicts:
	sapi/litespeed/lsapi_main.c
 2018-02-27 13:57:06 -05:00
George Wang 9607d15d7d Merge branch 'PHP-7.1' into PHP-7.2 2018-02-27 13:56:19 -05:00
George Wang 97ff815cbb release LiteSpeed SAPI 7.0. 
add CRIU support.
add support for [PATH=] and [HOST=] sections in php.ini
 2018-02-27 13:54:28 -05:00
Dmitry Stogov baa9890112 Completely hide GC implementation details into zend_gc.c 2018-02-27 21:08:26 +03:00
Christoph M. Becker ef255c9f0f Revert "[ci skip] Add missing return types to protos" 
This reverts commit a2c7c46d5e.

Since apparently there have been some mistakes in this commit, and it's
not clear yet how to solve them, we're reverting for now.
 2018-02-27 17:40:03 +01:00
Dmitry Stogov 58880e3fc1 Get rid of IS_OBJ_USE_GUARDS and IS_OBJ_HAS_GUARDS flags 2018-02-27 17:38:56 +03:00
Anatol Belski 60a27aeec1 Merge branch 'PHP-7.2' 
* PHP-7.2:
  7.0.29 next
 2018-02-27 11:51:40 +01:00
Anatol Belski 1ec4d3698b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  7.0.29 next
 2018-02-27 11:51:10 +01:00
Anatol Belski ea4ba9d008 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  7.0.29 next
 2018-02-27 11:50:22 +01:00
Anatol Belski c61b56ed00 7.0.29 next 2018-02-27 11:48:49 +01:00
Anatol Belski 58aa1f1d61 Merge branch 'PHP-7.2' 
* PHP-7.2:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-02-27 11:40:11 +01:00
Anatol Belski 74bdb8fb15 [ci skip] Update NEWS 2018-02-27 11:39:19 +01:00
Anatol Belski ba8818325e Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-02-27 11:38:23 +01:00
Anatol Belski f6356b435a [ci skip] Update NEWS 2018-02-27 11:37:24 +01:00
Anatol Belski 9e1113dee1 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
 2018-02-27 11:34:13 +01:00
Anatol Belski fed294d2a8 [ci skip] Update NEWS 2018-02-27 11:33:40 +01:00
Anatol Belski 1e0499b095 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  [ci skip] Update NEWS
 2018-02-27 11:32:26 +01:00
Anatol Belski 4698a412bf [ci skip] Update NEWS 2018-02-27 11:31:37 +01:00
Stanislav Malyshev 5913d8cec6 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:27:02 -08:00
Stanislav Malyshev ab9f9b5d3b Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:26:55 -08:00
Stanislav Malyshev a6f7760d57 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75981: prevent reading beyond buffer start
 2018-02-26 22:26:50 -08:00