]>
granicus.if.org Git - php/log
Stanislav Malyshev [Tue, 24 Apr 2018 05:03:33 +0000 (22:03 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 24 Apr 2018 05:00:24 +0000 (22:00 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Tue, 24 Apr 2018 04:59:50 +0000 (21:59 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix tsrm_ls
Fix #76129 - remove more potential unfiltered outputs for phar
Fix test
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Fix bug #76249 - fail on invalid sequences
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Mon, 23 Apr 2018 23:48:27 +0000 (16:48 -0700)]
Fix tsrm_ls
Stanislav Malyshev [Mon, 23 Apr 2018 20:44:19 +0000 (13:44 -0700)]
Merge remote-tracking branch 'security/bug76249' into PHP-5.6
* security/bug76249:
Fix test
Fix bug #76249 - fail on invalid sequences
Stanislav Malyshev [Mon, 23 Apr 2018 20:44:12 +0000 (13:44 -0700)]
Merge remote-tracking branch 'security/bug76248' into PHP-5.6
* security/bug76248:
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Stanislav Malyshev [Wed, 28 Mar 2018 04:22:28 +0000 (21:22 -0700)]
Fix #76129 - remove more potential unfiltered outputs for phar
Stanislav Malyshev [Mon, 23 Apr 2018 20:42:51 +0000 (13:42 -0700)]
Merge remote-tracking branch 'security/PHP-5.6' into PHP-5.6
* security/PHP-5.6:
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
Fix bug #75981: prevent reading beyond buffer start
Stanislav Malyshev [Mon, 23 Apr 2018 05:19:51 +0000 (22:19 -0700)]
Fix test
Stanislav Malyshev [Mon, 23 Apr 2018 05:01:35 +0000 (22:01 -0700)]
Fix bug #76248 - Malicious LDAP-Server Response causes Crash
Stanislav Malyshev [Mon, 23 Apr 2018 04:26:06 +0000 (21:26 -0700)]
Fix bug #76249 - fail on invalid sequences
Stanislav Malyshev [Mon, 23 Apr 2018 03:28:35 +0000 (20:28 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add a bit of defensive conding for bug #76155
Stanislav Malyshev [Mon, 23 Apr 2018 03:27:42 +0000 (20:27 -0700)]
Add a bit of defensive conding for bug #76155
Even though it should not be ever negative, since strlen() is size_t
better to be safe than sorry.
Christoph M. Becker [Tue, 27 Mar 2018 16:42:55 +0000 (18:42 +0200)]
Fix #76130: Heap Buffer Overflow (READ: 1786) in exif_iif_add_value
The MakerNote is not necessarily null-terminated, so we must not use
`strlen()` to avoid OOB reads. Instead `php_strnlen()` is the proper
way to handle this.
Jakub Zelenka [Sun, 15 Apr 2018 19:42:28 +0000 (20:42 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Sun, 15 Apr 2018 19:41:23 +0000 (20:41 +0100)]
Make openssl_error_string test work in OpenSSL 1.1.1
It was the only failing test
Nikita Popov [Sat, 14 Apr 2018 11:06:00 +0000 (13:06 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Aron Rotteveel [Mon, 26 Mar 2018 12:39:36 +0000 (14:39 +0200)]
reset imap_errorstack after outputting it
This happens in `imap_errors` as well, but seems to be omitted in the `shutdown` routine.
Jakub Zelenka [Fri, 13 Apr 2018 19:17:52 +0000 (20:17 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Fri, 13 Apr 2018 19:17:24 +0000 (20:17 +0100)]
[ci skip] Update NEWS with fpm acl fix
Jakub Zelenka [Fri, 13 Apr 2018 19:12:03 +0000 (20:12 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Michał Górny [Fri, 2 Mar 2018 15:19:34 +0000 (16:19 +0100)]
Support using acl_* functions on *BSD
The *BSD systems have ACL routines built-in in libc rather than
in separate libacl. Update the configure check to detect that and enable
ACL support without adding 'acl' library.
Christoph M. Becker [Fri, 13 Apr 2018 13:27:59 +0000 (15:27 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix arginfo for array_replace(_recursive) and array_merge(_recursive)
Gabriel Caruso [Sun, 25 Mar 2018 17:53:57 +0000 (14:53 -0300)]
Fix arginfo for array_replace(_recursive) and array_merge(_recursive)
Christoph M. Becker [Thu, 12 Apr 2018 21:00:37 +0000 (23:00 +0200)]
Fix #76164: exif_read_data zend_mm_heap corrupted
We must not release parsed parameters ourselves, since this is already
done by the engine.
Anatol Belski [Thu, 12 Apr 2018 16:25:58 +0000 (18:25 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix memory leak
Anatol Belski [Thu, 12 Apr 2018 16:25:27 +0000 (18:25 +0200)]
Fix memory leak
Anatol Belski [Thu, 12 Apr 2018 16:23:23 +0000 (18:23 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
bump versions
Christoph M. Becker [Thu, 12 Apr 2018 16:11:41 +0000 (18:11 +0200)]
Andrew Nester [Tue, 11 Jul 2017 18:50:38 +0000 (21:50 +0300)]
Fixed #74892 - Fixed URL rewriting for urls started with #
(cherry picked from commit
6c32d271d238a18cfc19d98877cdead1ab38f417 )
This should have already been merged via
9cd82df0bbb1f9a1407ffb749292576be1b91c07 , but that merge went wrong.
Joe Watkins [Wed, 11 Apr 2018 06:08:52 +0000 (08:08 +0200)]
bump versions
Remi Collet [Wed, 11 Apr 2018 05:53:53 +0000 (07:53 +0200)]
next is 7.2.6
George Wang [Tue, 10 Apr 2018 20:49:29 +0000 (16:49 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
George Wang [Tue, 10 Apr 2018 20:48:04 +0000 (16:48 -0400)]
Updated LiteSpeed SAPI to 7.1 .
Xinchen Hui [Tue, 10 Apr 2018 08:33:31 +0000 (16:33 +0800)]
Update NEWS
Xinchen Hui [Tue, 10 Apr 2018 08:32:28 +0000 (16:32 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite)
Xinchen Hui [Tue, 10 Apr 2018 08:32:08 +0000 (16:32 +0800)]
Fixed bug #76143 (Memory corruption: arbitrary NUL overwrite)
Anatol Belski [Thu, 5 Apr 2018 14:45:41 +0000 (16:45 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Group common flags
Anatol Belski [Thu, 5 Apr 2018 14:44:12 +0000 (16:44 +0200)]
Group common flags
Anatol Belski [Thu, 5 Apr 2018 12:54:14 +0000 (14:54 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Rename var
Anatol Belski [Thu, 5 Apr 2018 12:52:40 +0000 (14:52 +0200)]
Rename var
George Wang [Tue, 3 Apr 2018 15:47:41 +0000 (11:47 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
George Wang [Tue, 3 Apr 2018 15:46:24 +0000 (11:46 -0400)]
[BUGFIX] allow php_admin_value to override value set in php.ini without restriction, like adding an extra directory to open_basedir.
Anatol Belski [Tue, 3 Apr 2018 15:25:13 +0000 (17:25 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync fix for bug #72498 for 32-bit
Anatol Belski [Tue, 3 Apr 2018 15:24:13 +0000 (17:24 +0200)]
Sync fix for bug #72498 for 32-bit
Anatol Belski [Tue, 3 Apr 2018 09:29:38 +0000 (11:29 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 3 Apr 2018 09:29:08 +0000 (11:29 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Tue, 3 Apr 2018 09:28:19 +0000 (11:28 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 3 Apr 2018 08:43:17 +0000 (10:43 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix shared ext/intl compilation
Anatol Belski [Tue, 3 Apr 2018 08:42:14 +0000 (10:42 +0200)]
Fix shared ext/intl compilation
Rasmus Lerdorf [Fri, 30 Mar 2018 20:24:17 +0000 (13:24 -0700)]
Better explanation for the opcache.max_wasted_percentage ini setting
since it was pretty confusing before
Christoph M. Becker [Fri, 30 Mar 2018 17:26:07 +0000 (19:26 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #52070: imagedashedline() - dashed line sometimes is not visible
Christoph M. Becker [Fri, 30 Mar 2018 17:22:23 +0000 (19:22 +0200)]
Fix #52070: imagedashedline() - dashed line sometimes is not visible
We finally remove the inadvertent leftover from the synchronization
with GD 2.0.12.
Jakub Zelenka [Fri, 30 Mar 2018 16:58:29 +0000 (17:58 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Fri, 30 Mar 2018 16:56:17 +0000 (17:56 +0100)]
Update NEWS with FPM fixes
Jakub Zelenka [Sun, 18 Mar 2018 19:16:30 +0000 (19:16 +0000)]
Prevent modifying of getenv result
Jacob Hipps [Mon, 26 Feb 2018 15:25:24 +0000 (10:25 -0500)]
68440: ensure backwards compatibility with FPM_SOCKETS var; fix sockname size
Jacob Hipps [Fri, 23 Feb 2018 16:36:59 +0000 (11:36 -0500)]
Fix bug #68440: [sapi/fpm] use multiple FPM_SOCKETS env vars to prevent hitting MAX_ARG_STRLEN with a large number of pools
Anatol Belski [Fri, 30 Mar 2018 12:16:44 +0000 (14:16 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix clang build, ref buf #76153
Anatol Belski [Fri, 30 Mar 2018 12:14:35 +0000 (14:14 +0200)]
Fix clang build, ref buf #76153
Clang only allows -std=c++11 for C++ source.
Anatol Belski [Thu, 29 Mar 2018 15:00:47 +0000 (17:00 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update binary SDK version for AppVeyor
Anatol Belski [Thu, 29 Mar 2018 14:59:42 +0000 (16:59 +0200)]
Update binary SDK version for AppVeyor
Anatol Belski [Thu, 29 Mar 2018 12:13:48 +0000 (14:13 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Adjust tests for ICU 61.1 compatibility
Anatol Belski [Thu, 29 Mar 2018 12:12:19 +0000 (14:12 +0200)]
Adjust tests for ICU 61.1 compatibility
Ferenc Kovacs [Wed, 28 Mar 2018 21:21:04 +0000 (23:21 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Wed, 28 Mar 2018 21:19:30 +0000 (23:19 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Wed, 28 Mar 2018 21:17:59 +0000 (23:17 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 28 Mar 2018 21:14:30 +0000 (23:14 +0200)]
[ci skip] 5.6.36 will be next
Anatol Belski [Wed, 28 Mar 2018 16:04:09 +0000 (18:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76153 Intl compilation fails with icu4c 61.1
Anatol Belski [Wed, 28 Mar 2018 16:00:28 +0000 (18:00 +0200)]
Fixed bug #76153 Intl compilation fails with icu4c 61.1
Additionally, ICU >= 59.1 requires C++11, so add the flags. Some
refactoring is needed to comply with the latest recommended build
options, such as automatic icu namespace addition.
Joe Watkins [Tue, 27 Mar 2018 20:09:23 +0000 (22:09 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed #75996: Add the right urls to the header of mt_rand.
TATAR Balazs Janos [Thu, 22 Feb 2018 16:10:33 +0000 (17:10 +0100)]
Fixed #75996: Add the right urls to the header of mt_rand.
Joe Watkins [Tue, 27 Mar 2018 19:57:28 +0000 (21:57 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76131 some arginfo params are different from the documentation
Gabriel Caruso [Sat, 24 Mar 2018 04:51:21 +0000 (01:51 -0300)]
Fix #76131 some arginfo params are different from the documentation
Anatol Belski [Tue, 27 Mar 2018 17:46:25 +0000 (19:46 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update libs_versions.txt
Anatol Belski [Tue, 27 Mar 2018 17:44:17 +0000 (19:44 +0200)]
Update libs_versions.txt
Anatol Belski [Tue, 27 Mar 2018 14:04:38 +0000 (16:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Fix release date
Anatol Belski [Tue, 27 Mar 2018 14:03:54 +0000 (16:03 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] Fix release date
Anatol Belski [Tue, 27 Mar 2018 14:02:19 +0000 (16:02 +0200)]
[ci skip] Fix release date
Anatol Belski [Tue, 27 Mar 2018 13:02:46 +0000 (15:02 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
7.0.30 next
Anatol Belski [Tue, 27 Mar 2018 13:02:07 +0000 (15:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
7.0.30 next
Anatol Belski [Tue, 27 Mar 2018 13:00:54 +0000 (15:00 +0200)]
7.0.30 next
Anatol Belski [Tue, 27 Mar 2018 12:29:03 +0000 (14:29 +0200)]
[skip ci] Update NEWS
Anatol Belski [Tue, 27 Mar 2018 12:28:20 +0000 (14:28 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Mar 2018 12:27:44 +0000 (14:27 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Mar 2018 12:26:36 +0000 (14:26 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Mar 2018 12:26:06 +0000 (14:26 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Mar 2018 12:25:24 +0000 (14:25 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Mar 2018 12:24:43 +0000 (14:24 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 27 Mar 2018 12:20:53 +0000 (14:20 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Do not set PR_SET_DUMPABLE by default
Do not set PR_SET_DUMPABLE by default
Anatol Belski [Tue, 27 Mar 2018 12:20:10 +0000 (14:20 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Do not set PR_SET_DUMPABLE by default
Do not set PR_SET_DUMPABLE by default
Jakub Zelenka [Fri, 16 Mar 2018 20:23:24 +0000 (20:23 +0000)]
Do not set PR_SET_DUMPABLE by default
Anatol Belski [Tue, 27 Mar 2018 12:19:22 +0000 (14:19 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Do not set PR_SET_DUMPABLE by default
Jakub Zelenka [Wed, 7 Mar 2018 18:12:56 +0000 (18:12 +0000)]
Do not set PR_SET_DUMPABLE by default
Anatol Belski [Mon, 26 Mar 2018 11:38:55 +0000 (13:38 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix phpize build when DEFINE() is involved
Anatol Belski [Mon, 26 Mar 2018 11:33:55 +0000 (13:33 +0200)]
Fix phpize build when DEFINE() is involved
Anatol Belski [Sun, 25 Mar 2018 10:59:59 +0000 (12:59 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync version for VC++ 15.7
Anatol Belski [Sun, 25 Mar 2018 10:58:00 +0000 (12:58 +0200)]
Sync version for VC++ 15.7
Nikita Popov [Sat, 24 Mar 2018 12:15:59 +0000 (13:15 +0100)]
Followup fix for bug #75729
The case of overloaded substr() with 3 arguments was not handled.
Derick Rethans [Sat, 24 Mar 2018 11:26:16 +0000 (11:26 +0000)]
Updated to version 2018.4 (2018d)