clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-28 21:36:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
100,625 Commits 494 Branches 1,367 Tags 785 MiB
8ef5a50e2d
Commit Graph

100625 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyson Andre
81b2533a68 Fixes bug #74708 reflection signatures for random_bytes+random_int 
They have 1 and 2 required parameters, respectively
See https://secure.php.net/manual/en/function.random-int.php
 2017-06-13 08:11:25 +02:00
Xinchen Hui
b7c2c44a8d Forgotten NEWs update 2017-06-13 12:21:45 +08:00
Xinchen Hui
c0678be3e0 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Forgotten NEWs update
 2017-06-13 12:21:27 +08:00
Xinchen Hui
3968ffe7b3 Forgotten NEWs update 2017-06-13 12:20:42 +08:00
Xinchen Hui
caf35c5cf5 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add simple cli test for PATH/HOST ini sections
  Fixed bug #74600
 2017-06-12 17:21:35 +08:00
Xinchen Hui
e05f79c3de Merge branch 'bug74600' of https://github.com/manuelm/php-src into PHP-7.0 
* 'bug74600' of https://github.com/manuelm/php-src:
  Add simple cli test for PATH/HOST ini sections
  Fixed bug #74600
 2017-06-12 17:12:15 +08:00
Anatol Belski
0fa40b0546 group the change for bug #74720 2017-06-09 23:47:15 +02:00
Manuel Mausz
91f129ebf7 Add simple cli test for PATH/HOST ini sections 2017-06-09 23:28:19 +02:00
Anatol Belski
6d46528d54 update NEWS 2017-06-09 17:40:45 +02:00
Anatol Belski
cbe73b3cfe Fixed bug #74720 pkcs7_en/decrypt does not work if \x1a is used in 
content
 2017-06-09 17:35:37 +02:00
Christoph M. Becker
1980234fc2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Use reasonable SQLite3 module version
 2017-06-09 14:05:04 +02:00
Christoph M. Becker
c3b910370c Use reasonable SQLite3 module version 
Since PECL/sqlite3 has been moved to ext/sqlite3 in 2008, the SQLite3
module version is hardcoded to `0.7-dev`. It doesn't appear to make
much sense to have an own module version for a bundled extensions, but
as other code might rely on it, we don't remove the constant but rather
make it an alias of the PHP version.
 2017-06-09 13:49:32 +02:00
Manuel Mausz
ee0e6963f3 Fixed bug #74600 
Make sure the hash entry is an array.

The origin fix broke support for HOST/PATH ini sections. Only the
beginning of the string has to match. Revert this check but use
zend_binary_strncasecmp instead of strncasecmp.
 2017-06-09 01:43:08 +02:00
Anatol Belski
844f4292ef Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  enforce exit status propagation and up the sdk version
 2017-06-08 17:16:02 +02:00
Anatol Belski
9997767dc3 enforce exit status propagation and up the sdk version 2017-06-08 17:14:52 +02:00
Remi Collet
c39a10bc6e relax this test again (still encounter erratic failure) 2017-06-06 17:20:33 +02:00
Jakub Zelenka
ff93f74f63 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-04 18:11:49 +01:00
Jakub Zelenka
3704947696 Replace ASN1_STRING_data with ASN1_STRING_get0_data 
This is a slightly modified version of the patch from Jelle van der Waa
( @jelly ) so full credit to him.
 2017-06-04 18:08:51 +01:00
Nikita Popov
6af1d7ad01 Merge branch 'PHP-7.0' into PHP-7.1 2017-06-03 15:08:59 +02:00
Nikita Popov
585c9f3c4b Fix leak in WDDX serialization 2017-06-03 15:08:42 +02:00
Nikita Popov
6b511d124e 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.
 2017-06-03 12:37:47 +02:00
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