php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 19:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
98,512 Commits 549 Branches 1,486 Tags
2605ceeaca79f24d52780fdfe3ebfa00d7d83dab
Commit Graph

98512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yasuo Ohgaki 2605ceeaca Added array parameter support to mb_convert_encoding() 2016-09-06 18:20:24 +09:00
Stanislav Malyshev ddce37b199 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix bug #72785 - allowed_classes only applies to outermost unserialize()
 2016-09-05 19:57:49 -07:00
Stanislav Malyshev 747d21cfd2 Fix bug #72785 - allowed_classes only applies to outermost unserialize() 2016-09-05 19:56:36 -07:00
Christoph M. Becker b15de5c0dc Merge branch 'PHP-7.1' 2016-09-06 01:28:59 +02:00
Christoph M. Becker 1928cdcacb Merge branch 'PHP-7.0' into PHP-7.1 2016-09-06 01:18:22 +02:00
Christoph M. Becker 81ec843d0e Merge branch 'PHP-5.6' into PHP-7.0 2016-09-06 01:15:36 +02:00
Christoph M. Becker 8aad3131a1 Fix #70752: Depacking with wrong password leaves 0 length files 
We should not open the output stream before we have tried to open the
archive entry, as failing the latter could leave an empty file behind.
 2016-09-06 01:03:46 +02:00
Andrea Faulds 642526cc4e Merge branch 'PHP-7.1' 2016-09-05 22:13:42 +01:00
Andrea Faulds cfc83af978 Merge branch 'PHP-7.0' into PHP-7.1 2016-09-05 22:13:20 +01:00
Andrea Faulds 009ee6e503 Unbreak FAST_ZPP dead code 2016-09-05 22:12:26 +01:00
Julien Pauli d4beaea4a9 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Updated NEWS
  Fixes #72590: Opcache restart with kill_all_lockers does not work
 2016-09-05 17:04:31 +02:00
Julien Pauli b86e15849e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Updated NEWS
  Fixes #72590: Opcache restart with kill_all_lockers does not work
 2016-09-05 17:04:15 +02:00
Julien Pauli 4fa52b42c7 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
  Fixes #72590: Opcache restart with kill_all_lockers does not work
 2016-09-05 17:03:51 +02:00
Julien Pauli dd6da58fac Updated NEWS 2016-09-05 17:03:29 +02:00
Keyur 0045d16863 Fixes #72590: Opcache restart with kill_all_lockers does not work 
ACCEL_LOG_ERROR is special and causes a zend_bailout() and the code
never gets to call kill() in the next line after the logging. Change
the log level to WARNING.
 2016-09-05 16:59:28 +02:00
Nikita Popov daa2b75c76 Fix some sizeof(zend_long) > sizeof(size_t) issues 
Fix a couple of mistakes that are only relevant if
sizeof(zend_long) > sizeof(size_t).

* Fix cast order in string offset check: Negation should happen
  after the (zend_long) cast, otherwise sign extension does not
  occur.
* Use Z_UL in zend_inference.
* Use aligned size for HT_USED_SIZE in zend_persist: The issue is
  that on x86-32 uint64_t is considered to be 4-aligned, so the
  alignment assumption does not hold.
 2016-09-05 15:33:02 +02:00
David Walker 750f3d3f65 Improve getaddrinfo implementation 
* Fix some leaks
* Improve some comparisons and casts
* Raise a notice when an unknown hint is provided
 2016-09-05 14:27:31 +02:00
Nikita Popov b8b47ed49c Merge branch 'PHP-7.1' 
[ci skip]
 2016-09-05 14:23:54 +02:00
Nikita Popov a463da7204 Merge branch 'PHP-7.0' into PHP-7.1 
[ci skip]
 2016-09-05 14:22:45 +02:00
Nikita Popov 1cd0c80acf Merge branch 'PHP-5.6' into PHP-7.0 
[ci skip]
 2016-09-05 14:22:29 +02:00
Nikita Popov b92cb6b238 Limit editorconfig to C code 
PHPT files do not follow this.

[ci skip]
 2016-09-05 14:22:13 +02:00
Christoph M. Becker cc8691cc4b Update UPGRADING wrt. commit c4fe264b 2016-09-05 11:27:46 +02:00
Julien Pauli 345a032769 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Updated NEWS
  Updated NEWS
  Updated NEWS
 2016-09-05 10:19:29 +02:00
