]>
granicus.if.org Git - php/log
Anatol Belski [Sun, 24 Jul 2016 01:43:17 +0000 (03:43 +0200)]
rework long path normalization stuf
Simplify, set error codes, ensure 32-bit is ok as well. The
canonicalization part is still an issue on win7 as the API
is missing there. However a partial improvement is reached
there as well thanks to the slash conversion.
Nikita Popov [Sat, 23 Jul 2016 22:18:51 +0000 (00:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 23 Jul 2016 22:18:47 +0000 (00:18 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 23 Jul 2016 22:13:42 +0000 (00:13 +0200)]
More tolerance in another IntlCalendar test
Again, off-by-1000 is expected if we're late in the second. Add an
extra 1000 to account for actual delta in call times.
Nikita Popov [Sat, 23 Jul 2016 22:08:18 +0000 (00:08 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 23 Jul 2016 22:06:55 +0000 (00:06 +0200)]
Ensure session GC is not run during variation6.phpt
The implemented gc() handler simply deletes all sessions, including
the current one. This may cause a subsequent unlink() warning.
Avoid this by preventing GC from running.
Anatol Belski [Sat, 23 Jul 2016 21:22:08 +0000 (23:22 +0200)]
add folds
Anatol Belski [Sat, 23 Jul 2016 21:21:17 +0000 (23:21 +0200)]
improve typedef and fix the fake function
Anatol Belski [Sat, 23 Jul 2016 20:13:58 +0000 (22:13 +0200)]
add missing cast
Sjon Hortensius [Sat, 23 Jul 2016 14:15:48 +0000 (16:15 +0200)]
Fix typos, previous version used reserver/reserverd/reserved
Anatol Belski [Sat, 23 Jul 2016 16:07:03 +0000 (18:07 +0200)]
Fixed bug #72625 realpath() fails on non canonical long path
Anatol Belski [Fri, 22 Jul 2016 21:51:46 +0000 (23:51 +0200)]
correct comment
Anatol Belski [Fri, 22 Jul 2016 15:04:33 +0000 (17:04 +0200)]
don't return long path prefix to script
Anatol Belski [Sat, 23 Jul 2016 19:06:11 +0000 (21:06 +0200)]
fix test
Anatol Belski [Sat, 23 Jul 2016 19:04:52 +0000 (21:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test
Anatol Belski [Sat, 23 Jul 2016 19:03:45 +0000 (21:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix test
Anatol Belski [Sat, 23 Jul 2016 18:55:39 +0000 (20:55 +0200)]
fix test
Christoph M. Becker [Sat, 23 Jul 2016 17:37:58 +0000 (19:37 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 23 Jul 2016 17:31:50 +0000 (19:31 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 23 Jul 2016 17:29:43 +0000 (19:29 +0200)]
Fix #68712: suspicious if-else statements
Christoph M. Becker [Sat, 23 Jul 2016 16:13:29 +0000 (18:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 23 Jul 2016 16:12:14 +0000 (18:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 23 Jul 2016 16:09:18 +0000 (18:09 +0200)]
Fix copy&paste errors in gd_interpolation.c
According to <https://github.com/libgd/libgd/commit/
f101380 >.
Christoph M. Becker [Sat, 23 Jul 2016 14:56:11 +0000 (16:56 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sat, 23 Jul 2016 14:50:16 +0000 (16:50 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Sat, 23 Jul 2016 14:48:07 +0000 (16:48 +0200)]
Fix #66555: Always false condition in ext/gd/libgd/gdkanji.c
This issue has already been fixed in libgd[1], so we fix PHP's bundled
libgd accordingly.
[1] <https://github.com/libgd/libgd/commit/
aa1d71c >
Bob Weinand [Sat, 23 Jul 2016 14:40:02 +0000 (16:40 +0200)]
Merge remote-tracking branch 'origin/PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 23 Jul 2016 14:39:21 +0000 (16:39 +0200)]
Fix ClosedGeneratorException possibly thrown into wrong scope
Nikita Popov [Sat, 23 Jul 2016 11:30:16 +0000 (13:30 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 23 Jul 2016 11:29:57 +0000 (13:29 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/standard/ftp_fopen_wrapper.c
vhuk [Thu, 21 Jul 2016 09:20:06 +0000 (12:20 +0300)]
Fix for bug #54431
Nikita Popov [Fri, 22 Jul 2016 22:12:11 +0000 (00:12 +0200)]
Fix build
Missed this occurrence...
Nikita Popov [Fri, 22 Jul 2016 22:00:13 +0000 (00:00 +0200)]
Make sure TOKEN_PARSE mode is thread safe
Introduce an on_event_context passed to the on_event hook. Use this
context to pass along the token array. Previously this was stored
in a non-tls global :/
Nikita Popov [Fri, 22 Jul 2016 16:30:30 +0000 (18:30 +0200)]
Use OPENSSL_RAW_DATA in raw data decryption tests
Nikita Popov [Fri, 22 Jul 2016 16:20:34 +0000 (18:20 +0200)]
Make base64_decode() in non-strict mode binary safe
Nikita Popov [Fri, 22 Jul 2016 16:07:45 +0000 (18:07 +0200)]
Add NEWS entries
Lauri Kenttä [Mon, 11 Jul 2016 09:57:09 +0000 (12:57 +0300)]
base64_decode: Add tests
Lauri Kenttä [Mon, 11 Jul 2016 09:40:10 +0000 (12:40 +0300)]
base64_decode: Handle all invalid padding equally
Lauri Kenttä [Mon, 11 Jul 2016 09:40:08 +0000 (12:40 +0300)]
base64_decode: strict: Fail on excessive padding
Lauri Kenttä [Mon, 11 Jul 2016 09:40:07 +0000 (12:40 +0300)]
base64_decode: strict: Fail on truncated input
Lauri Kenttä [Mon, 11 Jul 2016 09:40:05 +0000 (12:40 +0300)]
base64_decode: Avoid code duplication in failures
Lauri Kenttä [Mon, 11 Jul 2016 09:40:03 +0000 (12:40 +0300)]
Require strict base64 in data URI
As the tests already show, the data URI wrapper is supposed to fail
for corrupt input, but for some reason, one case of invalid input is
still allowed to pass?! Strict base64 makes a lot more sense here.
Also, Chromium and Firefox fail on invalid base64, so it's a logical
choice for PHP as well.
Lauri Kenttä [Mon, 11 Jul 2016 09:40:01 +0000 (12:40 +0300)]
Require strict base64 in openssl_decode
Using invalid data in a security-related context makes no sense,
and there's even a test which depends on invalid base64 data failing,
even though it currently fails for the wrong reasons by sheer luck.
Lauri Kenttä [Mon, 11 Jul 2016 09:39:57 +0000 (12:39 +0300)]
Fix test: Use valid base64 even for invalid OpenSSL data
Nikita Popov [Fri, 22 Jul 2016 15:22:29 +0000 (17:22 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 22 Jul 2016 15:22:13 +0000 (17:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Fri, 22 Jul 2016 15:20:56 +0000 (17:20 +0200)]
Make IntlCalendar::getNow() test more tolerant
Due to the *1000 factor the two values may be off-by-1000 even
without any actual delay, so increase the check to 2000.
Xinchen Hui [Fri, 22 Jul 2016 15:15:24 +0000 (23:15 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements)
Xinchen Hui [Fri, 22 Jul 2016 15:13:42 +0000 (23:13 +0800)]
Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements)
Xinchen Hui [Fri, 22 Jul 2016 15:14:51 +0000 (23:14 +0800)]
Update NEWs
Xinchen Hui [Fri, 22 Jul 2016 15:14:28 +0000 (23:14 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements)
Xinchen Hui [Fri, 22 Jul 2016 15:13:42 +0000 (23:13 +0800)]
Fixed bug #72647 (xmlrpc_encode() unexpected output after referencing array elements)
Christoph M. Becker [Fri, 22 Jul 2016 13:28:42 +0000 (15:28 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 22 Jul 2016 13:27:16 +0000 (15:27 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/spl/spl_directory.c
Christoph M. Becker [Fri, 22 Jul 2016 12:55:13 +0000 (14:55 +0200)]
Fix #72646: SplFileObject::getCsvControl does not return the escape character
This has obviously been missed when adding the $escape parameter to
SplFileObject::setCsvControl() in PHP 5.3, so we catch up on this.
Remi Collet [Fri, 22 Jul 2016 07:37:00 +0000 (09:37 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
FPM: add test for CVE-2016-5385
Remi Collet [Fri, 22 Jul 2016 07:36:36 +0000 (09:36 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
FPM: add test for CVE-2016-5385
Remi Collet [Fri, 22 Jul 2016 07:35:09 +0000 (09:35 +0200)]
FPM: add test for CVE-2016-5385
Christoph M. Becker [Thu, 21 Jul 2016 16:53:00 +0000 (18:53 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 21 Jul 2016 16:38:44 +0000 (18:38 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 21 Jul 2016 16:36:12 +0000 (18:36 +0200)]
Fix #72330: CSV fields incorrectly split if escape char followed by UTF chars
We must not forget to properly reset the state for multibyte characters
following an escape character.
Christoph M. Becker [Thu, 21 Jul 2016 14:51:19 +0000 (16:51 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 21 Jul 2016 14:50:37 +0000 (16:50 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Pieter Hordijk [Fri, 15 Jul 2016 19:58:13 +0000 (21:58 +0200)]
Removed incorrect (leftover?) sentence in ini
about mbstring or iconv output handler
Christoph M. Becker [Thu, 21 Jul 2016 14:33:06 +0000 (16:33 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 21 Jul 2016 14:31:16 +0000 (16:31 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Pieter Hordijk [Fri, 15 Jul 2016 19:58:13 +0000 (21:58 +0200)]
Removed incorrect (leftover?) sentence in ini
about mbstring or iconv output handler
Davey Shafik [Thu, 21 Jul 2016 08:49:15 +0000 (01:49 -0700)]
Update NEWS for 7.1.0beta1
Remi Collet [Thu, 21 Jul 2016 06:42:53 +0000 (08:42 +0200)]
bump zip extension version
Remi Collet [Thu, 21 Jul 2016 06:43:49 +0000 (08:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
bump zip extension version
Remi Collet [Thu, 21 Jul 2016 06:42:53 +0000 (08:42 +0200)]
bump zip extension version
Xinchen Hui [Thu, 21 Jul 2016 06:25:54 +0000 (14:25 +0800)]
Update NEWS
Xinchen Hui [Thu, 21 Jul 2016 06:25:36 +0000 (14:25 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property)
Xinchen Hui [Thu, 21 Jul 2016 06:25:15 +0000 (14:25 +0800)]
Fixed bug #72639 (Segfault when instantiating class that extends IntlCalendar and adds a property)
Davey Shafik [Thu, 21 Jul 2016 03:05:58 +0000 (20:05 -0700)]
Prepare NEWS for beta2
Anatol Belski [Wed, 20 Jul 2016 23:56:55 +0000 (01:56 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update libs_version.txt
update libs_versions.txt
Anatol Belski [Wed, 20 Jul 2016 23:55:42 +0000 (01:55 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update libs_versions.txt
Anatol Belski [Wed, 20 Jul 2016 23:54:53 +0000 (01:54 +0200)]
update libs_version.txt
Anatol Belski [Wed, 20 Jul 2016 23:52:03 +0000 (01:52 +0200)]
update libs_versions.txt
Ferenc Kovacs [Wed, 20 Jul 2016 22:38:11 +0000 (00:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Wed, 20 Jul 2016 22:37:41 +0000 (00:37 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 20 Jul 2016 22:36:07 +0000 (00:36 +0200)]
update NEWs
Davey Shafik [Wed, 20 Jul 2016 21:48:15 +0000 (14:48 -0700)]
Update NEWS for RFC: Additional Context in pcntl_signal Handler
Davey Shafik [Wed, 20 Jul 2016 21:17:04 +0000 (14:17 -0700)]
Merge RFC Additional Context in pcntl_signal Handler
Jakub Zelenka [Wed, 20 Jul 2016 18:34:30 +0000 (19:34 +0100)]
Update NEWS with fixed OpenSSL 1.1 build
Jakub Zelenka [Wed, 20 Jul 2016 18:32:07 +0000 (19:32 +0100)]
Merge branch 'openssl_1_1_port'
Christoph M. Becker [Wed, 20 Jul 2016 17:26:29 +0000 (19:26 +0200)]
Add test case for imagecopyresampled() with alpha
Anatol Belski [Wed, 20 Jul 2016 16:01:41 +0000 (18:01 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
regenerate date parser with re2c 0.13.5 to fix OSX issues
Anatol Belski [Wed, 20 Jul 2016 16:00:53 +0000 (18:00 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
regenerate date parser with re2c 0.13.5 to fix OSX issues
Anatol Belski [Wed, 20 Jul 2016 15:57:39 +0000 (17:57 +0200)]
regenerate date parser with re2c 0.13.5 to fix OSX issues
Anatol Belski [Wed, 20 Jul 2016 11:37:17 +0000 (13:37 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
regenerate date parser with re2c 0.13.5
Anatol Belski [Wed, 20 Jul 2016 11:32:53 +0000 (13:32 +0200)]
regenerate date parser with re2c 0.13.5
Xinchen Hui [Wed, 20 Jul 2016 10:09:17 +0000 (18:09 +0800)]
Fixed arginfo
Xinchen Hui [Wed, 20 Jul 2016 10:08:48 +0000 (18:08 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed arginfo
Xinchen Hui [Wed, 20 Jul 2016 10:07:18 +0000 (18:07 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed arginfo
Xinchen Hui [Wed, 20 Jul 2016 10:07:02 +0000 (18:07 +0800)]
Fixed arginfo
Derick Rethans [Wed, 20 Jul 2016 09:21:19 +0000 (10:21 +0100)]
Merge branch 'PHP-7.0'
Derick Rethans [Wed, 20 Jul 2016 09:21:03 +0000 (10:21 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Wed, 20 Jul 2016 09:19:53 +0000 (10:19 +0100)]
Regenerate with the -b flag, as we used to do.
Apparently, Apple's LLVM can't handle it otherwise o_O.
Xinchen Hui [Wed, 20 Jul 2016 09:01:53 +0000 (17:01 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed typo