Anatol Belski
f361caa5c0
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Remove status check on the SDK repo and add version check
2017-10-30 10:16:39 +01:00
Anatol Belski
bc410c2609
Remove status check on the SDK repo and add version check
...
If Appveyor fails to unzip, .git would be in an arbitrary state anyway.
Thus this check doesn't help. For the version check - rely on the branch
naming scheme in the SDK.
2017-10-30 10:14:05 +01:00
Xinchen Hui
d9de0f8683
Use abbrev
2017-10-30 16:26:59 +08:00
Anatol Belski
26eb6c5bab
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Catch with the latest AppVeyor unzip errors
2017-10-30 08:56:52 +01:00
Anatol Belski
741efa7807
Catch with the latest AppVeyor unzip errors
2017-10-30 08:42:59 +01:00
Dmitry Stogov
230e505fd8
Fixed type inference
2017-10-30 10:41:27 +03:00
Joe Watkins
63c0ecc445
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
2017-10-30 06:55:28 +00:00
Fabien Villepinte
e6aea3dc78
Fix bug #75453 Incorrect reflection on ibase_connect and ibase_pconnect
2017-10-30 06:55:00 +00:00
Anatol Belski
83d51baf83
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Re-enable AppVeyor cache
2017-10-29 10:09:18 +01:00
Anatol Belski
123b1d79eb
Re-enable AppVeyor cache
2017-10-29 10:08:31 +01:00
Joe Watkins
6c90612d13
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
make sure run-tests reports exit status upon prerequisite error
2017-10-29 04:37:55 +00:00
Joe Watkins
59d413ceb8
make sure run-tests reports exit status upon prerequisite error
2017-10-29 04:37:21 +00:00
Nikita Popov
27856f64c3
Merge branch 'PHP-7.0' into PHP-7.1
2017-10-28 12:57:46 +02:00
Fabien Villepinte
938f256ed9
Fix bug #75434 Wrong reflection for mysqli_fetch_all function
2017-10-28 12:57:25 +02: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
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
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
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
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
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
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
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
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
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
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
8ad4de887f
Don't create plist files when using clang analyzer
2017-10-25 18:06:56 +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
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
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
Ferenc Kovacs
9e47f868d3
Merge branch 'PHP-7.0' into PHP-7.1
2017-10-25 03:17:14 +02:00
Ferenc Kovacs
b53fb886a4
use trusty explicitly
2017-10-25 03:14:51 +02:00
Ferenc Kovacs
6125ce9d33
Merge branch 'PHP-5.6' into PHP-7.0
2017-10-25 03:13:40 +02:00
