Nikita Popov
d9fd44366d
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-03 00:42:30 +02:00
Tim Toohey
d027bc2add
Fixed bug #69373
...
xmlNodeSetContentLen() calls xmlFreeNode() on node->children. This
causes problems if there are other references around to those children.
2017-06-03 00:40:58 +02:00
Nikita Popov
bfedff58e3
Merge branch 'PHP-7.0' into PHP-7.1
2017-06-03 00:05:52 +02:00
libnex
95c4564f93
Fixed bug #73473 : Stack Buffer Overflow in msgfmt_parse_message
2017-06-03 00:05:16 +02:00
Jelle van der Waa
c742abb3ce
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).
2017-06-02 23:52:43 +02:00
Jesper Hagström
cea34425f3
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.
2017-06-02 23:40:48 +02:00
Nikita Popov
e9ff1fac85
Revert "merge PR #2290 : enable opcache in CLI in 7.1+"
...
This reverts commit 71fe529afc
.
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.
2017-06-02 23:36:20 +02:00
andrewnester
48598a2302
Fixed #74639 - Added proper clone functionality for DatePeriod and DateInterval
2017-06-01 08:07:11 +01:00
Xinchen Hui
741769d933
Update NEWS
2017-05-31 13:09:38 +08:00
Xinchen Hui
9064dca58b
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
2017-05-31 13:08:26 +08:00
Xinchen Hui
9c5717d0de
Fixed bug #74673 (Segfault when cast Reflection object to string with undefined constant)
2017-05-31 12:39:26 +08:00
Dmitry Stogov
316aaca155
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed wrong condition
2017-05-31 00:40:57 +03:00
Dmitry Stogov
77cbf8a657
Fixed wrong condition
2017-05-31 00:40:33 +03:00
Côme Bernigaud
1bb295e659
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
2017-05-30 16:48:16 +02:00
Côme Bernigaud
dc7e53690f
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.
2017-05-30 16:45:27 +02:00
Remi Collet
b11393fccb
NEWS
2017-05-30 15:46:15 +02:00
Remi Collet
bee52f352f
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
2017-05-30 15:45:52 +02:00
Remi Collet
46bb35a853
NEWS
2017-05-30 15:45:09 +02:00
Remi Collet
1c845d2950
Patch from the upstream git
...
https://github.com/kkos/oniguruma/issues/60 (CVE-2017-9228)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
2017-05-30 15:40:32 +02:00
Remi Collet
5416deec66
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>
2017-05-30 15:39:21 +02:00
Remi Collet
6a8ae7cf8d
Patch from the upstream git
...
https://github.com/kkos/oniguruma/issues/58 (CVE-2017-9227)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
2017-05-30 15:38:17 +02:00
Remi Collet
60b1829e1c
Patch from the upstream git
...
https://github.com/kkos/oniguruma/issues/57 (CVE-2017-9224)
Thanks to Mamoru TASAKA <mtasaka@fedoraproject.org>
2017-05-30 15:37:11 +02:00
Remi Collet
1e0c4386ab
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>
2017-05-30 15:35:42 +02:00
Fabien Villepinte
d6922ef8e3
Fix Bug #74386Phar::__construct(): wrong number of parameters by reflection
2017-05-29 08:31:47 +01:00
Joe Watkins
d351c199bb
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection
2017-05-29 08:29:58 +01:00
Fabien Villepinte
2dee44c74c
Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection
2017-05-29 08:29:30 +01:00
Sara Golemon
e628ee9e9d
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
2017-05-28 08:49:25 -07:00
Sara Golemon
8dcfec9789
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".
2017-05-28 08:48:18 -07:00
Sara Golemon
6d2d0bbda7
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.
2017-05-28 08:45:44 -07:00
Sara Golemon
d9458aac9d
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Bugfix #74598 ftp:// ignores context
2017-05-27 21:14:02 -07:00
Sara Golemon
05849a242a
Bugfix #74598 ftp:// ignores context
2017-05-27 21:12:49 -07:00
Xinchen Hui
398efb087c
Update NEWS
2017-05-27 22:43:30 +08:00
Xinchen Hui
19befb1ca2
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74663 (Segfault with opcache.memory_protect and validate_timestamp)
2017-05-27 22:43:23 +08:00
Xinchen Hui
60912e66c8
Fixed bug #74663 (Segfault with opcache.memory_protect and validate_timestamp)
2017-05-27 22:42:27 +08:00
Xinchen Hui
1838f965bc
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Correct the location
2017-05-27 12:12:12 +08:00
Xinchen Hui
ece7d223e8
Correct the location
2017-05-27 12:11:53 +08:00
Xinchen Hui
63ca6f93a1
Added NEWs
2017-05-27 12:09:11 +08:00
Xinchen Hui
cd3520c4d3
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
Fixed bug #74657 (Undefined constants in array properties result in broken properties)
2017-05-27 12:08:48 +08:00
Xinchen Hui
5269c4cacb
Fixed bug #74657 (Undefined constants in array properties result in broken properties)
2017-05-27 12:06:43 +08:00
David Caldwell
49d1cdc393
ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap)
2017-05-25 21:27:11 +00:00
Derick Rethans
fc87715950
Added a test case for (docs) bug #74652
2017-05-25 10:57:09 -04:00
David Caldwell
d51b8f915f
ext/ldap: Allow default host from ldap.conf to work.
...
This fixes an regression introduced in
e7af0fe1eb
. 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.
2017-05-25 00:47:11 +00:00
Nikita Popov
e7a7065024
Merge branch 'PHP-7.0' into PHP-7.1
2017-05-24 18:02:13 +02:00
jhdxr
872e43d6e5
Fixed bug #74478
2017-05-24 18:01:41 +02:00
Joe Watkins
e535b80257
bump versions
2017-05-23 22:04:01 +01:00
Anatol Belski
056cb8c256
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
time to move next
2017-05-23 12:33:23 +02:00
Anatol Belski
fff1cab367
time to move next
2017-05-23 12:31:03 +02:00
Anatol Belski
65bf0364b6
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
move to the next sdk version for AppVeyor
2017-05-20 13:51:18 +02:00
Anatol Belski
c4ae856912
move to the next sdk version for AppVeyor
2017-05-20 13:48:35 +02:00
Xinchen Hui
11b4f105bf
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
2017-05-19 23:59:43 +08:00