php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-17 21:11:02 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,398 Commits 547 Branches 1,483 Tags
e9ff1fac85b97c677e33210770f87f7dc4bc5a24
Commit Graph

44162 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Anatol Belski
26f217bf40 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  follow up fix on bug #74022
 2017-05-18 12:07:09 +02:00
Anatol Belski
464c1639ae follow up fix on bug #74022 2017-05-18 12:03:13 +02:00
Xinchen Hui
d3e3bc611a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Added test for bug #74596
 2017-05-17 22:43:03 +08:00
Xinchen Hui
e347b2ded6 Added test for bug #74596 2017-05-17 22:42:18 +08:00
Anatol Belski
b73a73da25 fix test 2017-05-16 15:09:02 +02:00
Anatol Belski
71f8c4dcfd add test for bug #74589 2017-05-16 14:25:27 +02:00
Anatol Belski
7d418430fd Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  variation of icu libraries causes failure
 2017-05-16 12:47:24 +02:00
Steve Walk
d74fbfb38f variation of icu libraries causes failure 2017-05-16 12:46:27 +02:00
Xinchen Hui
e04b91e6e2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74596 (SIGSEGV with opcache.revalidate_path enabled)
 2017-05-16 13:22:43 +08:00
Xinchen Hui
89dd7fb328 Fixed bug #74596 (SIGSEGV with opcache.revalidate_path enabled) 
Yeah, no test script is provided.. I got some troubles to make a one
 2017-05-16 13:22:08 +08:00
andrewnester
2e5a747b59 Fixed #74595 - ReflectionMethod::getParameters returns incorrect number of parameters 2017-05-15 17:07:00 +03:00
Anatol Belski
cfe577fb86 revert workaround for bug #74489 as it's fixed in the dependency lib 2017-05-14 01:47:40 +02:00
Sara Golemon
90bd4be3f9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Remove typo from test header
 2017-05-10 16:50:37 -07:00
Sara Golemon
b8e0351978 Remove typo from test header 2017-05-10 16:50:19 -07:00
Xinchen Hui
05c90e5994 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()
 2017-05-09 11:14:40 +08:00
Xinchen Hui
1b22e9dc2e Fixed tests when using cumstom php.ini(session.save_handler) 2017-05-09 11:13:41 +08:00
Fabien Villepinte
b39c70b4a7 Fix Bug #74541 Wrong reflection on session_start() 2017-05-08 22:42:09 +02:00
Anatol Belski
378f785515 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #74547 mysqli::change_user() doesn't accept null as $database argument w/strict_types
 2017-05-06 15:10:16 +02:00
Anatol Belski
561f1afe6e Fixed bug #74547 mysqli::change_user() doesn't accept null as $database argument w/strict_types 2017-05-06 15:06:34 +02:00
Anatol Belski
64adba3b3f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #51918 Phar::webPhar() does not handle requests sent through PUT and DELETE method
 2017-05-02 14:46:15 +02:00
Christian Weiske
c0c0871911 Fixed bug #51918 Phar::webPhar() does not handle requests sent through PUT and DELETE method 
phar: Support DELETE, HEAD and PUT HTTP methods in Phar::webPhar

Up to now only GET and POST requests could be handled with Phar::webPhar(),
which is insufficient for today's REST APIs.
This patch expands the list of supported HTTP methods.
 2017-05-02 14:44:47 +02:00
Joe Watkins
6bd30e8f1a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #74457 Wrong reflection on XMLReader::expand
 2017-05-02 06:25:21 +01:00