]>
granicus.if.org Git - php/log
Christoph M. Becker [Wed, 10 Aug 2016 16:09:38 +0000 (18:09 +0200)]
Update to SQLite 3.14.0
Keyur [Tue, 9 Aug 2016 17:30:26 +0000 (17:30 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Add NEWS
Fix ASSERT logic
Bugfix 72791: fix memory leak in PDO persistent connections
Keyur [Tue, 9 Aug 2016 17:29:36 +0000 (17:29 +0000)]
Add NEWS
Keyur [Tue, 9 Aug 2016 17:27:52 +0000 (17:27 +0000)]
Merge branch 'pull-request/2067' into PHP-7.0
Keyur [Tue, 9 Aug 2016 14:41:20 +0000 (14:41 +0000)]
Fix ASSERT logic
Keyur [Tue, 9 Aug 2016 14:01:25 +0000 (14:01 +0000)]
Bugfix 72791: fix memory leak in PDO persistent connections
Nikita Popov [Tue, 9 Aug 2016 13:35:04 +0000 (15:35 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 9 Aug 2016 13:33:15 +0000 (15:33 +0200)]
Don't copy mime types in CLI server
This is both unnecessary and causes leaks in valgrind.
Christoph M. Becker [Tue, 9 Aug 2016 09:54:43 +0000 (11:54 +0200)]
Class constant visibility modifiers are now supported
Christopher Jones [Tue, 9 Aug 2016 06:13:27 +0000 (16:13 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Tue, 9 Aug 2016 06:12:58 +0000 (16:12 +1000)]
Remove obsolete Id tags
Christopher Jones [Tue, 9 Aug 2016 06:00:44 +0000 (16:00 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Tue, 9 Aug 2016 05:59:59 +0000 (15:59 +1000)]
Bump version in OCI8 test
Xinchen Hui [Tue, 9 Aug 2016 03:32:55 +0000 (11:32 +0800)]
Update NEWS
Xinchen Hui [Tue, 9 Aug 2016 03:32:34 +0000 (11:32 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #72788 (Invalid memory access when using persistent PDO connection)
Remove typo'd commit
Fix bug 72788: Invalid memory access when database_object_handle is undefined. Also fix memory leak in dbh_free when using persistent PDO connections.
Xinchen Hui [Tue, 9 Aug 2016 03:32:16 +0000 (11:32 +0800)]
Fixed bug #72788 (Invalid memory access when using persistent PDO connection)
Xinchen Hui [Tue, 9 Aug 2016 03:25:32 +0000 (11:25 +0800)]
Merge branch 'bug72788' of https://github.com/keyurdg/php-src into PHP-7.0
* 'bug72788' of https://github.com/keyurdg/php-src:
Remove typo'd commit
Fix bug 72788: Invalid memory access when database_object_handle is undefined. Also fix memory leak in dbh_free when using persistent PDO connections.
Keyur [Tue, 9 Aug 2016 01:36:15 +0000 (01:36 +0000)]
Remove typo'd commit
Keyur [Mon, 8 Aug 2016 23:34:00 +0000 (23:34 +0000)]
Fix bug 72788: Invalid memory access when database_object_handle
is undefined. Also fix memory leak in dbh_free when using persistent
PDO connections.
Leigh [Mon, 8 Aug 2016 21:31:59 +0000 (22:31 +0100)]
Swap min/max if min > max
Leigh [Mon, 8 Aug 2016 21:16:27 +0000 (22:16 +0100)]
Allow min > max for mt_rand(). Bug #72784
Andrea Faulds [Mon, 8 Aug 2016 20:00:49 +0000 (21:00 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrea Faulds [Mon, 8 Aug 2016 19:56:11 +0000 (20:56 +0100)]
Replace dead branch with ZEND_ASSERT()
Christoph M. Becker [Mon, 8 Aug 2016 16:51:34 +0000 (18:51 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Mon, 8 Aug 2016 16:46:54 +0000 (18:46 +0200)]
Fix array_column() packed hash initialization
FILL assumes enough space is alredy allocated -- do that. Note that
the used size is an upper bound, albeit a likely one.
Christoph M. Becker [Mon, 8 Aug 2016 16:45:27 +0000 (18:45 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 8 Aug 2016 16:43:33 +0000 (18:43 +0200)]
Add test for bug #69107: finfo no longer detects PHP files
Anatol Belski [Sat, 6 Aug 2016 20:33:29 +0000 (22:33 +0200)]
check malloc result
Christoph M. Becker [Sun, 7 Aug 2016 23:27:21 +0000 (01:27 +0200)]
Implement #38992: invoke() and invokeArgs() static method calls should match
We don't want ReflectionMethod::invoke() to simply ignore its first argument,
if the method to invoke is a static method. Instead we match its ZPP with
that of ReflectionMethod::invokeArgs(). Furthermore, we apply the DRY
principle by factoring out the code to a common helper function to prevent
inadvertent future divergence of the implementations of both methods.
As can be seen from the necessity to adapt some test cases, this causes a
BC break for some pathological cases. Therefore we apply this patch to PHP
7.1 only, which is still in beta phase.
Nikita Popov [Sun, 7 Aug 2016 16:50:14 +0000 (18:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Lauri Kenttä [Wed, 3 Aug 2016 08:29:12 +0000 (11:29 +0300)]
Fix bug #55451
Make substr_compare ignore the length if it's NULL. This allows to
use the last parameter (case_insensitivity) with the default length.
Nikita Popov [Sun, 7 Aug 2016 16:38:43 +0000 (18:38 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 7 Aug 2016 16:38:28 +0000 (18:38 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sun, 7 Aug 2016 16:36:32 +0000 (18:36 +0200)]
Fix stream_socket_enable_crypto() test
The whole test doesn't make any sense at all, but this only fixes
the additional warnings you get when linked against openssl w/o
SSL3.
Nikita Popov [Sun, 7 Aug 2016 14:44:31 +0000 (16:44 +0200)]
Fix PUTC warning
Change the macro to not provide a useless return value using a
comma expression, which generates warnings.
Nikita Popov [Thu, 4 Aug 2016 13:12:33 +0000 (15:12 +0200)]
Avoid use of scratch space in HTTP fopen wrapper
Instead directly write into req_buf smart_str.
Christopher Jones [Sun, 7 Aug 2016 00:25:16 +0000 (10:25 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Sun, 7 Aug 2016 00:24:56 +0000 (10:24 +1000)]
Remove old $Id$ tags
Christopher Jones [Sun, 7 Aug 2016 00:21:14 +0000 (10:21 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Sun, 7 Aug 2016 00:17:06 +0000 (10:17 +1000)]
Sync with 7.1 branch changes from Nikita & Dimitri to keep OCI8 code identical
Christopher Jones [Sun, 7 Aug 2016 00:06:11 +0000 (10:06 +1000)]
News for 7.1
Christopher Jones [Sun, 7 Aug 2016 00:02:14 +0000 (10:02 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Thu, 4 Aug 2016 02:45:32 +0000 (12:45 +1000)]
Fix bug #72524 (Binding null values triggers ORA-24816 error)
Leigh [Sat, 6 Aug 2016 10:15:26 +0000 (11:15 +0100)]
mt_rand 32/64-bit consistency
Kalle Sommer Nielsen [Sat, 6 Aug 2016 10:08:13 +0000 (12:08 +0200)]
Fix the fix (Nikita), thanks!
Kalle Sommer Nielsen [Sat, 6 Aug 2016 08:17:49 +0000 (10:17 +0200)]
Check the return value of dbconvert() in mssql_guid_string(), as it may return -1 in case the conversion failed. In that case false is returned.
Also initialize buffer and buffer2 to NULL, which should fix bug #72039 (Use of uninitialised value on mssql_guid_string).
This only applies to 5.6, as we do not have mssql in 7.0 anymore
Nikita Popov [Fri, 5 Aug 2016 21:09:53 +0000 (23:09 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 5 Aug 2016 21:09:30 +0000 (23:09 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/standard/ftp_fopen_wrapper.c
Ville Hukkamaki [Fri, 5 Aug 2016 13:09:13 +0000 (16:09 +0300)]
Fix #72764
Negotiate data channel encryption after NLST command.
This is to prevent issues with IIS and ProFTPD.
Nikita Popov [Fri, 5 Aug 2016 17:56:02 +0000 (19:56 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 5 Aug 2016 17:51:51 +0000 (19:51 +0200)]
Fix bug #72767
The page size calculation did not account for the size of the
stack header (or rather it did account for it, but in the wrong
direction...)
Nikita Popov [Fri, 5 Aug 2016 14:30:57 +0000 (16:30 +0200)]
Add assertion to prevent type narrowing
Currently type narrowing is always a bug, make sure we know about
it.
Nikita Popov [Fri, 5 Aug 2016 14:27:55 +0000 (16:27 +0200)]
Fixed bug #72762
ju1ius [Sat, 30 Jul 2016 11:55:46 +0000 (13:55 +0200)]
Fix #72711: `mb_ereg` does not clear the `$regs` parameter on failure
When `mb_ereg` failed to match, it didn't update the `$regs` argument.
Now it will always set it to the empty array.
Ville Hukkamäki [Thu, 28 Jul 2016 19:17:20 +0000 (19:17 +0000)]
Implement request #27814
Construct HTTP request headers into smart_str and send whole
request in one go.
Xinchen Hui [Thu, 4 Aug 2016 11:10:40 +0000 (19:10 +0800)]
Fixed bug #72743 (Out-of-bound read in php_stream_filter_create)
Christoph M. Becker [Thu, 4 Aug 2016 10:10:34 +0000 (12:10 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Thu, 4 Aug 2016 10:09:16 +0000 (12:09 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 4 Aug 2016 10:06:07 +0000 (12:06 +0200)]
Fix broken skip marker in test case
Matteo Beccati [Thu, 4 Aug 2016 07:37:40 +0000 (09:37 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Clean up FR #72633
Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.
Conflicts:
ext/oci8/package.xml
Matteo Beccati [Thu, 4 Aug 2016 07:30:48 +0000 (09:30 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Clean up FR #72633
Matteo Beccati [Thu, 4 Aug 2016 07:28:58 +0000 (09:28 +0200)]
Clean up FR #72633
Christopher Jones [Thu, 4 Aug 2016 04:48:07 +0000 (14:48 +1000)]
Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.
Christopher Jones [Thu, 4 Aug 2016 07:01:57 +0000 (17:01 +1000)]
Fixed invalid handle error with Implicit Result Sets
Christopher Jones [Thu, 4 Aug 2016 04:48:07 +0000 (14:48 +1000)]
Fixed invalid handle error with Implicit Result Sets and bump OCI8 version.
Christopher Jones [Thu, 4 Aug 2016 06:45:29 +0000 (16:45 +1000)]
Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0
Stanislav Malyshev [Thu, 4 Aug 2016 06:03:15 +0000 (23:03 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #72716 - initialize buffer before read
Stanislav Malyshev [Thu, 4 Aug 2016 06:00:32 +0000 (23:00 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #72716 - initialize buffer before read
Conflicts:
ext/standard/ftp_fopen_wrapper.c
Stanislav Malyshev [Thu, 4 Aug 2016 05:59:01 +0000 (22:59 -0700)]
Fix bug #72716 - initialize buffer before read
Ferenc Kovacs [Wed, 3 Aug 2016 23:43:27 +0000 (01:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Wed, 3 Aug 2016 23:42:00 +0000 (01:42 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
configure.in
main/php_version.h
Ferenc Kovacs [Wed, 3 Aug 2016 23:39:37 +0000 (01:39 +0200)]
5.6.26 will be next
Nikita Popov [Wed, 3 Aug 2016 21:09:17 +0000 (23:09 +0200)]
Fix leak on self-referencing constants
Davey Shafik [Wed, 3 Aug 2016 19:31:15 +0000 (12:31 -0700)]
Move fix for #72735 to 7.1.0beta3
Anatol Belski [Wed, 3 Aug 2016 16:26:29 +0000 (18:26 +0200)]
improve the check, avoid strlen on NULL
Kalle Sommer Nielsen [Wed, 3 Aug 2016 15:05:31 +0000 (17:05 +0200)]
Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).
Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the EXIF parsing to be interrupted. This is a regression from earlier which was most likely a part of a security fix for MAKERNOTE.
The new behavior is to instead of stopping to parse, to continue so we can still fetch data like thumbnail and GPS, thrus allowing yet unsupported formats to parse. If EXIF's debugging mode is enabled, a notice will display in case we do not match against a valid MAKERNOTE signature.
This should temporarily fix bug #72682 (exif_read_data() fails to read all data for some images) until I get around to debug it further.
Jakub Zelenka [Wed, 3 Aug 2016 19:01:41 +0000 (20:01 +0100)]
Do not add already added object to the internal OpenSSL table
This fixes OpenSSL 1.1 where adding object with OID that has been
already added causes an error - preventing of duplication.
Anatol Belski [Wed, 3 Aug 2016 16:29:42 +0000 (18:29 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
improve the check, avoid strlen on NULL
Anatol Belski [Wed, 3 Aug 2016 16:28:48 +0000 (18:28 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
improve the check, avoid strlen on NULL
Anatol Belski [Wed, 3 Aug 2016 16:26:29 +0000 (18:26 +0200)]
improve the check, avoid strlen on NULL
Anatol Belski [Wed, 3 Aug 2016 15:42:45 +0000 (17:42 +0200)]
update NEWS
Anatol Belski [Wed, 3 Aug 2016 15:40:38 +0000 (17:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
update NEWS
Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).
Anatol Belski [Wed, 3 Aug 2016 15:39:55 +0000 (17:39 +0200)]
update NEWS
Anatol Belski [Wed, 3 Aug 2016 15:39:22 +0000 (17:39 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).
Anatol Belski [Wed, 3 Aug 2016 15:38:11 +0000 (17:38 +0200)]
update NEWS
Kalle Sommer Nielsen [Wed, 3 Aug 2016 15:05:31 +0000 (17:05 +0200)]
Changed the way MAKERNOTE is handled in case we do not have a matching signature (Remi).
Before this patch, exif_process_IFD_in_MAKERNOTE() would return false, then causing the rest of the EXIF parsing to be interrupted. This is a regression from earlier which was most likely a part of a security fix for MAKERNOTE.
The new behavior is to instead of stopping to parse, to continue so we can still fetch data like thumbnail and GPS, thrus allowing yet unsupported formats to parse. If EXIF's debugging mode is enabled, a notice will display in case we do not match against a valid MAKERNOTE signature.
This should temporarily fix bug #72682 (exif_read_data() fails to read all data for some images) until I get around to debug it further.
(cherry picked from commit
aabcb5481d9e717df77192dab2894468b9fc63b4 )
Anatol Belski [Wed, 3 Aug 2016 13:06:39 +0000 (15:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update libs_versions.txt
update libs_versions.txt
Anatol Belski [Wed, 3 Aug 2016 13:06:02 +0000 (15:06 +0200)]
update libs_versions.txt
Anatol Belski [Wed, 3 Aug 2016 13:05:39 +0000 (15:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update libs_versions.txt
Anatol Belski [Wed, 3 Aug 2016 13:03:41 +0000 (15:03 +0200)]
update libs_versions.txt
Remi Collet [Wed, 3 Aug 2016 12:27:46 +0000 (14:27 +0200)]
Minor revert of
be3640150cb2f88d38a8d405b2bf708f04be39ef
On 32bits this may cause php to hangs forever.
Remi Collet [Wed, 3 Aug 2016 12:24:35 +0000 (14:24 +0200)]
fix paths in tests
Remi Collet [Wed, 3 Aug 2016 10:59:14 +0000 (12:59 +0200)]
clean removed functions (since they are alias)
Remi Collet [Wed, 3 Aug 2016 10:56:07 +0000 (12:56 +0200)]
Fix 32bits tests
Notice: this warning is only raise since rand is an alias to mt_rand
Anatol Belski [Wed, 3 Aug 2016 10:20:23 +0000 (12:20 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix ts build
Anatol Belski [Wed, 3 Aug 2016 10:19:29 +0000 (12:19 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix ts build
Anatol Belski [Wed, 3 Aug 2016 10:16:42 +0000 (12:16 +0200)]
fix ts build
Remi Collet [Wed, 3 Aug 2016 09:03:22 +0000 (11:03 +0200)]
add skipif (needs json)
Xinchen Hui [Wed, 3 Aug 2016 04:37:14 +0000 (12:37 +0800)]
It's packed array
Xinchen Hui [Wed, 3 Aug 2016 04:06:04 +0000 (12:06 +0800)]
Optmized array_rand