1
0
mirror of https://github.com/php/php-src.git synced 2026-04-29 11:13:36 +02:00
Commit Graph

39827 Commits

Author SHA1 Message Date
Anatol Belski f313d438b4 Merge branch 'PHP-7.0'
* PHP-7.0:
  Implemented file_cache_fallback mechanism
2015-10-09 23:49:09 +02:00
Anatol Belski ffb5d0aca3 Implemented file_cache_fallback mechanism
which is essential as an attempt to fix the "failed to reattach"
error on Windows. If file_cache is enabled, Opcache will
automaticaly switch to file_cache_only mode in the case a process
failed to map the shared segment at the required address. The
important small part of the SHM will still be mapped, which
allows information exchange between normal processes using SHM
and those using the fallback mechanism.

This is based on Dmitry's, Matt's and mine ideas. So many thanks for
support!
2015-10-09 23:47:59 +02:00
Dmitry Stogov d3d7c5a52e Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #70674 (ReflectionFunction::getClosure() leaks memory when used for internal functions)
2015-10-09 00:45:45 +03:00
Dmitry Stogov 91fb3a7b27 Fixed bug #70674 (ReflectionFunction::getClosure() leaks memory when used for internal functions) 2015-10-09 00:45:02 +03:00
Dmitry Stogov 6571038093 Merge branch 'PHP-7.0'
* PHP-7.0:
  Correct intdiv() argument names and description
2015-10-09 00:42:26 +03:00
Andrea Faulds fa23bebe94 Correct intdiv() argument names and description 2015-10-08 15:45:22 +01:00
Dmitry Stogov ff4f3094e7 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #70668 (array_keys() doesn't respect references when $strict is true)
2015-10-08 14:59:55 +03:00
Dmitry Stogov 3815e97136 Fixed bug #70668 (array_keys() doesn't respect references when $strict is true) 2015-10-08 14:59:02 +03:00
Dmitry Stogov 4d1d097aca Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed bug #70667 (strtr() causes invalid writes and a crashes)
2015-10-08 14:33:03 +03:00
Dmitry Stogov 9af07e7119 Fixed bug #70667 (strtr() causes invalid writes and a crashes) 2015-10-08 14:30:43 +03:00
Ferenc Kovacs 1e66f1b9ad Merge branch 'pr-1204'
* pr-1204:
  no need for default value
  allow passing null as the third param
  Implemented FR #55716 - Add an option to pass a custom stream context
2015-10-08 10:23:24 +02:00
Márcio Almada ddb6d7801e Fix bug #70650 2015-10-07 16:25:59 +02:00
Dmitry Stogov 5d2813edce Fixed test.
MySQL and MariaDB of different versions have different assumptions about TIMESTAMP attributes.
Probably we need to add yet another condition to also check MariaDB version.
2015-10-07 14:09:37 +03:00
Christopher Jones 19e461b07d Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0
* 'PHP-7.0' of https://git.php.net/repository/php-src:
  Fixed test running on MarinaDB.
