]>
granicus.if.org Git - php/log
Leigh [Tue, 18 Oct 2016 08:17:03 +0000 (09:17 +0100)]
Merge branch 'master' into remove-mcrypt
Yasuo Ohgaki [Tue, 18 Oct 2016 00:14:57 +0000 (09:14 +0900)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug #47890 #73215 uniqid() should use better random source
Yasuo Ohgaki [Tue, 18 Oct 2016 00:14:48 +0000 (09:14 +0900)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #47890 #73215 uniqid() should use better random source
Yasuo Ohgaki [Tue, 18 Oct 2016 00:04:57 +0000 (09:04 +0900)]
Fix bug #47890 #73215 uniqid() should use better random source
Christoph M. Becker [Mon, 17 Oct 2016 22:02:18 +0000 (00:02 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Mon, 17 Oct 2016 22:00:37 +0000 (00:00 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Yasuo Ohgaki [Mon, 17 Oct 2016 21:54:10 +0000 (06:54 +0900)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Simply return FALSE from session_gc(). Error could be annoying because internal save handlers may return -1 when GC cannot be performed for reasons
Yasuo Ohgaki [Mon, 17 Oct 2016 21:52:52 +0000 (06:52 +0900)]
Simply return FALSE from session_gc(). Error could be annoying because internal save handlers may return -1 when GC cannot be performed for reasons
Christoph M. Becker [Mon, 17 Oct 2016 21:37:00 +0000 (23:37 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
We also use ZEND_LONG_(MAX|MIN) now instead of LONG_(MAX|MIN).
Christoph M. Becker [Mon, 17 Oct 2016 14:58:49 +0000 (16:58 +0200)]
Fix #73333:
2147483647 is fetched as string
We return all integers that can be represented as such by PHP as
integers, and only those that exceed the possible range as strings.
On builds which represent integers with 64 bits, the range check is
unnecessary and might cause code checkers to complain, so we skip this
special casing via the preprocessor according to
<http://git.php.net/?p=php-src.git;a=commit;h=
99d087e5 >.
Yasuo Ohgaki [Mon, 17 Oct 2016 21:18:21 +0000 (06:18 +0900)]
Add save handler explanations for documentation purpose
Adam Baratz [Mon, 17 Oct 2016 21:06:49 +0000 (17:06 -0400)]
Remove dead code
Dmitry Stogov [Mon, 17 Oct 2016 21:06:50 +0000 (00:06 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Use simple "one-pass" algorithm.
Dmitry Stogov [Mon, 17 Oct 2016 21:06:20 +0000 (00:06 +0300)]
Use simple "one-pass" algorithm.
Anatol Belski [Mon, 17 Oct 2016 19:28:19 +0000 (21:28 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
sync NEWS
Merge branch 'pull-request/1817'
Merge branch 'pull-request/1816'
Merge branch 'pull-request/1814'
Merge branch 'pull-request/1808'
Merge branch 'pull-request/1817'
Merge branch 'pull-request/1816'
Merge branch 'pull-request/1814'
Merge branch 'pull-request/1808'
Anatol Belski [Mon, 17 Oct 2016 19:27:32 +0000 (21:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
sync NEWS
Merge branch 'pull-request/1817'
Merge branch 'pull-request/1816'
Merge branch 'pull-request/1814'
Merge branch 'pull-request/1808'
Merge branch 'pull-request/2097'
news entry for pr #2158
Merge branch 'pull-request/2158'
Anatol Belski [Mon, 17 Oct 2016 19:26:34 +0000 (21:26 +0200)]
sync NEWS
Andrey Hristov [Mon, 17 Oct 2016 16:31:43 +0000 (19:31 +0300)]
Merge branch 'PHP-7.1'
Andrey Hristov [Mon, 17 Oct 2016 16:31:29 +0000 (19:31 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrey Hristov [Mon, 17 Oct 2016 16:30:08 +0000 (19:30 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
Andrey Hristov [Mon, 17 Oct 2016 16:25:01 +0000 (19:25 +0300)]
Lower the value to 24 hours from 1 year, which due to a overflow in
php_tvtoto (bug#71507) is just 17 days.
Andrey Hristov [Mon, 17 Oct 2016 16:12:56 +0000 (19:12 +0300)]
Merge branch 'master' of git.php.net:php-src
Andrey Hristov [Mon, 17 Oct 2016 16:12:33 +0000 (19:12 +0300)]
Merge branch 'PHP-7.1'
Andrey Hristov [Mon, 17 Oct 2016 16:11:54 +0000 (19:11 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 17 Oct 2016 15:49:24 +0000 (16:49 +0100)]
Merge branch 'pull-request/1817'
Joe Watkins [Mon, 17 Oct 2016 15:50:12 +0000 (16:50 +0100)]
Merge branch 'pull-request/1816'
Joe Watkins [Mon, 17 Oct 2016 15:50:53 +0000 (16:50 +0100)]
Merge branch 'pull-request/1814'
Joe Watkins [Mon, 17 Oct 2016 15:53:04 +0000 (16:53 +0100)]
Merge branch 'pull-request/1808'
Joe Watkins [Mon, 17 Oct 2016 15:49:24 +0000 (16:49 +0100)]
Merge branch 'pull-request/1817'
Joe Watkins [Mon, 17 Oct 2016 15:50:12 +0000 (16:50 +0100)]
Merge branch 'pull-request/1816'
Andrey Hristov [Mon, 17 Oct 2016 16:01:12 +0000 (19:01 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
Joe Watkins [Mon, 17 Oct 2016 15:50:53 +0000 (16:50 +0100)]
Merge branch 'pull-request/1814'
Joe Watkins [Mon, 17 Oct 2016 15:53:04 +0000 (16:53 +0100)]
Merge branch 'pull-request/1808'
Andrey Hristov [Mon, 17 Oct 2016 15:58:14 +0000 (18:58 +0300)]
This is a very very old thing dated back to year 2009.
MYSQL_OPT_READ_TIMEOUT was never a macro in mysqlnd but an enum value.
So this never actually worked correctly. mysqlnd provides these so it is
safe to have them when mysqlnd used.
Joe Watkins [Mon, 17 Oct 2016 15:53:04 +0000 (16:53 +0100)]
Merge branch 'pull-request/1808'
Joe Watkins [Mon, 17 Oct 2016 15:50:53 +0000 (16:50 +0100)]
Merge branch 'pull-request/1814'
Joe Watkins [Mon, 17 Oct 2016 15:50:12 +0000 (16:50 +0100)]
Merge branch 'pull-request/1816'
Joe Watkins [Mon, 17 Oct 2016 15:49:24 +0000 (16:49 +0100)]
Merge branch 'pull-request/1817'
Joe Watkins [Mon, 17 Oct 2016 14:59:51 +0000 (15:59 +0100)]
Merge branch 'pull-request/2097'
Joe Watkins [Mon, 17 Oct 2016 14:59:51 +0000 (15:59 +0100)]
Merge branch 'pull-request/2097'
Joe Watkins [Mon, 17 Oct 2016 14:59:51 +0000 (15:59 +0100)]
Merge branch 'pull-request/2097'
Joe Watkins [Mon, 17 Oct 2016 14:50:59 +0000 (15:50 +0100)]
news entry for pr #2158
Joe Watkins [Mon, 17 Oct 2016 13:42:35 +0000 (14:42 +0100)]
Merge branch 'pull-request/2158'
Andrea Faulds [Mon, 17 Oct 2016 14:44:16 +0000 (15:44 +0100)]
NEWS and UPGRADING for utf8_encode() and utf8_decode() move
Andrea Faulds [Thu, 13 Oct 2016 22:33:33 +0000 (23:33 +0100)]
Move utf8_encode and utf8_decode to ext/standard
Joe Watkins [Mon, 17 Oct 2016 13:47:08 +0000 (14:47 +0100)]
news entry for pr #2158
Joe Watkins [Mon, 17 Oct 2016 13:42:35 +0000 (14:42 +0100)]
Merge branch 'pull-request/2158'
Joe Watkins [Mon, 17 Oct 2016 13:44:11 +0000 (14:44 +0100)]
Merge branch 'master' of git.php.net:/php-src
Joe Watkins [Mon, 17 Oct 2016 13:43:41 +0000 (14:43 +0100)]
news entry for pr #2158
Joe Watkins [Mon, 17 Oct 2016 13:42:35 +0000 (14:42 +0100)]
Merge branch 'pull-request/2158'
Joe Watkins [Mon, 17 Oct 2016 13:22:55 +0000 (14:22 +0100)]
Revert "Fixed bug #73067 (__debugInfo crashes when throwing an exception)"
This reverts commit
2d8ab51576695630a7471ff829cc5ea10becdc0f .
Joe Watkins [Mon, 17 Oct 2016 13:12:15 +0000 (14:12 +0100)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Joe Watkins [Mon, 17 Oct 2016 13:11:39 +0000 (14:11 +0100)]
sync news from 7.1.0RC4
Remi Collet [Mon, 17 Oct 2016 13:08:15 +0000 (15:08 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
also fix 32bits test for microsecond
bump news version
Update 7.1 NEWS for bug #71148
Remi Collet [Mon, 17 Oct 2016 13:07:56 +0000 (15:07 +0200)]
also fix 32bits test for microsecond
Joe Watkins [Mon, 17 Oct 2016 10:31:34 +0000 (11:31 +0100)]
bump news version
Christoph M. Becker [Mon, 17 Oct 2016 08:35:56 +0000 (10:35 +0200)]
Merge branch 'pull-request/2151'
Christopher Jones [Mon, 17 Oct 2016 01:52:34 +0000 (12:52 +1100)]
Update 7.1 NEWS for bug #71148
Christopher Jones [Mon, 17 Oct 2016 01:42:44 +0000 (12:42 +1100)]
Merge branch 'PHP-7.1'
Christopher Jones [Mon, 17 Oct 2016 01:40:54 +0000 (12:40 +1100)]
Merge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Mon, 17 Oct 2016 01:40:14 +0000 (12:40 +1100)]
Fixed bug #71148 (Bind reference overwritten on PHP 7)
Bob Weinand [Sun, 16 Oct 2016 13:46:44 +0000 (15:46 +0200)]
Merge branch 'PHP-7.1'
Bob Weinand [Sun, 16 Oct 2016 13:46:33 +0000 (15:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sun, 16 Oct 2016 13:41:37 +0000 (15:41 +0200)]
Fixed bug #71234 (INI files are loaded even invoked as phpdbg -n --version)
Bob Weinand [Sun, 16 Oct 2016 11:48:25 +0000 (13:48 +0200)]
Merge branch 'PHP-7.1'
Bob Weinand [Sun, 16 Oct 2016 11:48:13 +0000 (13:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sun, 16 Oct 2016 11:47:49 +0000 (13:47 +0200)]
Fixed bug #70776 (Simple SIGINT does not have any effect)
Bob Weinand [Sun, 16 Oct 2016 10:34:20 +0000 (12:34 +0200)]
Merge branch 'PHP-7.1'
Bob Weinand [Sun, 16 Oct 2016 10:34:10 +0000 (12:34 +0200)]
Fix searching for catch blocks
Since PHP-7.1 catch blocks are addressed with relative byte difference between two catch blocks as opposed to absolute opcode number
Kalle Sommer Nielsen [Sun, 16 Oct 2016 06:52:39 +0000 (08:52 +0200)]
Remove this old and long gone deprecated makefile. Netware was discontinued over 7 years ago and it is safe to say that no one is really maintaining support in php-src anyway for it
Kalle Sommer Nielsen [Sun, 16 Oct 2016 04:36:54 +0000 (06:36 +0200)]
Fix build, decls first
Kalle Sommer Nielsen [Sun, 16 Oct 2016 03:21:30 +0000 (05:21 +0200)]
Change the semantics of proc_nice() for Windows to better match the values of the wmic output
Kalle Sommer Nielsen [Sun, 16 Oct 2016 02:17:35 +0000 (04:17 +0200)]
Implemented proc_nice() for Windows (FR #49806)
The core implementation details are described in win32/nice.c for values sent to proc_nice(), these can however be discussed to maybe comply with those of wmic, Anatol, thoughts?
The test supplied uses wmic for testing the functionality, it could potentially fail on systems where either wmic is not available or the system language is not english (as Microsoft tends to translate even CLI programs).
Kalle Sommer Nielsen [Sat, 15 Oct 2016 23:42:53 +0000 (01:42 +0200)]
Remove the old and way outdated Zend/RFCs folder, we use the wiki nowadays anyway
Kalle Sommer Nielsen [Sat, 15 Oct 2016 23:01:09 +0000 (01:01 +0200)]
Fix build + warning, decls first
Yasuo Ohgaki [Sat, 15 Oct 2016 22:29:05 +0000 (07:29 +0900)]
Use proper API
Nikita Popov [Sat, 15 Oct 2016 22:04:23 +0000 (00:04 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 14 Oct 2016 22:13:24 +0000 (00:13 +0200)]
Various function info fixes
Nikita Popov [Fri, 14 Oct 2016 21:54:11 +0000 (23:54 +0200)]
Various RC inference fixes
Nikita Popov [Sat, 15 Oct 2016 21:21:12 +0000 (23:21 +0200)]
Fix SplFixedArray::offsetGet() invocation for NULL offset
Nikita Popov [Sat, 15 Oct 2016 21:03:03 +0000 (23:03 +0200)]
Normalize preg_replace_callback() return value
One particular error case was returning the argument without
casting to string.
Christoph M. Becker [Sat, 15 Oct 2016 17:46:32 +0000 (19:46 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Sat, 15 Oct 2016 17:36:26 +0000 (19:36 +0200)]
Update to SQLite 3.15.0
Yasuo Ohgaki [Sat, 15 Oct 2016 12:03:14 +0000 (21:03 +0900)]
Add tests
Yasuo Ohgaki [Sat, 15 Oct 2016 11:51:34 +0000 (20:51 +0900)]
Fix test and cleanup code a little
Yasuo Ohgaki [Sat, 15 Oct 2016 04:16:45 +0000 (13:16 +0900)]
mb_check_encoding()/mb_convert_encoding() - Improve and add recursion detection.
Anatol Belski [Fri, 14 Oct 2016 17:53:23 +0000 (19:53 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
sync NEWS
Anatol Belski [Fri, 14 Oct 2016 17:52:52 +0000 (19:52 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
sync NEWS
Anatol Belski [Fri, 14 Oct 2016 17:52:04 +0000 (19:52 +0200)]
sync NEWS
Remi Collet [Fri, 14 Oct 2016 15:31:43 +0000 (17:31 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
bump ext/zip version
Remi Collet [Fri, 14 Oct 2016 15:31:26 +0000 (17:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
bump ext/zip version
Remi Collet [Fri, 14 Oct 2016 15:31:07 +0000 (17:31 +0200)]
bump ext/zip version
Christoph M. Becker [Fri, 14 Oct 2016 12:15:31 +0000 (14:15 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Tue, 27 Sep 2016 18:26:16 +0000 (20:26 +0200)]
Implement #72918: negative offset inside a quoted string leads to parse error
We allow negative numeric offsets for the simple syntax inside
double-quoted and heredoc strings.
Christoph M. Becker [Fri, 14 Oct 2016 11:52:44 +0000 (13:52 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Fri, 14 Oct 2016 11:52:21 +0000 (13:52 +0200)]
Update NEWS
This entry has been lost due to a bad merge.
Bob Weinand [Fri, 14 Oct 2016 10:25:34 +0000 (12:25 +0200)]
Merge branch 'PHP-7.1'
Bob Weinand [Fri, 14 Oct 2016 10:25:16 +0000 (12:25 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Fri, 14 Oct 2016 10:24:28 +0000 (12:24 +0200)]
Fix memory leak when compiling files in phpdbg
Remi Collet [Fri, 14 Oct 2016 08:55:10 +0000 (10:55 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
use zend_error instead of zend_error_noreturn