]>
granicus.if.org Git - php/log
Nikita Popov [Sat, 3 Jun 2017 10:37:47 +0000 (12:37 +0200)]
Travis: Use opcache in release build
Our debug builds on Travis are often timing out recently. Opcache
causes quite a large performance hit on test run times, so move it
over to the release build, where it should have less impact.
Nikita Popov [Fri, 2 Jun 2017 22:42:18 +0000 (00:42 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Tim Toohey [Fri, 2 Jun 2017 22:38:02 +0000 (00:38 +0200)]
Fixed bug #69373
xmlNodeSetContentLen() calls xmlFreeNode() on node->children. This
causes problems if there are other references around to those children.
Nikita Popov [Fri, 2 Jun 2017 22:05:35 +0000 (00:05 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
libnex [Mon, 29 May 2017 13:13:52 +0000 (13:13 +0000)]
Fixed bug #73473: Stack Buffer Overflow in msgfmt_parse_message
Jelle van der Waa [Tue, 30 May 2017 13:55:05 +0000 (15:55 +0200)]
openssl_pkcs12_read: add missing BIO_free
When filling the extracerts array with certificates bio_out is created
but not free'd leading to a small memory leak of 224 bytes (reported by
valgrind).
Jesper Hagström [Fri, 2 Jun 2017 13:29:04 +0000 (15:29 +0200)]
Set timezone for intl/test/bug74298.phpt
Now sets UTC as default timezone for the DateTime which otherwise
uses the timezone defined in php.ini.
Nikita Popov [Fri, 2 Jun 2017 21:34:32 +0000 (23:34 +0200)]
Revert "merge PR #2290: enable opcache in CLI in 7.1+"
This reverts commit
71fe529afc2f9bfd99d85539c709a27f025c0caa .
Without the file cache (which is not enabled by default), this has
non-trivial impact on the startup time. It also significantly
increases the baseline memory usage of PHP on CLI.
andrewnester [Fri, 26 May 2017 10:56:41 +0000 (13:56 +0300)]
Fixed #74639 - Added proper clone functionality for DatePeriod and DateInterval
Xinchen Hui [Wed, 31 May 2017 05:09:38 +0000 (13:09 +0800)]
Update NEWS
Xinchen Hui [Wed, 31 May 2017 05:08:26 +0000 (13:08 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74673 (Segfault when cast Reflection object to string with undefined constant)
Conflicts:
ext/reflection/php_reflection.c
Xinchen Hui [Wed, 31 May 2017 04:39:26 +0000 (12:39 +0800)]
Fixed bug #74673 (Segfault when cast Reflection object to string with undefined constant)
Dmitry Stogov [Tue, 30 May 2017 21:40:57 +0000 (00:40 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed wrong condition
Dmitry Stogov [Tue, 30 May 2017 21:40:33 +0000 (00:40 +0300)]
Fixed wrong condition
Côme Bernigaud [Tue, 30 May 2017 14:48:16 +0000 (16:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
ext/ldap: Allow default host from ldap.conf to work.
Conflicts:
ext/ldap/ldap.c
Côme Bernigaud [Tue, 30 May 2017 14:45:27 +0000 (16:45 +0200)]
Merge branch 'pull-request/2536' into PHP-7.0
* pull-request/2536:
ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
ext/ldap: Allow default host from ldap.conf to work.
Remi Collet [Tue, 30 May 2017 13:46:15 +0000 (15:46 +0200)]
NEWS
Remi Collet [Tue, 30 May 2017 13:45:52 +0000 (15:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
NEWS
Patch from the upstream git https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
Patch from the upstream git https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229)
b690371bbf97794b4a1d3f295d4fb9a8b05d402d Modified for onig 5.9.6
Patch from the upstream git https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
Patch from the upstream git https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
Patch from the upstream git https://github.com/kkos/oniguruma/issues/55 (CVE-2017-9226)
b4bf968ad52afe14e60a2dc8a95d3555c543353a Modified for onig 5.9.6
f015fbdd95f76438cd86366467bb2b39870dd7c6 Modified for onig 5.9.6
Remi Collet [Tue, 30 May 2017 13:45:09 +0000 (15:45 +0200)]
NEWS
Remi Collet [Tue, 30 May 2017 13:40:32 +0000 (15:40 +0200)]
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
Remi Collet [Tue, 30 May 2017 13:39:21 +0000 (15:39 +0200)]
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/59 (CVE-2017-9229)
b690371bbf97794b4a1d3f295d4fb9a8b05d402d Modified for onig 5.9.6
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
Remi Collet [Tue, 30 May 2017 13:38:17 +0000 (15:38 +0200)]
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
Remi Collet [Tue, 30 May 2017 13:37:11 +0000 (15:37 +0200)]
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
Remi Collet [Tue, 30 May 2017 13:35:42 +0000 (15:35 +0200)]
Patch from the upstream git
https://github.com/kkos/oniguruma/issues/55 (CVE-2017-9226)
b4bf968ad52afe14e60a2dc8a95d3555c543353a Modified for onig 5.9.6
f015fbdd95f76438cd86366467bb2b39870dd7c6 Modified for onig 5.9.6
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
Fabien Villepinte [Sat, 6 May 2017 12:38:17 +0000 (14:38 +0200)]
Fix Bug #74386Phar::__construct(): wrong number of parameters by reflection
Joe Watkins [Mon, 29 May 2017 07:29:58 +0000 (08:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection
Fabien Villepinte [Wed, 10 May 2017 10:40:21 +0000 (12:40 +0200)]
Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection
Sara Golemon [Sun, 28 May 2017 15:49:25 +0000 (08:49 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bugfix #74556 stream_socket_get_name() returns empty string
Fix abstract name handling to be binary safe
Sara Golemon [Sun, 28 May 2017 14:23:57 +0000 (07:23 -0700)]
Bugfix #74556 stream_socket_get_name() returns empty string
The original bug report had it returning '\0',
but with a fix to abstract name handling (
6d2d0bbda7 )
it now actually returns ''.
Neither of these are good, as per unix(7)
an empty socket name indicates an unbound name
and "should not be inspected".
Sara Golemon [Sun, 28 May 2017 15:20:21 +0000 (08:20 -0700)]
Fix abstract name handling to be binary safe
Per unix(7):
abstract: an abstract socket address is distinguished (from a
pathname socket) by the fact that sun_path[0] is a null byte
('\0'). The socket's address in this namespace is given by the
additional bytes in sun_path that are covered by the specified
length of the address structure. (Null bytes in the name have no
special significance.) The name has no connection with filesystem
pathnames. When the address of an abstract socket is returned,
the returned addrlen is greater than sizeof(sa_family_t) (i.e.,
greater than 2), and the name of the socket is contained in the
first (addrlen - sizeof(sa_family_t)) bytes of sun_path.
The existing implementation was assuming significance in null bytes
contained in the abstract address identifier.
Sara Golemon [Sun, 28 May 2017 04:14:02 +0000 (21:14 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Bugfix #74598 ftp:// ignores context
Sara Golemon [Sun, 28 May 2017 04:12:49 +0000 (21:12 -0700)]
Bugfix #74598 ftp:// ignores context
Xinchen Hui [Sat, 27 May 2017 14:43:30 +0000 (22:43 +0800)]
Update NEWS
Xinchen Hui [Sat, 27 May 2017 14:43:23 +0000 (22:43 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74663 (Segfault with opcache.memory_protect and validate_timestamp)
Xinchen Hui [Sat, 27 May 2017 14:42:17 +0000 (22:42 +0800)]
Fixed bug #74663 (Segfault with opcache.memory_protect and validate_timestamp)
Xinchen Hui [Sat, 27 May 2017 04:12:12 +0000 (12:12 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Correct the location
Xinchen Hui [Sat, 27 May 2017 04:11:53 +0000 (12:11 +0800)]
Correct the location
Xinchen Hui [Sat, 27 May 2017 04:09:11 +0000 (12:09 +0800)]
Added NEWs
Xinchen Hui [Sat, 27 May 2017 04:08:48 +0000 (12:08 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74657 (Undefined constants in array properties result in broken properties)
Xinchen Hui [Sat, 27 May 2017 04:06:43 +0000 (12:06 +0800)]
Fixed bug #74657 (Undefined constants in array properties result in broken properties)
David Caldwell [Thu, 25 May 2017 21:27:11 +0000 (21:27 +0000)]
ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
Derick Rethans [Thu, 25 May 2017 14:57:09 +0000 (10:57 -0400)]
Added a test case for (docs) bug #74652
David Caldwell [Thu, 25 May 2017 00:41:12 +0000 (00:41 +0000)]
ext/ldap: Allow default host from ldap.conf to work.
This fixes an regression introduced in
e7af0fe1eb89e40671e86a588aa1b78607b85461 . Previously, calling
ldap_connect() with no parameters would pass NULL to ldap_init(),
which causes it to use the default host specified in
/etc/ldap/ldap.conf (on Ubuntu).
When the code changed to use ldap_initialize(), it initialized a uri,
even if there were no parameters passed to ldap_connect(). Because of
this, there's no way to pass a NULL into ldap_initialize(), making it
impossible to use the default uri from ldap.conf.
This commit bypasses the uri creation when there is no host argument,
passing on a NULL to ldap_initialize() which restores the old PHP 5.5
behavior.
Nikita Popov [Wed, 24 May 2017 16:01:56 +0000 (18:01 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
jhdxr [Wed, 24 May 2017 16:00:48 +0000 (18:00 +0200)]
Fixed bug #74478
Joe Watkins [Tue, 23 May 2017 21:04:01 +0000 (22:04 +0100)]
bump versions
Anatol Belski [Tue, 23 May 2017 10:33:23 +0000 (12:33 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
time to move next
Anatol Belski [Tue, 23 May 2017 10:31:03 +0000 (12:31 +0200)]
time to move next
Anatol Belski [Sat, 20 May 2017 11:51:18 +0000 (13:51 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move to the next sdk version for AppVeyor
Anatol Belski [Sat, 20 May 2017 11:48:35 +0000 (13:48 +0200)]
move to the next sdk version for AppVeyor
Xinchen Hui [Fri, 19 May 2017 15:59:43 +0000 (23:59 +0800)]
Merge branch '74595-reflection-parameters' of https://github.com/andrewnester/php-src into PHP-7.1
* '74595-reflection-parameters' of https://github.com/andrewnester/php-src:
Fixed #74595 - ReflectionMethod::getParameters returns incorrect number of parameters
Xinchen Hui [Fri, 19 May 2017 15:56:31 +0000 (23:56 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
follow up fix on bug #74022
Fixed bug #74606 (Segfault within try/catch/finally nesting in Generators)
Xinchen Hui [Fri, 19 May 2017 15:56:10 +0000 (23:56 +0800)]
Update news
Anatol Belski [Thu, 18 May 2017 10:07:09 +0000 (12:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
follow up fix on bug #74022
Anatol Belski [Thu, 18 May 2017 10:03:13 +0000 (12:03 +0200)]
follow up fix on bug #74022
Bob Weinand [Wed, 17 May 2017 17:56:49 +0000 (19:56 +0200)]
Fixed bug #74606 (Segfault within try/catch/finally nesting in Generators)
Thanks to Nikita for pointing out the error source.
Xinchen Hui [Wed, 17 May 2017 15:25:17 +0000 (23:25 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Added cleanup
Xinchen Hui [Wed, 17 May 2017 15:24:58 +0000 (23:24 +0800)]
Added cleanup
Xinchen Hui [Wed, 17 May 2017 15:21:38 +0000 (23:21 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Added test for bug #74600
Xinchen Hui [Wed, 17 May 2017 15:21:18 +0000 (23:21 +0800)]
Added test for bug #74600
Xinchen Hui [Wed, 17 May 2017 14:43:03 +0000 (22:43 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Added test for bug #74596
Xinchen Hui [Wed, 17 May 2017 14:42:18 +0000 (22:42 +0800)]
Added test for bug #74596
Anatol Belski [Wed, 17 May 2017 11:35:42 +0000 (13:35 +0200)]
improve error handling
Anatol Belski [Wed, 17 May 2017 10:50:41 +0000 (12:50 +0200)]
fix wrong error check
Anatol Belski [Tue, 16 May 2017 13:09:02 +0000 (15:09 +0200)]
fix test
Anatol Belski [Tue, 16 May 2017 12:25:27 +0000 (14:25 +0200)]
add test for bug #74589
Xinchen Hui [Tue, 16 May 2017 11:32:59 +0000 (19:32 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)
Xinchen Hui [Tue, 16 May 2017 11:32:33 +0000 (19:32 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
variation of icu libraries causes failure
Xinchen Hui [Tue, 16 May 2017 11:32:13 +0000 (19:32 +0800)]
Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i)
Anatol Belski [Tue, 16 May 2017 10:47:24 +0000 (12:47 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
variation of icu libraries causes failure
Steve Walk [Fri, 5 May 2017 18:45:27 +0000 (11:45 -0700)]
variation of icu libraries causes failure
Xinchen Hui [Tue, 16 May 2017 05:23:12 +0000 (13:23 +0800)]
Update NEWs
Xinchen Hui [Tue, 16 May 2017 05:22:43 +0000 (13:22 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74596 (SIGSEGV with opcache.revalidate_path enabled)
Xinchen Hui [Tue, 16 May 2017 05:22:08 +0000 (13:22 +0800)]
Fixed bug #74596 (SIGSEGV with opcache.revalidate_path enabled)
Yeah, no test script is provided.. I got some troubles to make a one
Anatol Belski [Mon, 15 May 2017 18:34:11 +0000 (20:34 +0200)]
Revert "fixing run-tests.php for variables_order="GPCS""
This reverts commit
c1d57186976e75a2a54f7bd167a77e2872cadc6a .
The commit seems to be inappropriate as it contains parts from master,
which have nothing to do with the variables order issue. Obviously patch
applied to wrong branch or alike.
Anatol Belski [Mon, 15 May 2017 15:48:29 +0000 (17:48 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
switch to Postgres 9.6 for appveyor
Anatol Belski [Mon, 15 May 2017 15:47:41 +0000 (17:47 +0200)]
switch to Postgres 9.6 for appveyor
Anatol Belski [Mon, 15 May 2017 15:39:31 +0000 (17:39 +0200)]
[ci skip] update NEWS
Anatol Belski [Mon, 15 May 2017 14:35:22 +0000 (16:35 +0200)]
Fixed bug #74589 __DIR__ wrong for unicode character
andrewnester [Mon, 15 May 2017 12:58:30 +0000 (15:58 +0300)]
Fixed #74595 - ReflectionMethod::getParameters returns incorrect number of parameters
Matt Ficken [Mon, 15 May 2017 09:21:55 +0000 (02:21 -0700)]
fixing run-tests.php for variables_order="GPCS"
Anatol Belski [Sat, 13 May 2017 23:59:46 +0000 (01:59 +0200)]
[ci skip] update NEWS
Anatol Belski [Sat, 13 May 2017 23:47:40 +0000 (01:47 +0200)]
revert workaround for bug #74489 as it's fixed in the dependency lib
Sara Golemon [Wed, 10 May 2017 23:50:37 +0000 (16:50 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Remove typo from test header
Sara Golemon [Wed, 10 May 2017 23:50:19 +0000 (16:50 -0700)]
Remove typo from test header
Xinchen Hui [Tue, 9 May 2017 03:14:40 +0000 (11:14 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed tests when using cumstom php.ini(session.save_handler)
Fix Bug #74541 Wrong reflection on session_start()
Xinchen Hui [Tue, 9 May 2017 03:13:41 +0000 (11:13 +0800)]
Fixed tests when using cumstom php.ini(session.save_handler)
Xinchen Hui [Tue, 9 May 2017 03:04:39 +0000 (11:04 +0800)]
Merge branch 'fix_74541' of https://github.com/villfa/php-src into PHP-7.0
* 'fix_74541' of https://github.com/villfa/php-src:
Fix Bug #74541 Wrong reflection on session_start()
Xinchen Hui [Tue, 9 May 2017 03:01:52 +0000 (11:01 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix typo: exectute => execute
Xinchen Hui [Tue, 9 May 2017 03:01:33 +0000 (11:01 +0800)]
Merge branch 'patch-1' of https://github.com/ifdattic/php-src into PHP-7.0
* 'patch-1' of https://github.com/ifdattic/php-src:
Fix typo: exectute => execute
Fabien Villepinte [Mon, 8 May 2017 20:42:09 +0000 (22:42 +0200)]
Fix Bug #74541 Wrong reflection on session_start()
Anatol Belski [Mon, 8 May 2017 17:39:56 +0000 (19:39 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
sync bin sdk version
Anatol Belski [Mon, 8 May 2017 17:38:48 +0000 (19:38 +0200)]
sync bin sdk version
Anatol Belski [Mon, 8 May 2017 11:11:12 +0000 (13:11 +0200)]
[ci skip] update libs_versions.txt
Anatol Belski [Mon, 8 May 2017 11:10:48 +0000 (13:10 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update libs versions file
Anatol Belski [Mon, 8 May 2017 11:09:15 +0000 (13:09 +0200)]
[ci skip] update libs versions file
Andrew Marcinkevičius [Mon, 8 May 2017 10:59:05 +0000 (13:59 +0300)]
Fix typo: exectute => execute
Xinchen Hui [Mon, 8 May 2017 03:36:29 +0000 (11:36 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed another potential dangling pointer
Xinchen Hui [Mon, 8 May 2017 03:36:07 +0000 (11:36 +0800)]
Fixed another potential dangling pointer
Xinchen Hui [Mon, 8 May 2017 03:32:42 +0000 (11:32 +0800)]
Update NEWS