2015-10-07 20:27:38 +11:00
Christopher Jones 4a57f1821b Fix mem leak and improve test portability (Senthil) 2015-10-07 20:24:49 +11:00
Dmitry Stogov ccb677ece8 Fixed test running on MarinaDB. 2015-10-07 12:21:43 +03:00
Anatol Belski c0ca731d7a add comment to test 2015-10-07 09:43:28 +02:00
Dmitry Stogov 91588a98be Fixed test (system error messages may be different). 2015-10-07 03:25:12 +03:00
Dmitry Stogov abf3c2f796 Fixed test (it failed on 32-bit Linux and worked on 64-bit Linux just because of luck). 2015-10-07 03:08:11 +03:00
Dmitry Stogov 424a26d5d4 Split test into different versions for 32-bit and 64-bit systems 2015-10-07 01:51:37 +03:00
Nikita Popov cd2b0a7bb8 Drop HAVE_PACKED_OBJECT_VALUE
This check doesn't make sense anymore, we have no object_value
anymore.
2015-10-06 23:12:34 +02:00
Nikita Popov 0a3c1fb4c2 More zpp cleanup in ext/intl 2015-10-06 22:58:02 +02:00
Dmitry Stogov 24e88348f3 Revert "Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src"
This reverts commit a6be0f3fd6.
2015-10-06 23:48:12 +03:00
Sara Golemon a2082b7c97 Add some tests for unserialize() class filtering 2015-10-06 12:04:11 -07:00
Scott 63617a678f Fixed bug #70641 (Random_* - Better compatibility on Linux distros)
See:
* https://bugs.php.net/bug.php?id=70641
* https://github.com/php/php-src/pull/1513#issuecomment-145571829
2015-10-06 01:03:04 +02:00
Bob Weinand a6be0f3fd6 Merge branch 'array_keys_strict_refs' of https://github.com/tony2001/php-src 2015-10-05 14:50:04 +02:00
Anatol Belski a549a3ac17 improve error message 2015-10-04 16:36:53 +02:00
Anatol Belski c97198e181 fix incrementing on 32-bit 2015-10-04 12:19:16 +02:00
Nuno Lopes ba4a85b012 fix coverage report for datelib 2015-10-04 05:39:01 -04:00
Anatol Belski 4cb6342426 remove useless checks
Other platforms than listed in the checks are not supported since
PHP 5.5. We also won't need these checks for a while, so can simplify.
2015-10-03 10:57:32 +02:00
Anatol Belski 96fe3be7f2 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix win10 support
2015-10-03 10:46:10 +02:00
Anatol Belski 83bef0ef83 fix win10 support
dwMajorVersion == 10 there, and generally this check is obsolete
as we don't support dwMajorVersion < 6 since 5.5
2015-10-03 10:44:43 +02:00
Nikita Popov e892e2e253 Merge branch 'PHP-5.6' into PHP-7.0 2015-10-03 10:13:44 +02:00
Nikita Popov fe1933aae2 Fixed bug #70625 2015-10-03 10:12:11 +02:00
Derick Rethans a2f5619303 Updated to version 2015.7 (2015g) 2015-10-02 18:12:18 +01:00
Derick Rethans c08824fd72 Updated to version 2015.7 (2015g) 2015-10-02 18:12:16 +01:00
Xinchen Hui c98ea8465b Fixed bug #70619 (DateTimeImmutable segfault) 2015-10-02 07:19:21 -07:00
Nikita Popov 1287c48082 Fix/improve zpp usage
The ext/interbase changes are done blindly, fingers crossed.

Some of these are bug fixes, some make zpp usage more idiomatic.
2015-10-02 09:35:00 +02:00
Antony Dovgal 99d5634079 fix dl() function
..which was using old macro
2015-09-30 14:40:29 +01:00
Julien Pauli a60105d7a4 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fixed test
  5.5.31 now
2015-09-30 13:19:37 +02:00
Julien Pauli 0fd71d1184 Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  Fixed test
  5.5.31 now

Conflicts:
	configure.in
	main/php_version.h
2015-09-30 13:19:18 +02:00
Julien Pauli d7fb43e30d Fixed test 2015-09-30 13:18:16 +02:00
Anatol Belski 3e74df74f9 fix test 2015-09-30 12:18:32 +02:00
Andrey Hristov 07a8e5ce37 Add JSON as exported type, if available. mysqlnd has it, libmysql doesn't export it (for now). 2015-09-30 09:03:35 +02:00
Andrey Hristov 7b787ebbb6 Merge branch 'PHP-5.6' into PHP-7.0 2015-09-30 09:04:00 +02:00
Anatol Belski bfd2637068 fix test 2015-09-29 13:04:06 +02:00
marcosptf dae3ab8e7a Update openssl_x509_checkpurpose.phpt 2015-09-29 10:41:24 +02:00
root fc3580c9d5 add test to openssl ext 2015-09-29 10:41:22 +02:00
Dmitry Stogov 560e4fa393 Removed or simplified incorrect SEPARATE_*() macros usage. 2015-09-29 11:17:43 +03:00
Scott 694b9af5b6 Remove makedev() check. 2015-09-29 09:14:30 +02:00