Anatol Belski
e4564e4b98
improve fix
2016-09-02 23:33:43 +02:00
Anatol Belski
93bb779433
fix leak
2016-09-02 23:31:26 +02:00
Anatol Belski
0b5faa4461
fix leak
2016-09-02 20:20:37 +02:00
Anatol Belski
596f488e06
Add skipifs to some mb path tests
...
These were invented primarily to test the multibyte path handling
patch on Windows. How it turns out by PR #2105 , some test issues
on some filesystems are possible. Particularly HFS is configurable
to use different ways to save filenames, see
https://developer.apple.com/library/mac/qa/qa1173/_index.html
This makes it impossible to test the filenames byte wise, while
the results are still correct. There are still several other tests
using UTF-8 file names spread over other extensions. So far no
false positives are to see, they don't need to be touched.
2016-09-02 19:46:32 +02:00
Anatol Belski
2c02e93e69
fix leak
2016-09-02 19:46:32 +02:00
Anatol Belski
44e43a4738
fix mem leak
2016-09-02 19:46:32 +02:00
Christoph M. Becker
8f110ee4dc
Update to SQLite 3.14.1
2016-09-02 17:58:16 +02:00
Julien Pauli
e681b8771b
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix warning about sign-mismatch comparisons
2016-09-02 17:02:25 +02:00
Julien Pauli
e14b14d026
Fix warning about sign-mismatch comparisons
2016-09-02 17:01:52 +02:00
Stanislav Malyshev
01f4a52aaa
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #72910
5.6.27 will be next
2016-09-01 23:29:17 -07:00
Stanislav Malyshev
ccc8d92d3d
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fix bug #72910
5.6.27 will be next
2016-09-01 23:28:44 -07:00
Stanislav Malyshev
e576714f6b
Fix bug #72910
...
Merge upstream patch from https://github.com/kkos/oniguruma/commit/65bdf2a0d160d06556415e5f396a75f6b11bad5c
2016-09-01 23:27:06 -07:00
Anatol Belski
f1cf26ea4f
fix useless assignment
2016-09-01 23:45:31 +02:00
Anatol Belski
1d64b4c71e
avoid needless function call
2016-09-01 23:45:31 +02:00
Anatol Belski
a989091880
remove useless assignment
2016-09-01 23:45:31 +02:00
Remi Collet
5a9691bf08
Revert
...
39587c4817
8b7f594a2b
Because of
24fdffdacb
2016-09-01 15:21:45 +02:00
Márcio Almada
cba560e67f
add extra test to protected behavior of compact and array string key order
2016-09-01 13:01:42 +02:00
Márcio Almada
00c2c3a476
fix unintentional bc break with compact('this') behavior
2016-09-01 13:01:38 +02:00
Xinchen Hui
5f3a26c741
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
2016-09-01 12:10:54 +08:00
Xinchen Hui
1ee41683dc
Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
2016-09-01 12:10:38 +08:00
Yasuo Ohgaki
a4a2f66e75
Revert "Revert "Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc ""
...
This reverts commit 355c7e7d1c .
2016-09-01 10:12:26 +09:00
Yasuo Ohgaki
b36ae7467e
Revert "Revert "Merge RFC https://wiki.php.net/rfc/session-create-id ""
...
This reverts commit 663f1c8fb0 .
2016-09-01 10:12:23 +09:00
Yasuo Ohgaki
7505eaf6fa
Revert "Revert "Add tests""
...
This reverts commit 4f11dedc43 .
2016-09-01 10:12:19 +09:00
Yasuo Ohgaki
90352bb4a2
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix bug #72940 properly. Reduce needless branches
2016-09-01 07:47:27 +09:00
Yasuo Ohgaki
cc797d4fc3
Fix bug #72940 properly. Reduce needless branches
2016-09-01 07:47:13 +09:00
Yasuo Ohgaki
355c7e7d1c
Revert "Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc "
...
This reverts commit 1cf179e415 .
2016-09-01 05:54:55 +09:00
Yasuo Ohgaki
663f1c8fb0
Revert "Merge RFC https://wiki.php.net/rfc/session-create-id "
...
This reverts commit 7ee9f81c54 .
2016-09-01 05:54:30 +09:00
Yasuo Ohgaki
4f11dedc43
Revert "Add tests"
...
This reverts commit aff4c7d826 .
2016-09-01 05:54:19 +09:00
Christoph M. Becker
9cc11dbded
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-31 16:45:15 +02:00
Christoph M. Becker
f93fd8ce32
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-31 16:38:38 +02:00
Christoph M. Becker
b2d267d9ee
Fix #71882 amendment 2: Negative ftruncate() on php://memory exhausts memory
2016-08-31 16:33:14 +02:00
Christoph M. Becker
8f32d609c5
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-31 14:53:53 +02:00
Christoph M. Becker
314a9f8553
Fix #71882 amendment: Negative ftruncate() on php://memory exhausts memory
...
To avoid BC breaks, we do not raise a warning for now.
2016-08-31 14:51:37 +02:00
Christoph M. Becker
56ed966bc6
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-31 14:32:24 +02:00
Yasuo Ohgaki
aff4c7d826
Add tests
2016-08-31 21:03:10 +09:00
Yasuo Ohgaki
7ee9f81c54
Merge RFC https://wiki.php.net/rfc/session-create-id
2016-08-31 20:34:20 +09:00
Christoph M. Becker
08a71df612
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-31 13:27:23 +02:00
Christoph M. Becker
f215fb874f
Fix #71882 amendment: Negative ftruncate() on php://memory exhausts memory
...
To avoid BC breaks, we do not raise a warning for now.
2016-08-31 13:24:37 +02:00
Anatol Belski
aeb7b4094a
sync tests
2016-08-31 12:26:51 +02:00
Davey Shafik
12ee17d5e0
Implement \ArgumentCountError exception
2016-08-30 19:35:56 -07:00
Nikita Popov
02fb46e17c
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-30 18:07:21 +02:00
Nikita Popov
3317287ce1
Fix bug #71711
...
Also handle another case of bug #71996 .
2016-08-30 18:06:18 +02:00
Nikita Popov
b218eb916f
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-30 17:21:33 +02:00
Nikita Popov
8e487aefaa
Fixed bug #71996
2016-08-30 17:20:55 +02:00
Christoph M. Becker
ecdef60d00
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-30 15:12:49 +02:00
Christoph M. Becker
972302d2f0
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-30 15:01:12 +02:00
Christoph M. Becker
2f10db36af
Fix #66797 : mb_substr only takes 32-bit signed integer
...
`from` and `len` are `long`, but get passed to mbfl_substr() which expects
`int`s. Therefore we clamp the values to avoid the undefined conversion
behavior.
2016-08-30 14:52:47 +02:00
Nikita Popov
c361020f04
Merge branch 'PHP-7.0' into PHP-7.1
2016-08-30 13:45:49 +02:00
Nikita Popov
2c12a5f0a8
Merge branch 'PHP-5.6' into PHP-7.0
2016-08-30 13:44:59 +02:00
Ville Hukkamäki
af7828a20f
Test case for bug #72771
2016-08-30 13:44:34 +02:00