clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
105,231 Commits 491 Branches 1,363 Tags 844 MiB
fabb5b7a74
Commit Graph

105231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sara Golemon
fabb5b7a74
array_slice() passthrough for preserve_keys=true as well 2017-10-27 10:14:03 -04:00
Sara Golemon
e751e6ceba
Do not create a new array when slicing all of input array. 2017-10-27 10:09:05 -04:00
Anatol Belski
25da0bd658 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix test compat for PostgreSQL 10
 2017-10-27 15:05:15 +02:00
Anatol Belski
f936a17c12 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix test compat for PostgreSQL 10
 2017-10-27 15:04:54 +02:00
Anatol Belski
36b27f2ba5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test compat for PostgreSQL 10
 2017-10-27 15:04:29 +02:00
Anatol Belski
24b1bb0abd Fix test compat for PostgreSQL 10 2017-10-27 14:58:43 +02:00
Anatol Belski
bf43ab53ae Merge branch 'PHP-7.2' 
* PHP-7.2:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 14:18:55 +02:00
Anatol Belski
40f76c9f0c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 14:18:27 +02:00
Anatol Belski
211dacd7b5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Apply upstream patch for CVE-2017-14107
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 14:17:57 +02:00
Dmitry Stogov
cf67a421e9 Use per-request heap instead of system one 2017-10-27 14:45:54 +03:00
Dmitry Stogov
8e01026b82 Extend zend_register_class_alias_ex() with additional argument to allow creating persistent or per-request aliases 2017-10-27 14:44:21 +03:00
Dmitry Stogov
0136ecb69a Makrk persistent resources and references with GC_PERSISTENT flag 2017-10-27 14:42:06 +03:00
Anatol Belski
10dc1950f7 Apply upstream patch for CVE-2017-14107 2017-10-27 13:20:15 +02:00
Anatol Belski
f0a42d9fe4 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Backport and apply upstream patch for CVE-2017-14107
 2017-10-27 13:18:41 +02:00
Anatol Belski
f6e8ce8121 Backport and apply upstream patch for CVE-2017-14107 2017-10-27 13:16:56 +02:00
Dmitry Stogov
1ab0d820da Reverted constant related change (this should be handled togrther with ohter constant related places) 2017-10-26 22:43:45 +03:00
Anatol Belski
87a6b29477 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Binary SDK 2.0.12 stable
 2017-10-26 21:27:32 +02:00
Anatol Belski
f577a03c04 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Binary SDK 2.0.12 stable
 2017-10-26 21:27:09 +02:00
Anatol Belski
fb1c573a29 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Binary SDK 2.0.12 stable
 2017-10-26 21:26:03 +02:00
Anatol Belski
9eb6f86765 Binary SDK 2.0.12 stable 2017-10-26 21:25:08 +02:00
Dmitry Stogov
aeca761856 Removed useless reallocations 2017-10-26 19:13:53 +03:00
Dmitry Stogov
0366684ce3 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed indirect modification of magic ArrayAccess method arguments
 2017-10-26 16:17:49 +03:00
Dmitry Stogov
1d846fdfb2 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed indirect modification of magic ArrayAccess method arguments
 2017-10-26 16:07:49 +03:00
Dmitry Stogov
503df277ab Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed indirect modification of magic ArrayAccess method arguments
 2017-10-26 16:04:20 +03:00
Dmitry Stogov
98eee90734 Fixed indirect modification of magic ArrayAccess method arguments 2017-10-26 16:03:42 +03:00
Dmitry Stogov
e95301b785 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Backport tests
 2017-10-26 14:12:58 +03:00
Dmitry Stogov
25d988e91a Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Backport tests
 2017-10-26 14:12:45 +03:00
Dmitry Stogov
d3146889ab Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Backport tests
 2017-10-26 14:12:33 +03:00
Dmitry Stogov
502cfddf28 Backport tests 2017-10-26 14:12:08 +03:00
Dmitry Stogov
0772b32ef6 Restore object copying on magic method calls (It was removed in master only). 2017-10-26 14:04:42 +03:00
Dmitry Stogov
b09e398304 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed indirect modification of magic method arguments.
 2017-10-26 13:35:39 +03:00
Dmitry Stogov
e3997b2c82 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed indirect modification of magic method arguments.
 2017-10-26 13:12:52 +03:00
Dmitry Stogov
177cdcf313 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed indirect modification of magic method arguments.
 2017-10-26 13:11:59 +03:00
Dmitry Stogov
bc59289b7a Fixed indirect modification of magic method arguments. 2017-10-26 13:05:23 +03:00
Dmitry Stogov
886d4d9ca1 Avoid reallocations when concatenate with empty string 2017-10-26 09:45:02 +03:00
Xinchen Hui
d00c2279af Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fixed test
 2017-10-26 10:24:06 +08:00
Xinchen Hui
887ae8a380 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fixed test
 2017-10-26 10:24:00 +08:00
Xinchen Hui
6b637ac589 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed test
 2017-10-26 10:23:52 +08:00
Xinchen Hui
eaeccc1d99 Fixed test 2017-10-26 10:23:43 +08:00
Xinchen Hui
5cb5b27c40 Merge branch 'PHP-7.2' 
* PHP-7.2:
  Update NEWS
  Update NEWS
  Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)

Conflicts:
	Zend/zend_object_handlers.c
 2017-10-26 10:16:55 +08:00
Xinchen Hui
ed02dce2a4 Update NEWS 2017-10-26 10:11:13 +08:00
Xinchen Hui
11a4b57e61 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Update NEWS
  Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)
 2017-10-26 10:09:57 +08:00
Xinchen Hui
7d3c057bd1 Update NEWS 2017-10-26 10:09:41 +08:00
Xinchen Hui
3c4c9a23bc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS)

Conflicts:
	Zend/zend_object_handlers.c
 2017-10-26 10:08:39 +08:00
Xinchen Hui
d2047503cb Fixed bug #75420 (Crash when modifing property name in __isset for BP_VAR_IS) 2017-10-26 10:07:08 +08:00
Dmitry Stogov
a05639a5e6 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Fix typo in comments
  Fix typo in comments
 2017-10-26 00:26:38 +03:00
Dmitry Stogov
da1f8097fa Zend MM related tunning. 2017-10-26 00:25:31 +03:00
Joe Watkins
c2456718ca
Merge branch 'PHP-7.2' 
* PHP-7.2:
  Fix typo in comments
 2017-10-25 21:00:13 +01:00
Joe Watkins
25a3ebdc73
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix typo in comments
 2017-10-25 21:00:03 +01:00
Joe Watkins
5e9f7f619e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix typo in comments
 2017-10-25 20:59:51 +01:00