9fcee1e656
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-19 11:49:07 +02:00
4df85466b6
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-19 11:47:42 +02:00
ad76e8a529
Fix dba configuration for Windows
...
To be able to build the dba extension on Windows, libdb was required. This
is contrary to *nix where each handler can be configured individually. To
avoid BC breaks, we only do minimal modifications, instead of adjusting the
Windows configuration to match the *nix configuration, for now.
2016-08-19 11:42:16 +02:00
0880bd1bb6
Update NEWS for 7.1.0RC1
2016-08-19 06:51:53 +00:00
566d65d222
Fixed bug #72888 (Segfault on clone on splFileObject)
2016-08-19 11:28:36 +08:00
0b1c8178ab
Sync NEWS
2016-08-19 09:00:34 +10:00
37b0dcc8e0
Decouple DEBUG_FILE_UPLOAD from ZEND_DEBUG
...
Enabling ZEND_DEBUG should not result in intrusive program
behavior changes.
2016-08-19 00:34:13 +02:00
cf40f999ba
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-18 18:03:15 +02:00
caf0ad403d
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-18 17:56:16 +02:00
bc1214f25e
Fix broken test include
...
To avoid that the test stalls, we must always use `t` mode.
2016-08-18 17:53:57 +02:00
2a1d35ec6c
update NEWS
2016-08-18 17:53:08 +02:00
b4b8d0887a
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
update NEWS
2016-08-18 17:51:18 +02:00
e6d3221766
update NEWS
2016-08-18 17:50:17 +02:00
74cfb2284e
fix format
2016-08-18 16:29:46 +02:00
2f430a4b6c
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
avoid other efforts if memory mapping fails
2016-08-18 16:01:23 +02:00
98d8794eae
avoid other efforts if memory mapping fails
2016-08-18 15:58:33 +02:00
5818b09a45
Updated UPGRADING about function call args
2016-08-18 15:46:02 +02:00
ecdd24f0fc
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix test
2016-08-18 15:36:07 +02:00
91cd55e32a
fix test
2016-08-18 15:35:26 +02:00
20aae1caa3
map ell the err code
2016-08-18 15:28:15 +02:00
b81a073b85
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #72858 shm_attach null dereference
2016-08-18 14:40:20 +02:00
67f8c14c29
Fixed bug #72858 shm_attach null dereference
2016-08-18 14:15:10 +02:00
a2ee13b5ea
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-18 13:04:43 +02:00
7ecd4bb0a4
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-18 13:03:14 +02:00
761d2f629b
fix NEWS
2016-08-18 13:01:53 +02:00
1eb4851fa2
Remove leftover of previous change
2016-08-18 15:44:33 +08:00
66a527b8c1
Fixed segfault introduced in 447e57a1e1
2016-08-18 15:37:39 +08:00
a3740dadec
Remove outdate checks
2016-08-18 15:37:15 +08:00
1685282a15
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-18 15:47:47 +10:00
127b42f9b3
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-18 15:47:36 +10:00
f2d5305097
Add myself as PDO_OCI maintainer
2016-08-18 15:47:25 +10:00
cb34882e61
Prepare for OCI8 PECL release
2016-08-18 13:58:24 +10:00
fe3e330c2e
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-18 13:52:56 +10:00
7ed2602af8
Prepare for OCI8 PECL release
2016-08-18 13:52:50 +10:00
b12ac316eb
Prepare for OCI8 PECL release
2016-08-18 13:50:36 +10:00
2103e9f21f
fix test
...
The improvements to the base64 functionality allows now to loosen
strictness. Strict mode still can be activated later, if there are
any issues.
2016-08-18 00:18:26 +02:00
fc1b69888e
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
sync NEWS
2016-08-18 00:16:50 +02:00
52787e902f
sync NEWS
2016-08-18 00:15:54 +02:00
38f2c6262f
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-17 22:13:57 +02:00
9fa0009702
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-17 22:12:01 +02:00
54293d21cb
Skip tests that are supposed to fail due to bugs in old external libgd
2016-08-17 21:36:26 +02:00
d85fd07923
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
2016-08-17 20:27:46 +02:00
447e57a1e1
Fixed 7.1 build, decls first please!
2016-08-17 20:26:32 +02:00
09898f91a3
Make this test also a little more resilient
...
See <http://git.php.net/?p=php-src.git;a=commit;h=a3159d29bb24d5c946c14b7aa33e96bebcd56e59 >.
2016-08-17 19:09:31 +02:00
7f47dcf31b
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-17 18:25:45 +02:00
1bc9ea4f10
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-17 18:13:41 +02:00
a3159d29bb
Make tests a little more resilient
...
PNG allows identical images to be stored differently what makes nearly all
tests checking the MD5 hash of the PNG representation fail with external
libgd. For now, we use the GD format instead, which doesn't allow for such
differences.
Of course, this md5() checking should be replaced by a image diffing feature
in the long run.
2016-08-17 17:59:33 +02:00
1e4cae28b2
Seems like I did a bad merge earlier, this should make PHP-7.0 sync with 7.1/master properly now
2016-08-17 16:34:22 +02:00
27ceb6ffb5
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix build as done in master in commit 040331c364
2016-08-17 14:15:09 +02:00
9b783107e5
Fix build as done in master in commit 040331c364
...
The reason why we cannot use round() here, is that it does not come with the standard C library on Windows, I don't think this affects other systems.
At the same time, also expose _php_math_round()
2016-08-17 14:10:24 +02:00
Christoph M. Becker