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
8a1fbdda43
Fixed C89 build
2016-08-17 13:43:50 +02:00
f7231acadf
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix char * vs zend_string *
2016-08-17 13:23:31 +02:00
06c0540b90
fix char * vs zend_string *
2016-08-17 13:22:02 +02:00
f7d4733b2e
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-17 12:49:00 +02:00
356b586ec1
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-17 12:47:06 +02:00
48198e4c25
Fix #68302 : impossible to compile php with zip support
...
We should not let configure succeed, if SIZEOF_OFF_T == 0, just to let the
compilation fail later. Instead we bail out early, giving a hint regarding
the potential issue, namely misconfigured libraries.
2016-08-17 12:43:29 +02:00
526e6bf818
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix tests
2016-08-17 12:41:38 +02:00
05c8a0771d
fix tests
...
The 70436 test is just a bonus for the hardening in 72633.
2016-08-17 12:39:35 +02:00
0fd0328933
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Avoid duplicating string
2016-08-17 18:19:59 +08:00
195d7618e7
Avoid duplicating string
2016-08-17 18:19:14 +08:00
afa832b5a6
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Revert "fix tests"
2016-08-17 12:07:39 +02:00
7d4c5a0dc9
Revert "fix tests"
...
This reverts commit a47df5be19
2016-08-17 12:04:03 +02:00
60f1ec1c32
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
fix leak
2016-08-17 11:53:00 +02:00
a5d00fc908
fix leak
2016-08-17 11:51:56 +02:00
30e751fe5b
Update NEWs
2016-08-17 17:14:53 +08:00
ce6ad9bdd9
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0: (48 commits)
Update NEWs
Unused label
Fixed bug #72853 (stream_set_blocking doesn't work)
fix test
Bug #72663 - part 3
Bug #72663 - part 2
Bug #72663 - part 1
Update NEWS
BLock test with memory leak
fix tests
Fix TSRM build
Fix bug #72850 - integer overflow in uuencode
Fixed bug #72849 - integer overflow in urlencode
Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption
Fix bug #72838 - Integer overflow lead to heap corruption in sql_regcase
Fix bug #72837 - integer overflow in bzdecompress caused heap corruption
Fix bug #72836 - integer overflow in base64_decode caused heap corruption
Fix for bug #72807 - do not produce strings with negative length
Fix for bug #72790 and bug #72799
Fix bug #72730 - imagegammacorrect allows arbitrary write access
...
Conflicts:
ext/standard/var_unserializer.c
2016-08-17 17:14:30 +08:00
1dab8e07f2
Update NEWs
2016-08-17 16:56:58 +08:00
Anatol Belski