1
0
mirror of https://github.com/php/php-src.git synced 2026-04-20 06:21:12 +02:00
Commit Graph

4627 Commits

Author SHA1 Message Date
Dmitry Stogov
8203a0668d Merge branch 'master' into rc_debug
* master:
  Use per-request heap instead of system one
  Extend zend_register_class_alias_ex() with additional argument to allow creating persistent or per-request aliases
  Makrk persistent resources and references with GC_PERSISTENT flag
2017-10-27 14:59:09 +03:00
Dmitry Stogov
cf67a421e9 Use per-request heap instead of system one 2017-10-27 14:45:54 +03:00
Dmitry Stogov
49ea143bbd Encapsulate reference-counting primitives.
Prohibit direct update of GC_REFCOUNT(), GC_SET_REFCOUNT(), GC_ADDREF() and GC_DELREF() shoukf be instead.
Added mactros to validate reference-counting (disabled for now).
These macros are going to be used to eliminate race-condintions during reference-counting on data shared between threads.
2017-10-27 01:28:58 +03:00
Peter Kokot
410ae4f596 Remove CHANGES from sapi/cgi
All these changes are noted in the PHP manual instead that have been
removed.
2017-10-19 11:51:09 +01:00
Xinchen Hui
77af496150 Merge branch 'PHP-7.2'
* PHP-7.2:
  Update NEWS
  Update NEWS
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
2017-10-15 10:29:56 +08:00
Xinchen Hui
9f5ed133b3 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Update NEWS
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
2017-10-15 10:29:28 +08:00
Xinchen Hui
49702ad7fb Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
2017-10-15 10:28:46 +08:00
Xinchen Hui
816758eda2 Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function) 2017-10-15 10:28:28 +08:00
Dmitry Stogov
ef5ea48741 Always use IS_CONSTANT_AST (IS_CONSTANT is removed). 2017-10-10 10:11:05 +03:00
Peter Kokot
0646042d1f Remove unused Travis configuration for sapi/phpdbg
The phpdbg sapi has been initially developed under the
github.com/krakjoe/krakjoe/phpdbg repository with its own Travis-CI.org
configuration. Since 2017-03-16 the main development is happening in the main
php-src repository.
2017-10-08 14:44:16 +02:00
Dmitry Stogov
cb9d81ef4f Refactored recursion pretection 2017-10-06 01:34:50 +03:00
Peter Kokot
39ea632f74 Join untracked files to root .gitignore 2017-10-05 12:36:47 +02:00
Nikita Popov
47a86687e8 Merge branch 'PHP-7.2' 2017-10-05 12:26:32 +02:00
Nikita Popov
0e8ccb179d Merge branch 'PHP-7.1' into PHP-7.2 2017-10-05 12:26:19 +02:00
Nikita Popov
d34c8fa802 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-05 12:25:37 +02:00
Mathieu CARBONNEAUX
6b9ccda936 Fixed bug #75311 2017-10-05 12:24:57 +02:00
Dmitry Stogov
e70618aff6 Changed the way VM accesses constant operands in 64-bit builds. 2017-10-04 16:53:01 +03:00
Joe Watkins
17cf32ef45 Merge branch 'PHP-7.2'
* PHP-7.2:
  Typo in status.html
2017-10-03 07:22:26 +01:00
Joe Watkins
6e39258302 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Typo in status.html
2017-10-03 07:22:15 +01:00
Joe Watkins
d0cda9d0bd Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Typo in status.html
2017-10-03 07:22:04 +01:00
Viktor Szépe
e995b7e475 Typo in status.html
feet needs -> fit needs
2017-10-03 07:21:53 +01:00
Joe Watkins
b44c1e4d3a Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix CGI m4 config message when CGI is disabled
2017-09-27 06:21:02 +01:00
Joe Watkins
b0950ff854 Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix CGI m4 config message when CGI is disabled
2017-09-27 06:20:46 +01:00
Joe Watkins
1981c48e60 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix CGI m4 config message when CGI is disabled
2017-09-27 06:20:34 +01:00
Peter Kokot
29e673f8ed Fix CGI m4 config message when CGI is disabled 2017-09-27 06:20:09 +01:00
Joe Watkins
e1d9f33cbc Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix bug #75248 and #75251
2017-09-27 06:16:38 +01:00
Joe Watkins
474ee702ab Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix bug #75248 and #75251
2017-09-27 06:16:13 +01:00
Joe Watkins
af71942da2 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix bug #75248 and #75251
2017-09-27 06:15:47 +01:00
Peter Kokot
6d0391b1a4 Fix bug #75248 and #75251 2017-09-27 06:15:12 +01:00
Peter Kokot
2664638f7e Remove empty and done TODO file for CLI SAPI
[ci skip]
2017-09-24 18:44:46 +02:00
Remi Collet
c26d8ecf58 Merge branch 'PHP-7.2'
* PHP-7.2:
  rename test
2017-09-19 07:27:04 +02:00
Remi Collet
ee84f34344 rename test 2017-09-19 07:26:53 +02:00
Remi Collet
ce59da1997 Merge branch 'PHP-7.2'
* PHP-7.2:
  NEWS
  Fixed Bug #75212 php_value acts like php_admin_value
2017-09-18 18:09:40 +02:00
Remi Collet
cfc6c4d297 Fixed Bug #75212 php_value acts like php_admin_value 2017-09-18 18:08:51 +02:00
Anatol Belski
b81659d34f Merge branch 'PHP-7.2'
* PHP-7.2:
  Fix the version check causing the test fail
2017-09-18 12:07:12 +02:00
Anatol Belski
d8f1afb45e Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
  Fix the version check causing the test fail
2017-09-18 12:06:54 +02:00
Anatol Belski
5c59dd0047 Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  Fix the version check causing the test fail
2017-09-18 12:06:23 +02:00
Anatol Belski
9641586efa Fix the version check causing the test fail 2017-09-18 12:04:31 +02:00
Remi Collet
1edc5aea33 Merge branch 'PHP-7.2'
* PHP-7.2:
  fix tests for 32-bit
2017-09-13 12:20:16 +02:00
Remi Collet
d99cd28925 fix tests for 32-bit 2017-09-13 12:20:05 +02:00
Anatol Belski
8e6619445f Fix test portability 2017-09-06 13:05:56 +02:00
Jansen Price
fafd67cb71 Add tests for sapi/cli option combinations 2017-09-06 09:54:00 +01:00
Nikita Popov
dfe030097d Merge branch 'PHP-7.2' 2017-09-05 18:14:21 +02:00
Nikita Popov
d78a7909c8 Merge branch 'PHP-7.1' into PHP-7.2 2017-09-05 18:14:16 +02:00
Nikita Popov
0b69ce72b8 Merge branch 'PHP-7.0' into PHP-7.1 2017-09-05 18:14:10 +02:00
Nikita Popov
42549b7844 Add missing null termination 2017-09-05 18:13:50 +02:00
Nikita Popov
1ca43597df Merge branch 'PHP-7.2' 2017-09-05 16:25:06 +02:00
Nikita Popov
9fbd8620fb Merge branch 'PHP-7.1' into PHP-7.2 2017-09-05 16:24:40 +02:00
Nikita Popov
e866e05b0d Merge branch 'PHP-7.0' into PHP-7.1 2017-09-05 16:24:21 +02:00
Bouke van der Bijl
cd9d90f4d4 Fixed bug #70470 2017-09-05 16:23:32 +02:00