Julien Pauli 5f9fe06555 Updated NEWS 2016-09-05 10:19:21 +02:00
Julien Pauli 51de65c20e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Updated NEWS
  Updated NEWS
 2016-09-05 10:18:57 +02:00
Julien Pauli d185c2f13a Updated NEWS 2016-09-05 10:18:39 +02:00
Julien Pauli 14d754d6fd Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Updated NEWS
 2016-09-05 10:18:08 +02:00
Julien Pauli 1abbcc8cc5 Updated NEWS 2016-09-05 10:17:56 +02:00
Julien Pauli 2fff8196a4 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
 2016-09-05 10:13:31 +02:00
Julien Pauli 376dcaa39a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
 2016-09-05 10:13:19 +02:00
Julien Pauli e5047ac2d2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
 2016-09-05 10:12:49 +02:00
Julien Pauli 9834978a8b Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE 2016-09-05 10:08:42 +02:00
Stanislav Malyshev 9470cdd4c3 Merge branch 'pull-request/1864' 
* pull-request/1864:
  Tiny tweak for `$header` initialization, it should always be an array
  Minor tweaks
 2016-09-05 00:51:01 -07:00
Stanislav Malyshev 28bc2d797e Merge branch 'pull-request/2025' 
* pull-request/2025:
  Change the name of the second parameter of image writer functions
 2016-09-05 00:44:01 -07:00
Stanislav Malyshev 6e7d4fdde4 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Change the name of the second parameter of image writer functions
 2016-09-05 00:43:52 -07:00
Christoph M. Becker f203de0748 Change the name of the second parameter of image writer functions 
As of PHP 5.4.0 the second parameter of all image writer functions (except
imagexbm) accepts also a stream resource. Therefore the parameter name
`filename` is inappropriate. We change it to `to` according to what it's
already called in _php_image_output_ctx().

We consider the reflection only related BC break acceptable for a minor version.
 2016-09-05 00:43:30 -07:00
Stanislav Malyshev bd81216768 Merge branch 'pull-request/1958' 
* pull-request/1958:
  Added editorconfig file
 2016-09-05 00:41:57 -07:00
Stanislav Malyshev 3e69fa2ad1 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Added editorconfig file
 2016-09-05 00:41:29 -07:00
Stanislav Malyshev 0d4411d7c8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Added editorconfig file
 2016-09-05 00:41:26 -07:00
Stanislav Malyshev 4e0605044a Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Added editorconfig file
 2016-09-05 00:41:23 -07:00
Richard Fussenegger 5c38fbe543 Added editorconfig file 2016-09-05 00:40:58 -07:00
Stanislav Malyshev 7abd0cada0 Merge branch 'pull-request/2018' 
* pull-request/2018:
  Implement #47456: Missing PCRE option 'J'
 2016-09-05 00:39:46 -07:00
Stanislav Malyshev 2213c43e17 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Implement #47456: Missing PCRE option 'J'
 2016-09-05 00:39:06 -07:00
Stanislav Malyshev 9650b8e241 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Implement #47456: Missing PCRE option 'J'
 2016-09-05 00:39:01 -07:00
Stanislav Malyshev 92db92c620 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Implement #47456: Missing PCRE option 'J'
 2016-09-05 00:38:57 -07:00
Christoph M. Becker 39423e425d Implement #47456: Missing PCRE option 'J' 
While it is possible to force the same behavior by setting the internal
option (?J), having a dedicated modifier appears to be useful. After all,
J is even listed on the "Pattern Modifiers" man page[1], but the description
referrs to (?J).

[1] <http://php.net/manual/en/reference.pcre.pattern.modifiers.php>
 2016-09-05 00:30:48 -07:00
Stanislav Malyshev 20edfee907 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Recognize TDS versions 7.3 and 7.4
 2016-09-05 00:29:24 -07:00
Stanislav Malyshev f57c059b96 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Recognize TDS versions 7.3 and 7.4
 2016-09-05 00:29:21 -07:00
Stanislav Malyshev b5f9427ca9 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Recognize TDS versions 7.3 and 7.4
 2016-09-05 00:29:18 -07:00
Stanislav Malyshev cee363d609 Merge branch 'pull-request/2061' into PHP-5.6 
* pull-request/2061:
  Recognize TDS versions 7.3 and 7.4
 2016-09-05 00:29:11 -07:00