Commit Graph

97989 Commits

Author SHA1 Message Date
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
4f07f0e93f Update NEWS and UPGRADING 2016-09-01 10:32:34 +09: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
5366df75b4 Revert "Fix NEWS"
This reverts commit abc2271b8d.
2016-09-01 10:12:16 +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
Yasuo Ohgaki
abc2271b8d Fix NEWS 2016-09-01 05:53:26 +09:00
Yasuo Ohgaki
80d514d294 Update UPGRADING 2016-09-01 03:24:50 +09:00
Davey Shafik
f17d67123f Update NEWS for 7.1.0RC2 2016-08-31 17:01:42 +00: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
cb78ea9cc3 Merge branch 'PHP-7.0' into PHP-7.1 2016-08-31 14:55:37 +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
97f2bb894a Update NEWS 2016-08-31 21:10:57 +09:00
Yasuo Ohgaki
e385b05ebe Update NEWS 2016-08-31 21:08:23 +09:00
Yasuo Ohgaki
747b61808b Update NEWS 2016-08-31 21:06:19 +09: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
Anatol Belski
e446ec14e5 add more defs for resource alloc/dealloc 2016-08-31 12:10:40 +02:00
Anatol Belski
4c8e6a2c95 add yet one define 2016-08-31 12:10:40 +02:00
Davey Shafik
11f0f97160 Update NEWS 2016-08-30 19:47:50 -07: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
Anatol Belski
3d66d56c1d Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
  fix typo
  prepare for next
2016-08-30 14:16:48 +02:00
Anatol Belski
52afd8b744 fix typo 2016-08-30 14:11:47 +02:00
Anatol Belski
bc7460260b prepare for next 2016-08-30 14:11:22 +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
Nikita Popov
d49024c6de Merge branch 'PHP-7.0' into PHP-7.1 2016-08-30 13:06:32 +02:00
Nikita Popov
bfd4277008 Fix bug #72957 2016-08-30 13:05:53 +02:00
Nikita Popov
6adb7e0b7a Followup for bug #72971
Property writes did not respect the namespace either. This is an
incomplete fix in that it only handles the case where an existing
child element is modified, not when a new one is created.
2016-08-30 12:53:50 +02:00