]>
granicus.if.org Git - php/log
Andreas Treichel [Thu, 2 Feb 2017 00:09:31 +0000 (01:09 +0100)]
ftp_mlsd(): Parse the MLSD response
Nikita Popov [Fri, 17 Feb 2017 20:23:31 +0000 (21:23 +0100)]
Merge branch 'PHP-7.1'
andrewnester [Fri, 17 Feb 2017 09:33:35 +0000 (12:33 +0300)]
Fixed #74099 - Memory leak with openssl_encrypt()
Nikita Popov [Fri, 17 Feb 2017 17:44:10 +0000 (18:44 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 17 Feb 2017 17:43:50 +0000 (18:43 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Benjamin Robin [Wed, 15 Feb 2017 23:06:46 +0000 (00:06 +0100)]
Fixed bug #74105
If getrandom syscall is unavailable (ENOSYS), try to fallback on
/dev/urandom.
Xinchen Hui [Fri, 17 Feb 2017 04:23:14 +0000 (12:23 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Unused var
Xinchen Hui [Fri, 17 Feb 2017 04:22:59 +0000 (12:22 +0800)]
Unused var
Nikita Popov [Thu, 16 Feb 2017 16:36:09 +0000 (17:36 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 16 Feb 2017 16:35:52 +0000 (17:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Ondřej Surý [Thu, 16 Feb 2017 07:57:30 +0000 (08:57 +0100)]
Disable RTLD_DEEPBIND when compiling with AddressSanitizer (-fsanitize=address).
The AddressSanitizer doesn't support RTLD_DEEPBIND resulting in
erratic errors when deinitializing phar module and possibly others.
Clang use __has_feature() macro to indicate compilation with
AddressSanitizer while gcc uses __SANITIZE_ADDRESS__ define.
Fixes bug #73677.
Nikita Popov [Thu, 16 Feb 2017 16:28:14 +0000 (17:28 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 16 Feb 2017 16:28:05 +0000 (17:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 16 Feb 2017 16:24:07 +0000 (17:24 +0100)]
Fix memory errors in url rewriter
Strings aren't terminated here...
Nikita Popov [Thu, 16 Feb 2017 16:00:28 +0000 (17:00 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 16 Feb 2017 16:00:21 +0000 (17:00 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 16 Feb 2017 15:59:17 +0000 (16:59 +0100)]
Fix autoload_func_info destruction
Can't reference the function ptr after the closure has been
destroyed.
Nikita Popov [Thu, 16 Feb 2017 11:47:26 +0000 (12:47 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 16 Feb 2017 11:47:12 +0000 (12:47 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Mitch Hagstrand [Thu, 16 Feb 2017 09:19:47 +0000 (01:19 -0800)]
Make the ftp and stream tests more reliable.
The tests can sometimes fail because it chooses a passive port for ftp that
is already in use. This makes the test attempt multiple times to find a free
port.
Nikita Popov [Thu, 16 Feb 2017 11:45:15 +0000 (12:45 +0100)]
Add json dep to test
Anatol Belski [Wed, 15 Feb 2017 15:37:15 +0000 (16:37 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
[ci skip] update NEWS
[ci skip] update NEWS
Anatol Belski [Wed, 15 Feb 2017 15:35:49 +0000 (16:35 +0100)]
[ci skip] update NEWS
Anatol Belski [Wed, 15 Feb 2017 15:35:11 +0000 (16:35 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Anatol Belski [Wed, 15 Feb 2017 15:33:49 +0000 (16:33 +0100)]
[ci skip] update NEWS
Anatol Belski [Wed, 15 Feb 2017 15:15:16 +0000 (16:15 +0100)]
fix typo
Anatol Belski [Wed, 15 Feb 2017 15:14:46 +0000 (16:14 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
skip test
Anatol Belski [Wed, 15 Feb 2017 15:12:34 +0000 (16:12 +0100)]
skip test
The code path not available on Windows.
Anatol Belski [Wed, 15 Feb 2017 13:51:38 +0000 (14:51 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string
Anatol Belski [Wed, 15 Feb 2017 13:49:58 +0000 (14:49 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string
Anatol Belski [Wed, 15 Feb 2017 10:22:47 +0000 (11:22 +0100)]
Fixed bug #74090 stream_get_contents maxlength>-1 returns empty string
Xinchen Hui [Wed, 15 Feb 2017 09:31:35 +0000 (17:31 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed test in travis
Xinchen Hui [Wed, 15 Feb 2017 09:31:27 +0000 (17:31 +0800)]
Fixed test in travis
Xinchen Hui [Wed, 15 Feb 2017 07:27:33 +0000 (15:27 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Make it slower
Xinchen Hui [Wed, 15 Feb 2017 07:27:21 +0000 (15:27 +0800)]
Make it slower
Xinchen Hui [Wed, 15 Feb 2017 06:49:09 +0000 (14:49 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed test
Xinchen Hui [Wed, 15 Feb 2017 06:49:02 +0000 (14:49 +0800)]
Fixed test
Xinchen Hui [Wed, 15 Feb 2017 05:52:08 +0000 (13:52 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Add a test for hard_timeout(bug #74093)
Xinchen Hui [Wed, 15 Feb 2017 05:51:45 +0000 (13:51 +0800)]
Add a test for hard_timeout(bug #74093)
Xinchen Hui [Wed, 15 Feb 2017 04:30:23 +0000 (12:30 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Workaround to fix bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log)
Xinchen Hui [Wed, 15 Feb 2017 04:27:56 +0000 (12:27 +0800)]
Workaround to fix bug #74093 (Maximum execution time of n+2 seconds exceed not written in error_log)
Use a different exit code for hard_timeout, 124 is used by linux
timeout:http://man7.org/linux/man-pages/man1/timeout.1.html
"If the command times out, and --preserve-status is not set, then exit with status 124"
Christoph M. Becker [Tue, 14 Feb 2017 13:03:24 +0000 (14:03 +0100)]
Merge branch 'pull-request/2355'
* pull-request/2355:
Deprecate INTL_IDNA_VARIANT_2003
We also add a respective note to UPGRADING.
Christoph M. Becker [Tue, 14 Feb 2017 12:25:02 +0000 (13:25 +0100)]
Update to SQLite 3.17.0
Xinchen Hui [Mon, 13 Feb 2017 11:24:00 +0000 (19:24 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Fixed bug #73989 (PHP 7.1 Segfaults within Symfony test suite)
Conflicts:
Zend/zend_gc.c
Xinchen Hui [Mon, 13 Feb 2017 11:17:51 +0000 (19:17 +0800)]
Update NEWS
Xinchen Hui [Mon, 13 Feb 2017 11:17:09 +0000 (19:17 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73989 (PHP 7.1 Segfaults within Symfony test suite)
Xinchen Hui [Mon, 13 Feb 2017 11:16:17 +0000 (19:16 +0800)]
Fixed bug #73989 (PHP 7.1 Segfaults within Symfony test suite)
Anatol Belski [Mon, 13 Feb 2017 07:38:31 +0000 (08:38 +0100)]
update NEWS
Anatol Belski [Mon, 13 Feb 2017 07:35:01 +0000 (08:35 +0100)]
update UPGRADING.INTERNALS
Anatol Belski [Sun, 12 Feb 2017 21:13:21 +0000 (22:13 +0100)]
The d_name member of struct dirent should be a pointer
Rework for
60950702 , so then any encoding is supported. The path
segment length is measured in wchar_t size, whereby the number
of wchar_t is 255+\0. This means, in the actual encoding, the path
segment size can become (255*<bytes per glyph>)+\0 bytes in worst
case. It is still valid, as all the FS API uses wide chars
internally.
Nikita Popov [Sun, 12 Feb 2017 21:03:53 +0000 (22:03 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 12 Feb 2017 21:03:21 +0000 (22:03 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 12 Feb 2017 21:02:39 +0000 (22:02 +0100)]
Revert "Fixed bug #74035"
This reverts commit
9ffc6ca62f53431a4b32b30cdda8180142f47cdb .
Derick Rethans [Sun, 12 Feb 2017 20:19:10 +0000 (20:19 +0000)]
Merge branch 'PHP-7.1'
Derick Rethans [Sun, 12 Feb 2017 20:19:02 +0000 (20:19 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Sun, 12 Feb 2017 20:17:01 +0000 (20:17 +0000)]
Upgrade timelib to 2017.01
This fixes:
- Fixed bug #72719 (Relative datetime format ignores weekday on sundays only).
- Fixed bug #73294 (DateTime wrong when date string is negative).
- Fixed bug #73489 (wrong timestamp when call setTimeZone multi times with UTC
offset).
- Fixed bug #73858 (first/last day of' flag is not being reset).
- Fixed bug #73942 ($date->modify('Friday this week') doesn't return a Friday
if $date is a Sunday).
- Fixed bug #74057 (wrong day when using "this week" in strtotime).
Anatol Belski [Sun, 12 Feb 2017 18:25:23 +0000 (19:25 +0100)]
remove loop
The limit is big enough, and it's questionable such amount of
random data can ever make sense anyway.
Anatol Belski [Sun, 12 Feb 2017 18:15:40 +0000 (19:15 +0100)]
fix loop
Anatol Belski [Sun, 12 Feb 2017 16:15:50 +0000 (17:15 +0100)]
refactor php_win32_get_random_bytes(), take 2
As in previous variant, locking is removed and the initialization
is done only once at process start. The CNG API turns out to be
faster, also the initialization is less resources hungry. The
initialization part could need to be improved, if too much startup
failures are sighted in the real world usage. Though that would mean
having locking back.
The usage of CNG was already pointed out and requested in several
reports, with the further refactoring it appears to make sense and
simplify things a backward compatible way.
Xinchen Hui [Sun, 12 Feb 2017 12:36:43 +0000 (20:36 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Fixed bug #74084 (Out of bound read - zend_mm_alloc_small)
Xinchen Hui [Sun, 12 Feb 2017 12:36:32 +0000 (20:36 +0800)]
Update NEWS
Xinchen Hui [Sun, 12 Feb 2017 12:36:18 +0000 (20:36 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74084 (Out of bound read - zend_mm_alloc_small)
Conflicts:
Zend/zend_operators.c
Xinchen Hui [Sun, 12 Feb 2017 12:34:08 +0000 (20:34 +0800)]
Fixed bug #74084 (Out of bound read - zend_mm_alloc_small)
Nikita Popov [Sun, 12 Feb 2017 11:51:12 +0000 (12:51 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 12 Feb 2017 11:50:14 +0000 (12:50 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
andrewnester [Wed, 1 Feb 2017 10:43:55 +0000 (13:43 +0300)]
Fixed bug #74021
Xinchen Hui [Sun, 12 Feb 2017 10:56:49 +0000 (18:56 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Fixed #73496 (Invalid memory access in zend_inline_hash_func)
Xinchen Hui [Sun, 12 Feb 2017 10:56:36 +0000 (18:56 +0800)]
Update NEWS
Xinchen Hui [Sun, 12 Feb 2017 10:56:11 +0000 (18:56 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed #73496 (Invalid memory access in zend_inline_hash_func)
Xinchen Hui [Sun, 12 Feb 2017 10:55:19 +0000 (18:55 +0800)]
Fixed #73496 (Invalid memory access in zend_inline_hash_func)
no test script is added because it requre too much memory
Nikita Popov [Sat, 11 Feb 2017 23:20:15 +0000 (00:20 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 11 Feb 2017 23:20:06 +0000 (00:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 11 Feb 2017 23:19:17 +0000 (00:19 +0100)]
run-tests: Exit 1 on BORKED tests
Nikita Popov [Sat, 11 Feb 2017 23:16:05 +0000 (00:16 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 11 Feb 2017 23:15:46 +0000 (00:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Adam Saponara [Sat, 11 Feb 2017 04:58:25 +0000 (23:58 -0500)]
Fixed bug #73118
Nikita Popov [Sat, 11 Feb 2017 23:06:47 +0000 (00:06 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 11 Feb 2017 23:06:20 +0000 (00:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Denis Yeldandi [Thu, 9 Feb 2017 07:22:37 +0000 (10:22 +0300)]
Fixed bug #69860
Anatol Belski [Sat, 11 Feb 2017 20:47:09 +0000 (21:47 +0100)]
Revert "refactor php_win32_get_random_bytes()"
This reverts commit
23bd7bcde03c31e2678f23f12c72c96c24800c92 .
Looks like this change is unstable. If same CSP is use but multiple processers,
the initialization failures are possible. Thus, CryptAcquireContext in
every process, even if it won't be used at all, is not sensible. This
might actually motivate to look for better CSP APIs.
Anatol Belski [Sat, 11 Feb 2017 18:15:35 +0000 (19:15 +0100)]
refactor php_win32_get_random_bytes()
- avoid locking
- initialize only once
- the process will fail, if no init failed
Anatol Belski [Sat, 11 Feb 2017 17:55:32 +0000 (18:55 +0100)]
Revert "move winsock specific stuff into dllmain"
This reverts commit
d94c2c796a1b032d53b382681f8413cc3d02d2da .
WSA functions are documented explicitly as unsafe for dllmain
Anatol Belski [Sat, 11 Feb 2017 15:46:17 +0000 (16:46 +0100)]
move winsock specific stuff into dllmain
Anatol Belski [Sat, 11 Feb 2017 13:53:20 +0000 (14:53 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
add missing datatype as sync for
5113909
Anatol Belski [Sat, 11 Feb 2017 13:51:15 +0000 (14:51 +0100)]
add missing datatype as sync for
5113909
Derick Rethans [Sat, 11 Feb 2017 11:10:17 +0000 (11:10 +0000)]
Merge branch 'PHP-7.1'
Derick Rethans [Sat, 11 Feb 2017 11:10:01 +0000 (11:10 +0000)]
Fixed bug #73837 ("new DateTime()" sometimes returns 1 second ago value).
Xinchen Hui [Fri, 10 Feb 2017 16:02:07 +0000 (00:02 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed typo
Xinchen Hui [Fri, 10 Feb 2017 16:01:38 +0000 (00:01 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed typo
Xinchen Hui [Fri, 10 Feb 2017 16:01:09 +0000 (00:01 +0800)]
Fixed typo
Dmitry Stogov [Fri, 10 Feb 2017 07:31:43 +0000 (10:31 +0300)]
Fixed bug #74053 (Corrupted class entries on shutdown when a destructor spawns another object). (jim at commercebyte dot com)
Merge branch 'master' of github.com:commercebyte/php-src
* 'master' of github.com:commercebyte/php-src:
Added EG(flags) - executor global flags EG_FLAGS_IN_SHUTDOWN - is set when PHP is in shutdown state
newly added zend_object_store.no_reuse is redefined as a global zend_object_store_no_reuse, to avoid alignment issues
Alignment fix, as per @nikic
The test scripts bug64720.phpt and bug68652.phpt were relying on the buggy behavior, when PHP returns "Undefined static property" error due to class entry corruption. With my fix for bug 74053, both tests return no errors now, I corrected the EXPECTF accordingly
Bug Fix: Corrupted class entries on shutdown when a destructor spawns another object (C) 2017 CommerceByte Consulting
Xinchen Hui [Fri, 10 Feb 2017 06:26:35 +0000 (14:26 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWs
Fixed bug #74019 (Segfault with list)
Xinchen Hui [Fri, 10 Feb 2017 06:26:18 +0000 (14:26 +0800)]
Update NEWs
Xinchen Hui [Fri, 10 Feb 2017 06:24:44 +0000 (14:24 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74019 (Segfault with list)
Xinchen Hui [Fri, 10 Feb 2017 06:24:01 +0000 (14:24 +0800)]
Fixed bug #74019 (Segfault with list)
Jim Zubov [Thu, 9 Feb 2017 17:40:33 +0000 (12:40 -0500)]
Added EG(flags) - executor global flags
EG_FLAGS_IN_SHUTDOWN - is set when PHP is in shutdown state
Jim Zubov [Wed, 8 Feb 2017 02:13:39 +0000 (21:13 -0500)]
newly added zend_object_store.no_reuse is redefined as a global zend_object_store_no_reuse,
to avoid alignment issues
Nikita Popov [Wed, 8 Feb 2017 00:10:54 +0000 (01:10 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 8 Feb 2017 00:10:37 +0000 (01:10 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Zheng SHAO [Wed, 18 Jan 2017 09:50:21 +0000 (18:50 +0900)]
Fixed bug #61471