clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
104,404 Commits 491 Branches 1,363 Tags 839 MiB
cc96166f74
Commit Graph

104404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sara Golemon
cc96166f74
Don't optimize input arrays with suffix holes 2017-10-27 13:07:33 -04:00
Joe Watkins
f2367d4626
Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75307 Wrong reflection for openssl_open function
 2017-10-27 16:06:57 +01:00
Joe Watkins
14be7dcf8e
Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75307 Wrong reflection for openssl_open function
 2017-10-27 16:06:29 +01:00
Fabien Villepinte
51ea2cfbe1
Fix bug #75307 Wrong reflection for openssl_open function 2017-10-27 16:06:01 +01:00
Anatol Belski
cbf385e68c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Skip test on PostgreSQL 10
 2017-10-27 16:23:50 +02:00
Anatol Belski
005205714b Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Skip test on PostgreSQL 10
 2017-10-27 16:23:19 +02:00
Anatol Belski
15a71fe045 Skip test on PostgreSQL 10 
The 42P18 error is not produced by the server anymore.
 2017-10-27 16:19:42 +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
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
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
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
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
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
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
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
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
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
Fabien Villepinte
578ba71b3b
Fix typo in comments 2017-10-25 20:59:40 +01:00
Anatol Belski
777e189445 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Don't create plist files when using clang analyzer
 2017-10-25 18:11:40 +02:00
Anatol Belski
8ad4de887f Don't create plist files when using clang analyzer 2017-10-25 18:06:56 +02:00
Christoph M. Becker
a059244b3c Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt
 2017-10-25 14:53:01 +02:00
Christoph M. Becker
b6b0289f5e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt
 2017-10-25 14:47:11 +02:00
Fabien Villepinte
e763a1cdc7 Fix the SKIPIF part in /ext/gd/tests/bug75437.phpt 2017-10-25 14:39:38 +02:00
Christoph M. Becker
c78813a6b8 Merge branch 'PHP-7.1' into PHP-7.2 
* PHP-7.1:
  Fix bug #75437 Wrong reflection on imagewebp
 2017-10-25 13:03:42 +02:00
Christoph M. Becker
9d59beb8ba Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #75437 Wrong reflection on imagewebp
 2017-10-25 12:56:25 +02:00
Fabien Villepinte
0fbb9f343f Fix bug #75437 Wrong reflection on imagewebp 2017-10-25 12:54:05 +02:00
Ferenc Kovacs
58ccfb051b Merge branch 'PHP-7.1' into PHP-7.2 2017-10-25 03:42:55 +02:00
Ferenc Kovacs
298db6fc92 Merge branch 'PHP-7.0' into PHP-7.1 2017-10-25 03:40:49 +02:00
Ferenc Kovacs
9fbf13a496 Merge branch 'PHP-5.6' into PHP-7.0 2017-10-25 03:39:34 +02:00
Ferenc Kovacs
f600785f65 5.6.33 is next 2017-10-25 03:36:30 +02:00