clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 10:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
102,827 Commits 491 Branches 1,363 Tags 844 MiB
bdc37442bf
Commit Graph

102827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jelle van der Waa
f3d22e4999
openssl: Add basic openssl_pkcs7_verify tests 
Add basic openssl_pkcs7_verify tests, which verifies a signed email,
extracts the signed certificate and the body of the email.
 2017-06-01 08:12:25 +01:00
Joe Watkins
a6b9cf0250
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed #74639 - Added proper clone functionality for DatePeriod and DateInterval
 2017-06-01 08:07:53 +01:00
andrewnester
48598a2302
Fixed #74639 - Added proper clone functionality for DatePeriod and DateInterval 2017-06-01 08:07:11 +01:00
Sara Golemon
d1cfd87fbe Allow ReflectionClass::isIterable() to return true for Traversables 
Current behavior is essentially "Is an INTERNAL iterable class".
This change allows isIterable() to return true for userspace classes as well.
 2017-05-31 14:23:57 -07:00
Sara Golemon
c1500f8519 Rename ReflectionClass::isIterateable() to isIterable() 
Iterateable is not a word.
Add the correct spelling, but keep the original one around
for BC purposes.

Perhaps we can add ZEND_ACC_DEPRECATED at some later date
and even remove it from PHP 8.
 2017-05-31 12:08:07 -07:00
Dmitry Stogov
fc1ae1d1d3 Exclude warm-up requests from callgrind profile. 2017-05-31 16:16:56 +03:00
Remi Collet
b54e0dc321 clean 2017-05-31 09:57:34 +02:00
Remi Collet
77cca632da Use of bundled libzip is deprecated 2017-05-31 09:56:01 +02:00
Remi Collet
0bad6d7d6b NEWS 2017-05-31 09:54:11 +02:00
Dmitry Stogov
a0cc6d426f New optimization pattern 2017-05-31 09:53:10 +03:00
Xinchen Hui
bfd35512bb Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
  Fixed bug #74673 (Segfault when cast Reflection object to string with undefined constant)

Conflicts:
	ext/reflection/php_reflection.c
 2017-05-31 13:12:24 +08: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
32200e0b69 Avoid double copying 2017-05-31 02:14:17 +03:00
Dmitry Stogov
da01fa3897 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed wrong condition
  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-31 00:41:12 +03: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
Dmitry Stogov
a916bed8f8 Fixed function name resolution 2017-05-30 21:48:16 +03:00
David Caldwell
aef09760d1 ext/ldap/test: Test that ldap_connect() uses defaults from ldap.conf (openldap) 2017-05-30 17:30:32 +02:00
David Caldwell
747e93eabc 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-30 17:30:32 +02: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
Dmitry Stogov
65edf44291 Check for possible run-time function name resolution 2017-05-30 17:37:54 +03:00
Dmitry Stogov
3a4fcee767 trim() micro-optimization 2017-05-30 17:14:08 +03:00
Anatol Belski
b8a334f149 reapply platform related onig patches 2017-05-30 15:47:56 +02:00
Remi Collet
20eacb787f Merge branch 'PHP-7.1' 
* PHP-7.1:
  NEWS
  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:46:51 +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
Remi Collet
0ae2f95b8b Update Oniguruma to latest upstream version 6.3.0 
Windows specific changes need to be applied again.
 2017-05-30 14:14:57 +02:00
Dmitry Stogov
c015be131d Update opcode description 2017-05-30 14:47:21 +03:00
Dmitry Stogov
33d42802d3 Fixed support for C compilers that don't support global register variables. 2017-05-30 13:31:58 +03:00
Dmitry Stogov
6043f76ad7 Added ZEND_FUNC_NUM_ARGS, ZEND_FUNC_GET_ARGS instructions, to implement corresponding builtin functions. 
Special optimisation for "array_slice(INT, func_get_args())" pattern.
 2017-05-30 13:23:17 +03:00
Dmitry Stogov
017d65d74a Extend ZEND_SEND_ARRAY to eliminate array_slice() call for "call_user_func_array(_, array_slice(_, LONG, _))" pattern. 2017-05-30 12:25:46 +03:00
Dmitry Stogov
c45e3632a2 Don't allocate empty strings, use single interned string instead. 2017-05-30 10:02:04 +03:00
Remi Collet
37a16a32c9 missing fix for another test 2017-05-29 12:07:13 +02:00
Remi Collet
cb28a0ab2d missing fix for test 2017-05-29 11:41:16 +02:00
Nicolas Grekas
3c43510b19 add PREG_UNMATCHED_AS_NULL flag to allow distinguish between unmatched subpatterns and empty matches 2017-05-29 11:40:29 +02:00
Remi Collet
0f20970216 Fix possible test failure with path > 108 
E.g.  Notice: stream_socket_server(): socket path exceeded the maximum allowed length of 108 bytes and was truncated in /builddir/build/BUILD/php-src-32d7fa6f74b56fed8124d4dea0f98f0f9964a64e/ext/standard/tests/streams/bug74556.php on line 4
 2017-05-29 11:17:32 +02:00
Anatol Belski
32d7fa6f74 further data type fixes to ext/dba 2017-05-29 10:17:43 +02:00
Anatol Belski
29248d52b2 move dba handlers to size_t 2017-05-29 10:17:43 +02:00
Remi Collet
c6c654c303 fix hash build (when build dir != src dir) 2017-05-29 09:55:51 +02:00
Remi Collet
7bb6b6b6d2 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src: (150 commits)
  Fix Bug #74386Phar::__construct(): wrong number of parameters by reflection
  Fix Bug #74386 Phar::__construct(): wrong number of parameters by reflection
  Fixed typo
  fix typo
  fix resetting cursor data if dba_firstkey failed
  fix wrong define
  fix c/p issue
  enable ext/dba on AppVeyor
  implement support for LMDB in ext/dba
  fix identiation
  Bugfix #74556 stream_socket_get_name() returns empty string
  Fix abstract name handling to be binary safe
  Added more EXIF MAKERNOTE formats:  - AGFA,  - Kyocera  - Ricoh  - Epson
  Replace slow generic sha3 implementation by https://github.com/gvanas/KeccakCodePackage
  Bugfix #74598 ftp:// ignores context
  Improve conditions and visibility
  [ci skip] update NEWS
  Fix test
  Fixed bug #72885 flatfile: dba_fetch() fails to read replaced entry
  Update NEWS
  ...
 2017-05-29 09:54:29 +02:00
Joe Watkins
2a64f548da
Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix Bug #74386Phar::__construct(): wrong number of parameters by reflection
 2017-05-29 08:32:23 +01:00