]>
granicus.if.org Git - php/log
Anatol Belski [Sat, 3 Sep 2016 15:05:28 +0000 (17:05 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix leak and error check order
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 12:01:39 +0000 (14:01 +0200)]
Merge branch 'PHP-7.1'
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:01:15 +0000 (12:01 +0200)]
Merge branch 'PHP-7.1'
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:55:12 +0000 (00:55 +0200)]
Replace `dirname(__FILE__)` with `__DIR__` in tests
Christoph M. Becker [Fri, 2 Sep 2016 22:41:33 +0000 (00:41 +0200)]
Merge branch '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:36 +0000 (00:06 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix double free
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:55:22 +0000 (23:55 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
improve fix
fix leak
fix leak
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
Christoph M. Becker [Fri, 2 Sep 2016 18:19:09 +0000 (20:19 +0200)]
Update UPGRADING wrt. RFC: Implement socket_getaddrinfo()
Christoph M. Becker [Fri, 2 Sep 2016 18:12:55 +0000 (20:12 +0200)]
Merge branch 'pull-request/2078'
Anatol Belski [Fri, 2 Sep 2016 17:47:08 +0000 (19:47 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Add skipifs to some mb path tests
fix leak
fix mem 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 17:06:26 +0000 (19:06 +0200)]
Implement FAST_ZPP support for imagecolorat() and imagesetpixel()
These functions may be used in tight loops to do image manipulation in
userland. Using FAST_ZPP is supposed to bring considerable performance
improvements in this case; we've been able to measure up to 25%.
Christoph M. Becker [Fri, 2 Sep 2016 16:00:06 +0000 (18:00 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Fri, 2 Sep 2016 15:38:44 +0000 (17:38 +0200)]
Update to SQLite 3.14.1
Julien Pauli [Fri, 2 Sep 2016 15:57:17 +0000 (17:57 +0200)]
Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."
This reverts commit
04115b4e3f37f24bdefb853c5c31eebd40ffff64 .
Julien Pauli [Fri, 2 Sep 2016 15:57:09 +0000 (17:57 +0200)]
Revert "PHP 7 compat"
This reverts commit
24a57ee03b5b8803a2dcffd458b8a56c13ec6293 .
Christoph M. Becker [Fri, 2 Sep 2016 15:34:11 +0000 (17:34 +0200)]
Fix typo
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:43 +0000 (17:02 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix warning about sign-mismatch comparisons
Julien Pauli [Thu, 1 Sep 2016 11:44:54 +0000 (13:44 +0200)]
PHP 7 compat
Bishop Bettini [Tue, 21 Jun 2016 12:16:51 +0000 (08:16 -0400)]
Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT.
Conflicts:
ext/pdo/pdo_stmt.c
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:45 +0000 (23:29 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Revert "Fix closure tests using ReflectionType::__toString()"
Revert "Append \ to class name returned from ReflectionType::__toString()"
Stanislav Malyshev [Fri, 2 Sep 2016 06:29:34 +0000 (23:29 -0700)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix bug #72910
5.6.27 will be next
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
Yasuo Ohgaki [Fri, 2 Sep 2016 05:15:47 +0000 (14:15 +0900)]
Allow array input for mb_check_encoding()
Anatol Belski [Thu, 1 Sep 2016 21:54:33 +0000 (23:54 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
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
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:23:35 +0000 (15:23 +0200)]
Remi Collet [Thu, 1 Sep 2016 13:21:45 +0000 (15:21 +0200)]
Nikita Popov [Thu, 1 Sep 2016 11:01:58 +0000 (13:01 +0200)]
Merge branch 'PHP-7.1'
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
Nikita Popov [Thu, 1 Sep 2016 10:58:41 +0000 (12:58 +0200)]
Merge branch 'PHP-7.1'
[skip ci]
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:39 +0000 (12:11 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
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"
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:42:03 +0000 (10:42 +0900)]
Revert "Update UPGRADING"
This reverts commit
567f19dd89235ebd7c235939b8d57cb122778f76 .
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 23:10:35 +0000 (08:10 +0900)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug #72940 properly. Reduce needless branches
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:52:29 +0000 (05:52 +0900)]
Update UPGRADING
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:41:10 +0000 (10:41 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS for 7.1.0RC2
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:52:37 +0000 (16:52 +0200)]
Merge branch 'PHP-7.1'
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:55:58 +0000 (14:55 +0200)]
Merge branch 'PHP-7.1'
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:33:43 +0000 (14:33 +0200)]
Merge branch 'PHP-7.1'
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:38 +0000 (21:03 +0900)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Add tests