]>
granicus.if.org Git - php/log
Anatol Belski [Sat, 3 Sep 2016 15:04:43 +0000 (17:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix leak and error check order
Anatol Belski [Sat, 3 Sep 2016 15:03:55 +0000 (17:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak and error check order
Anatol Belski [Sat, 3 Sep 2016 14:59:17 +0000 (16:59 +0200)]
fix leak and error check order
Christoph M. Becker [Sat, 3 Sep 2016 11:53:07 +0000 (13:53 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 3 Sep 2016 11:46:03 +0000 (13:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 3 Sep 2016 11:31:13 +0000 (13:31 +0200)]
Fix proto comment
While we're at it, we also change a related comment to use American English
consistently.
Christoph M. Becker [Sat, 3 Sep 2016 10:00:46 +0000 (12:00 +0200)]
Merge branch 'pull-request/2114' into PHP-7.1
Christoph M. Becker [Fri, 2 Sep 2016 22:40:05 +0000 (00:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 2 Sep 2016 22:30:05 +0000 (00:30 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 2 Sep 2016 22:18:19 +0000 (00:18 +0200)]
Make test case more resilient
When ran from a root directory the test case failed, because the open_basedir
restriction for "../[…]" won't kick in. Therefore we change the current
working directory to the test case's directory, as discussed on internals,
see <http://news.php.net/php.internals/95585>.
Anatol Belski [Fri, 2 Sep 2016 22:06:16 +0000 (00:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix double free
Anatol Belski [Fri, 2 Sep 2016 22:05:02 +0000 (00:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix double free
Anatol Belski [Fri, 2 Sep 2016 22:01:04 +0000 (00:01 +0200)]
fix double free
Anatol Belski [Fri, 2 Sep 2016 21:33:43 +0000 (23:33 +0200)]
improve fix
Anatol Belski [Fri, 2 Sep 2016 21:31:26 +0000 (23:31 +0200)]
fix leak
Anatol Belski [Fri, 2 Sep 2016 18:20:37 +0000 (20:20 +0200)]
fix leak
Anatol Belski [Fri, 2 Sep 2016 17:37:31 +0000 (19:37 +0200)]
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.
Anatol Belski [Fri, 2 Sep 2016 09:34:50 +0000 (11:34 +0200)]
fix leak
Anatol Belski [Fri, 2 Sep 2016 09:33:17 +0000 (11:33 +0200)]
fix mem leak
Christoph M. Becker [Fri, 2 Sep 2016 15:38:44 +0000 (17:38 +0200)]
Update to SQLite 3.14.1
Stephan Muggli [Fri, 2 Sep 2016 15:04:58 +0000 (15:04 +0000)]
Fix typo in UPGRADING
Julien Pauli [Fri, 2 Sep 2016 15:02:25 +0000 (17:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix warning about sign-mismatch comparisons
Julien Pauli [Fri, 2 Sep 2016 15:01:52 +0000 (17:01 +0200)]
Fix warning about sign-mismatch comparisons
Stanislav Malyshev [Fri, 2 Sep 2016 06:29:17 +0000 (23:29 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #72910
5.6.27 will be next
Stanislav Malyshev [Fri, 2 Sep 2016 06:28:56 +0000 (23:28 -0700)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src: (134 commits)
fix useless assignment
avoid needless function call
remove useless assignment
remove unused assignment
rewrite the getcwd part
fix leak
fix unused assignment
remove duplicated symbol
Revert
39587c4817522f40a639f32f77f49595fab066f9 8b7f594a2bcd67154274c5533274fe4d83a676fd Because of
24fdffdacbfeaa20e8f08d44c7c61e3fb7ba9ac5
add extra test to protected behavior of compact and array string key order
fix unintentional bc break with compact('this') behavior
Fix some grammatical errors in PHP 7.1 Upgrade Notes
Update NEWS
Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
Update NEWS and UPGRADING
Revert "Revert "Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc""
Revert "Revert "Merge RFC https://wiki.php.net/rfc/session-create-id""
Revert "Revert "Add tests""
Revert "Fix NEWS"
Fix bug #72940 properly. Reduce needless branches
...
Stanislav Malyshev [Fri, 2 Sep 2016 06:28:44 +0000 (23:28 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #72910
5.6.27 will be next
Stanislav Malyshev [Fri, 2 Sep 2016 06:27:06 +0000 (23:27 -0700)]
Fix bug #72910
Merge upstream patch from https://github.com/kkos/oniguruma/commit/
65bdf2a0d160d06556415e5f396a75f6b11bad5c
Anatol Belski [Thu, 1 Sep 2016 21:31:06 +0000 (23:31 +0200)]
fix useless assignment
Anatol Belski [Thu, 1 Sep 2016 21:13:42 +0000 (23:13 +0200)]
avoid needless function call
Anatol Belski [Thu, 1 Sep 2016 20:52:43 +0000 (22:52 +0200)]
remove useless assignment
Anatol Belski [Thu, 1 Sep 2016 20:36:03 +0000 (22:36 +0200)]
remove unused assignment
Anatol Belski [Thu, 1 Sep 2016 19:31:40 +0000 (21:31 +0200)]
rewrite the getcwd part
Also fixes a possible memory leak. Still not ideal, as seems CWD
longer than MAX_PATH is still not supported. But a heap allocation
is not needed anyway, as MAXPATHLEN value is the maximum supported.
Anatol Belski [Thu, 1 Sep 2016 18:48:33 +0000 (20:48 +0200)]
fix leak
Anatol Belski [Thu, 1 Sep 2016 14:31:15 +0000 (16:31 +0200)]
fix unused assignment
Anatol Belski [Wed, 31 Aug 2016 10:38:31 +0000 (12:38 +0200)]
remove duplicated symbol
Ferenc Kovacs [Thu, 1 Sep 2016 18:27:19 +0000 (20:27 +0200)]
5.6.27 will be next
Remi Collet [Thu, 1 Sep 2016 13:21:45 +0000 (15:21 +0200)]
Márcio Almada [Thu, 1 Sep 2016 07:52:54 +0000 (03:52 -0400)]
add extra test to protected behavior of compact and array string key order
Márcio Almada [Thu, 1 Sep 2016 07:50:58 +0000 (03:50 -0400)]
fix unintentional bc break with compact('this') behavior
Teoh Han Hui [Thu, 1 Sep 2016 04:21:15 +0000 (12:21 +0800)]
Fix some grammatical errors in PHP 7.1 Upgrade Notes
[skip ci]
Xinchen Hui [Thu, 1 Sep 2016 04:11:24 +0000 (12:11 +0800)]
Update NEWS
Xinchen Hui [Thu, 1 Sep 2016 04:10:54 +0000 (12:10 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
Xinchen Hui [Thu, 1 Sep 2016 04:10:38 +0000 (12:10 +0800)]
Fixed bug #72982 (Memory leak in zend_accel_blacklist_update_regexp() function)
Yasuo Ohgaki [Thu, 1 Sep 2016 01:32:34 +0000 (10:32 +0900)]
Update NEWS and UPGRADING
Yasuo Ohgaki [Thu, 1 Sep 2016 01:12:26 +0000 (10:12 +0900)]
Revert "Revert "Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc""
This reverts commit
355c7e7d1cdc180d368c6214ea7605443fc88c92 .
Yasuo Ohgaki [Thu, 1 Sep 2016 01:12:23 +0000 (10:12 +0900)]
Revert "Revert "Merge RFC https://wiki.php.net/rfc/session-create-id""
This reverts commit
663f1c8fb08ba51a00d7d8ed6261916c6fc8d5df .
Yasuo Ohgaki [Thu, 1 Sep 2016 01:12:19 +0000 (10:12 +0900)]
Revert "Revert "Add tests""
This reverts commit
4f11dedc436a160bbb90e2b2c559390119c48c0c .
Yasuo Ohgaki [Thu, 1 Sep 2016 01:12:16 +0000 (10:12 +0900)]
Yasuo Ohgaki [Wed, 31 Aug 2016 22:47:27 +0000 (07:47 +0900)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #72940 properly. Reduce needless branches
Yasuo Ohgaki [Wed, 31 Aug 2016 22:47:04 +0000 (07:47 +0900)]
Fix bug #72940 properly. Reduce needless branches
Yasuo Ohgaki [Wed, 31 Aug 2016 20:54:55 +0000 (05:54 +0900)]
Revert "Implement RFC Add session_gc() https://wiki.php.net/rfc/session-gc"
This reverts commit
1cf179e4150308d8217d9517408ca5e22b5d607f .
Yasuo Ohgaki [Wed, 31 Aug 2016 20:54:30 +0000 (05:54 +0900)]
Revert "Merge RFC https://wiki.php.net/rfc/session-create-id"
This reverts commit
7ee9f81c54ca888beae1c6aaeaccee1260012076 .
Yasuo Ohgaki [Wed, 31 Aug 2016 20:54:19 +0000 (05:54 +0900)]
Revert "Add tests"
This reverts commit
aff4c7d826316dc8f577d08c79a3c53c02b90910 .
Yasuo Ohgaki [Wed, 31 Aug 2016 20:53:26 +0000 (05:53 +0900)]
Fix NEWS
Yasuo Ohgaki [Wed, 31 Aug 2016 18:24:06 +0000 (03:24 +0900)]
Update UPGRADING
Davey Shafik [Wed, 31 Aug 2016 17:01:42 +0000 (17:01 +0000)]
Update NEWS for 7.1.0RC2
Christoph M. Becker [Wed, 31 Aug 2016 14:43:54 +0000 (16:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 31 Aug 2016 14:38:38 +0000 (16:38 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 31 Aug 2016 14:33:14 +0000 (16:33 +0200)]
Fix #71882 amendment 2: Negative ftruncate() on php://memory exhausts memory
Christoph M. Becker [Wed, 31 Aug 2016 12:54:51 +0000 (14:54 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 31 Aug 2016 12:53:53 +0000 (14:53 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 31 Aug 2016 12:51:37 +0000 (14:51 +0200)]
Fix #71882 amendment: Negative ftruncate() on php://memory exhausts memory
To avoid BC breaks, we do not raise a warning for now.
Christoph M. Becker [Wed, 31 Aug 2016 12:16:12 +0000 (14:16 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Yasuo Ohgaki [Wed, 31 Aug 2016 12:09:56 +0000 (21:09 +0900)]
Update NEWS
Yasuo Ohgaki [Wed, 31 Aug 2016 12:06:05 +0000 (21:06 +0900)]
Update NEWS
Yasuo Ohgaki [Wed, 31 Aug 2016 12:06:19 +0000 (21:06 +0900)]
Update NEWS
Yasuo Ohgaki [Wed, 31 Aug 2016 12:03:10 +0000 (21:03 +0900)]
Add tests
Yasuo Ohgaki [Wed, 31 Aug 2016 11:34:20 +0000 (20:34 +0900)]
Merge RFC https://wiki.php.net/rfc/session-create-id
Christoph M. Becker [Wed, 31 Aug 2016 11:27:23 +0000 (13:27 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Wed, 31 Aug 2016 11:24:37 +0000 (13:24 +0200)]
Fix #71882 amendment: Negative ftruncate() on php://memory exhausts memory
To avoid BC breaks, we do not raise a warning for now.
Anatol Belski [Wed, 31 Aug 2016 10:26:51 +0000 (12:26 +0200)]
sync tests
Anatol Belski [Wed, 31 Aug 2016 10:09:56 +0000 (12:09 +0200)]
add more defs for resource alloc/dealloc
Anatol Belski [Wed, 31 Aug 2016 10:09:26 +0000 (12:09 +0200)]
add yet one define
Davey Shafik [Wed, 31 Aug 2016 02:47:50 +0000 (19:47 -0700)]
Update NEWS
Davey Shafik [Tue, 30 Aug 2016 19:09:26 +0000 (12:09 -0700)]
Implement \ArgumentCountError exception
Nikita Popov [Tue, 30 Aug 2016 16:06:59 +0000 (18:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 30 Aug 2016 16:06:18 +0000 (18:06 +0200)]
Fix bug #71711
Also handle another case of bug #71996.
Nikita Popov [Tue, 30 Aug 2016 15:21:13 +0000 (17:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 30 Aug 2016 15:19:19 +0000 (17:19 +0200)]
Fixed bug #71996
Christoph M. Becker [Tue, 30 Aug 2016 13:02:14 +0000 (15:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 30 Aug 2016 12:54:44 +0000 (14:54 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 30 Aug 2016 12:48:24 +0000 (14:48 +0200)]
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.
Anatol Belski [Tue, 30 Aug 2016 12:16:48 +0000 (14:16 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix typo
prepare for next
Anatol Belski [Tue, 30 Aug 2016 12:11:47 +0000 (14:11 +0200)]
fix typo
Anatol Belski [Tue, 30 Aug 2016 12:10:54 +0000 (14:10 +0200)]
prepare for next
Nikita Popov [Tue, 30 Aug 2016 11:45:49 +0000 (13:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 30 Aug 2016 11:44:59 +0000 (13:44 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ville Hukkamäki [Fri, 19 Aug 2016 22:05:04 +0000 (22:05 +0000)]
Test case for bug #72771
Nikita Popov [Tue, 30 Aug 2016 11:06:22 +0000 (13:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 30 Aug 2016 11:05:53 +0000 (13:05 +0200)]
Fix bug #72957
Nikita Popov [Tue, 30 Aug 2016 10:43:41 +0000 (12:43 +0200)]
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.
Nikita Popov [Tue, 30 Aug 2016 08:55:08 +0000 (10:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 30 Aug 2016 08:54:31 +0000 (10:54 +0200)]
Fix bug #72971
Yasuo Ohgaki [Tue, 30 Aug 2016 07:05:49 +0000 (16:05 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 30 Aug 2016 06:58:55 +0000 (15:58 +0900)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72940 SID always return "name=ID", even if session cookie exist
Yasuo Ohgaki [Tue, 30 Aug 2016 06:56:06 +0000 (15:56 +0900)]
Fixed bug #72940 SID always return "name=ID", even if session cookie exist
Christoph M. Becker [Tue, 30 Aug 2016 00:21:10 +0000 (02:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 30 Aug 2016 00:08:50 +0000 (02:08 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 29 Aug 2016 23:53:27 +0000 (01:53 +0200)]
Fix #71882: Negative ftruncate() on php://memory exhausts memory
We must not pass negative sizes to a size_t parameter.
Christoph M. Becker [Mon, 29 Aug 2016 23:18:23 +0000 (01:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1