]> granicus.if.org Git - php/log
php
7 years agoFixed few test failures if php.ini contains zend.assertions=-1
Dmitry Stogov [Wed, 21 Jun 2017 15:50:08 +0000 (18:50 +0300)]
Fixed few test failures if php.ini contains zend.assertions=-1

7 years agoWe don't need any special handling for CG(unclean_shutdown) at this point, because...
Dmitry Stogov [Wed, 21 Jun 2017 13:11:50 +0000 (16:11 +0300)]
We don't need any special handling for CG(unclean_shutdown) at this point, because in case of exit() or die() all destructors must be already called before.

7 years agoSetting CG(unclean_shutdown) in fast shutdown doesn't make a lot of sense (it was...
Dmitry Stogov [Wed, 21 Jun 2017 13:09:21 +0000 (16:09 +0300)]
Setting CG(unclean_shutdown) in fast shutdown doesn't make a lot of sense (it was set to prevent memory leak messages, but we doesn't check memory leaks in RELEASE build anyway).

7 years agoAvoid useless duplication
Dmitry Stogov [Wed, 21 Jun 2017 09:57:24 +0000 (12:57 +0300)]
Avoid useless duplication

7 years agoUse persistent heap only for persistent connections.
Dmitry Stogov [Wed, 21 Jun 2017 08:25:30 +0000 (11:25 +0300)]
Use persistent heap only for persistent connections.

7 years agoUse request heap.
Dmitry Stogov [Wed, 21 Jun 2017 08:25:05 +0000 (11:25 +0300)]
Use request heap.

7 years agoClear alocated memory blocks, only if this is really necessary.
Dmitry Stogov [Wed, 21 Jun 2017 07:37:54 +0000 (10:37 +0300)]
Clear alocated memory blocks, only if this is really necessary.

7 years agoUpdate NEWS
Christopher Jones [Wed, 21 Jun 2017 06:17:54 +0000 (16:17 +1000)]
Update NEWS

7 years agoMerge branch 'PHP-7.1'
Christopher Jones [Wed, 21 Jun 2017 05:56:09 +0000 (15:56 +1000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Add bug #74625 to package.xml
  Add IN bind case to bug74625.phpt
  Fixed bug #74625 (Integer overflow in oci_bind_array_by_name).

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Wed, 21 Jun 2017 05:55:54 +0000 (15:55 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Add bug #74625 to package.xml
  Add IN bind case to bug74625.phpt
  Fixed bug #74625 (Integer overflow in oci_bind_array_by_name).

7 years agoMerge branch 'pull-request/2532' into PHP-7.0
Christopher Jones [Wed, 21 Jun 2017 05:55:28 +0000 (15:55 +1000)]
Merge branch 'pull-request/2532' into PHP-7.0

* pull-request/2532:
  Add bug #74625 to package.xml
  Add IN bind case to bug74625.phpt
  Fixed bug #74625 (Integer overflow in oci_bind_array_by_name).

7 years agoAdd bug #74625 to package.xml
Christopher Jones [Wed, 21 Jun 2017 05:50:51 +0000 (15:50 +1000)]
Add bug #74625 to package.xml

7 years agoAdd IN bind case to bug74625.phpt
Christopher Jones [Wed, 21 Jun 2017 05:47:32 +0000 (15:47 +1000)]
Add IN bind case to bug74625.phpt

7 years agoFixed bug #74625 (Integer overflow in oci_bind_array_by_name).
Ingmar Runge [Mon, 22 May 2017 06:58:18 +0000 (08:58 +0200)]
Fixed bug #74625 (Integer overflow in oci_bind_array_by_name).

7 years agoMerge branch 'PHP-7.1'
Christopher Jones [Wed, 21 Jun 2017 05:04:34 +0000 (15:04 +1000)]
Merge branch 'PHP-7.1'

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Wed, 21 Jun 2017 05:04:03 +0000 (15:04 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoRemove use of obsolete create_function()
Christopher Jones [Wed, 21 Jun 2017 05:02:58 +0000 (15:02 +1000)]
Remove use of obsolete create_function()

7 years agoMerge branch 'PHP-7.1'
Christopher Jones [Wed, 21 Jun 2017 04:32:00 +0000 (14:32 +1000)]
Merge branch 'PHP-7.1'

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Wed, 21 Jun 2017 04:29:43 +0000 (14:29 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoUpdate OCI8 version test and package.xml
Christopher Jones [Wed, 21 Jun 2017 04:29:30 +0000 (14:29 +1000)]
Update OCI8 version test and package.xml

7 years agoFix bug #73634 - grapheme_strpos illegal memory access
Stanislav Malyshev [Mon, 16 Jan 2017 09:18:16 +0000 (01:18 -0800)]
Fix bug #73634 - grapheme_strpos illegal memory access

7 years agoFix bug #73648 - integer overflow in substr
Stanislav Malyshev [Mon, 16 Jan 2017 20:11:50 +0000 (12:11 -0800)]
Fix bug #73648 - integer overflow in substr

7 years agoAdded specialized FE_FETCH_R handler for iteration over array
Dmitry Stogov [Tue, 20 Jun 2017 20:25:09 +0000 (23:25 +0300)]
Added specialized FE_FETCH_R handler for iteration over array

7 years agoFE_RESER/FE_FETCH optimisation
Dmitry Stogov [Tue, 20 Jun 2017 19:26:46 +0000 (22:26 +0300)]
FE_RESER/FE_FETCH optimisation

7 years agobump versions
Joe Watkins [Tue, 20 Jun 2017 16:34:00 +0000 (17:34 +0100)]
bump versions

7 years agoUpdate NEWS for 7.2.0alpha3
Sara Golemon [Tue, 20 Jun 2017 13:47:22 +0000 (13:47 +0000)]
Update NEWS for 7.2.0alpha3

7 years agoUpdate NEWS for PHP 7.2.0alpha2
Sara Golemon [Tue, 20 Jun 2017 13:22:55 +0000 (13:22 +0000)]
Update NEWS for PHP 7.2.0alpha2

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Tue, 20 Jun 2017 13:45:34 +0000 (15:45 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Split requested size as expected by CreateFileMapping.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 20 Jun 2017 13:45:05 +0000 (15:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Split requested size as expected by CreateFileMapping.

7 years agoSplit requested size as expected by CreateFileMapping.
Anatol Belski [Tue, 20 Jun 2017 13:38:25 +0000 (15:38 +0200)]
Split requested size as expected by CreateFileMapping.

Thus fixing ext\opcache\tests\log_verbosity_bug.phpt fails on 64-bit.

7 years agoNEWS entries for 7.2.0alpha2
Sara Golemon [Tue, 20 Jun 2017 13:21:46 +0000 (09:21 -0400)]
NEWS entries for 7.2.0alpha2

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Tue, 20 Jun 2017 12:06:43 +0000 (14:06 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  move next

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 20 Jun 2017 12:06:27 +0000 (14:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  move next

7 years agomove next
Anatol Belski [Tue, 20 Jun 2017 12:05:50 +0000 (14:05 +0200)]
move next

7 years agoFixed Bug #74537 (Align --with-pdo-oci configure option with --with-oci8 syntax)
Christopher Jones [Tue, 20 Jun 2017 06:24:38 +0000 (16:24 +1000)]
Fixed Bug #74537 (Align --with-pdo-oci configure option with --with-oci8 syntax)

7 years agoMerge branch 'PHP-7.1'
Christopher Jones [Tue, 20 Jun 2017 06:07:17 +0000 (16:07 +1000)]
Merge branch 'PHP-7.1'

7 years agoUpdate NEWS
Christopher Jones [Tue, 20 Jun 2017 06:01:37 +0000 (16:01 +1000)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Tue, 20 Jun 2017 06:00:55 +0000 (16:00 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoPDO_OCI: support IC 12.2 in configure option
Christopher Jones [Tue, 20 Jun 2017 06:00:22 +0000 (16:00 +1000)]
PDO_OCI: support IC 12.2 in configure option

7 years agoMention OCI8 TAF callback support in UPGRADING
Christopher Jones [Tue, 20 Jun 2017 05:51:56 +0000 (15:51 +1000)]
Mention OCI8 TAF callback support in UPGRADING

7 years agoMerge branch 'PHP-7.1'
Christopher Jones [Tue, 20 Jun 2017 04:56:22 +0000 (14:56 +1000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Bump OCI8 version

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Tue, 20 Jun 2017 04:55:27 +0000 (14:55 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Bump OCI8 version

7 years agoBump OCI8 version
Christopher Jones [Tue, 20 Jun 2017 04:54:45 +0000 (14:54 +1000)]
Bump OCI8 version

7 years agoMerge branch 'PHP-7.1'
Christopher Jones [Tue, 20 Jun 2017 04:44:46 +0000 (14:44 +1000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  add test for bug #70700

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Tue, 20 Jun 2017 04:44:11 +0000 (14:44 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add test for bug #70700

7 years agoMerge branch 'pull-request/1569' into PHP-7.0
Christopher Jones [Tue, 20 Jun 2017 04:43:50 +0000 (14:43 +1000)]
Merge branch 'pull-request/1569' into PHP-7.0

* pull-request/1569:
  add test for bug #70700

7 years agoadd test for bug #70700
Chuck Burgess [Mon, 12 Oct 2015 19:56:59 +0000 (14:56 -0500)]
add test for bug #70700

7 years agoUpdate NEWS
Christopher Jones [Tue, 20 Jun 2017 04:38:31 +0000 (14:38 +1000)]
Update NEWS

7 years agoUpdate NEWS
Christopher Jones [Tue, 20 Jun 2017 04:37:52 +0000 (14:37 +1000)]
Update NEWS

7 years agoUpdate NEWS
Christopher Jones [Tue, 20 Jun 2017 04:37:16 +0000 (14:37 +1000)]
Update NEWS

7 years agoMerge branch 'PHP-7.1'
Christopher Jones [Tue, 20 Jun 2017 04:34:05 +0000 (14:34 +1000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  oci8 - Implementation of Oracle TAF Callback

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Tue, 20 Jun 2017 04:33:35 +0000 (14:33 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  oci8 - Implementation of Oracle TAF Callback

7 years agoMerge branch 'pull-request/2459' into PHP-7.0
Christopher Jones [Tue, 20 Jun 2017 04:33:06 +0000 (14:33 +1000)]
Merge branch 'pull-request/2459' into PHP-7.0

* pull-request/2459:
  oci8 - Implementation of Oracle TAF Callback

7 years agooci8 - Implementation of Oracle TAF Callback
KoenigsKind [Fri, 7 Apr 2017 18:40:40 +0000 (20:40 +0200)]
oci8 - Implementation of Oracle TAF Callback

Adds support for the Transparent Application Failover Callback.
The php_oci_connection struct got a char* added which will contain the
callback function, it should be set to PHP_OCI_TAF_DISABLE_CALLBACK at
the end of a php request for permanent connections so that, if a TAF
callback occurs, no userspace function will be called.
Maybe add support for registering object functions (via array),
currently the register function only accepts a string. I didn't know how
to implement it correctly. As a failover occurs very rarely it might be
better to not keep the cache when saving the zend_fcall_info.

Things to do
[ ] config.m4 needs to compile oci8_failover.c
[ ] Check if correctly implemented (especially for multithreading)
[ ] Add support for registering callback function via array

7 years agoMerge branch 'PHP-7.1'
Christopher Jones [Tue, 20 Jun 2017 04:24:56 +0000 (14:24 +1000)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  add test for bug #60994

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christopher Jones [Tue, 20 Jun 2017 04:24:07 +0000 (14:24 +1000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add test for bug #60994

7 years agoMerge branch 'pull-request/1566' into PHP-7.0
Christopher Jones [Tue, 20 Jun 2017 04:23:20 +0000 (14:23 +1000)]
Merge branch 'pull-request/1566' into PHP-7.0

* pull-request/1566:
  add test for bug #60994

7 years agoadd test for bug #60994
Chuck Burgess [Mon, 12 Oct 2015 15:50:09 +0000 (10:50 -0500)]
add test for bug #60994

7 years agoBUG #74737: Incorrect ReflectionFunction information for mysqli_get_client_info
Mitch Hagstrand [Thu, 15 Jun 2017 21:33:18 +0000 (16:33 -0500)]
BUG #74737: Incorrect ReflectionFunction information for mysqli_get_client_info

7 years agoTest ftp_ssl_connect() function : error conditions
chance garcia [Mon, 19 Jun 2017 23:42:15 +0000 (19:42 -0400)]
Test ftp_ssl_connect() function : error conditions

test timeout warning
ensure connection fails with invalid hostname
test invalid parameter types
test exceeds expected number of parameters

7 years agoFixed wrong usage of old ZPP API.
Dmitry Stogov [Mon, 19 Jun 2017 15:08:50 +0000 (18:08 +0300)]
Fixed wrong usage of old ZPP API.

7 years agoMerge branch 'pull-request/2528'
Christoph M. Becker [Mon, 19 Jun 2017 11:47:23 +0000 (13:47 +0200)]
Merge branch 'pull-request/2528'

* pull-request/2528:
  Change flags to use SQLITE3_OPEN_READ* constants instead of a fake-boolean, add tests on errors
  Implement writing to BLOBs in SQLite3

7 years agoAvoid useless dereferences and separations during paramter passing.
Dmitry Stogov [Mon, 19 Jun 2017 09:55:59 +0000 (12:55 +0300)]
Avoid useless dereferences and separations during paramter passing.

7 years agoOptimization for fast path.
Dmitry Stogov [Mon, 19 Jun 2017 07:07:11 +0000 (10:07 +0300)]
Optimization for fast path.

7 years agoNEWS
Sara Golemon [Mon, 19 Jun 2017 00:24:19 +0000 (20:24 -0400)]
NEWS

7 years agoDefault single_dh_use and honor_cipher_order to true
Niklas Keller [Sun, 18 Jun 2017 23:54:45 +0000 (19:54 -0400)]
Default single_dh_use and honor_cipher_order to true

7 years agoNEWS
Sara Golemon [Sun, 18 Jun 2017 23:53:06 +0000 (19:53 -0400)]
NEWS

7 years agoCompatibility with libargon2 versions 20161029 and 20160821
Charles R. Portwood II [Sun, 18 Jun 2017 23:17:43 +0000 (19:17 -0400)]
Compatibility with libargon2 versions 20161029 and 20160821

libargon2 20161029 introduces the `type` parameter to the argon2_encodedlen
function that is not present in 20160821. This change ensures the Argon2
functionality introduced in RFC `argon2_password_hash` is compatible with
both versions, as the library version that package maintainers package may
differ.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 18 Jun 2017 18:08:51 +0000 (19:08 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoopenssl: Add openssl_pkcs12_(read, export) tests
Jelle van der Waa [Thu, 8 Jun 2017 12:31:48 +0000 (14:31 +0200)]
openssl: Add openssl_pkcs12_(read, export) tests

Add basic tests for openssl_pkcs12_read and openssl_pkcs12_export.
openssl_pkcs12_export has two tests disable which currently do not work
as intended and should be fixed.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 18 Jun 2017 17:28:54 +0000 (18:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoRegenerate and bump re2c version to 0.16
Jakub Zelenka [Sun, 18 Jun 2017 17:26:48 +0000 (18:26 +0100)]
Regenerate and bump re2c version to 0.16

It also matches the re2c version for Zend language scanner

7 years agoadd test for strptime(): return false on failure
chance garcia [Sun, 18 Jun 2017 16:28:31 +0000 (12:28 -0400)]
add test for strptime(): return false on failure

Closes https://github.com/php/php-src/pull/2583

7 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Sun, 18 Jun 2017 18:09:21 +0000 (19:09 +0100)]
Merge branch 'PHP-7.1'

7 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Sun, 18 Jun 2017 17:32:19 +0000 (18:32 +0100)]
Merge branch 'PHP-7.1'

7 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sat, 17 Jun 2017 00:00:27 +0000 (02:00 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Next round on AppVeyor reliability.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 16 Jun 2017 23:58:51 +0000 (01:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Next round on AppVeyor reliability.

7 years agoNext round on AppVeyor reliability.
Anatol Belski [Fri, 16 Jun 2017 23:57:47 +0000 (01:57 +0200)]
Next round on AppVeyor reliability.

7 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Fri, 16 Jun 2017 16:15:11 +0000 (17:15 +0100)]
Merge branch 'PHP-7.1'

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Fri, 16 Jun 2017 16:14:23 +0000 (17:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoopenssl: Fix spkstr and spki leak in openssl_spki_new
Jelle van der Waa [Tue, 6 Jun 2017 14:45:39 +0000 (16:45 +0200)]
openssl: Fix spkstr and spki leak in openssl_spki_new

spkstr is not free'd when running the test and valgrind reports a leak
of 32,318 bytes. The free condition is not met since keyresource is not
NULL, apart from that OPENSSL_free actually free's the allocated memory
by OPENSSL_malloc inside OpenSSL.

Valgrind reports 768 bytes leaked in openssl_spki_new when running the
testsuite. Remove the keyresource check to always free spki.

7 years agoVM refactoring, to avoid passing "execute_data" into helper functions that can access...
Dmitry Stogov [Thu, 15 Jun 2017 22:42:49 +0000 (01:42 +0300)]
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.

7 years agofollow up on 0c992792220bbfb375d5dc8222beb2a55da8441a
Anatol Belski [Thu, 15 Jun 2017 16:44:24 +0000 (18:44 +0200)]
follow up on 0c992792220bbfb375d5dc8222beb2a55da8441a

7 years agoFixed php_socket_t to int conversion
Richard Fussenegger [Mon, 29 May 2017 19:42:59 +0000 (21:42 +0200)]
Fixed php_socket_t to int conversion

This warning was about a possible loss of data due to the downcast of `php_socket_t` to `int`. The former maps to a platform specific type, hence, it might downcast from a 64 bit integer to a 32 bit intger.

Fixed possibly overflowing vars

Due to the change from `int` to `php_socket_t` some variables might overflow now. Changed all variables that might be affected.

Revert "Fixed possibly overflowing vars"

This reverts commit bf64fd5984409a208ef32108990a6085b6556273.

Use aliased PHP socket type

Using the alias protects us from changes to the underlying type.

Removed ignored nfds argument

The `nfds` argument to the Win32 `select` function is always ignored, regardless of its actual value. Hence, we should not pass it in the first place. See https://msdn.microsoft.com/en-us/library/windows/desktop/ms740141(v=vs.85).aspx for reference.

Target value is not a pointer

Avoid overflow in loop

7 years agofix ticks init in ts build
Anatol Belski [Sun, 4 Jun 2017 20:15:29 +0000 (22:15 +0200)]
fix ticks init in ts build

7 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Thu, 15 Jun 2017 19:51:52 +0000 (22:51 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  code de-duplication in ReflectionType::__toString and ReflectionNamedType::getName

7 years agoRefactored API for constant array element propagation
Dmitry Stogov [Thu, 15 Jun 2017 19:50:04 +0000 (22:50 +0300)]
Refactored API for constant array element propagation

7 years agocode de-duplication in ReflectionType::__toString and ReflectionNamedType::getName
Remi Collet [Thu, 15 Jun 2017 13:38:03 +0000 (15:38 +0200)]
code de-duplication in ReflectionType::__toString and ReflectionNamedType::getName

This code duplication introduce an inconsistency in displayed type name
- bool (reflection) vs boolean
- int (reflection) vs integer

And reflection already use zend_get_type_by_const in other methods...

Inconsistenty is kept for BC reason.
Could be fixed in 8.0

7 years agoMoved "Using $this when not in object context" exception code into single VM helper.
Dmitry Stogov [Thu, 15 Jun 2017 13:23:05 +0000 (16:23 +0300)]
Moved "Using $this when not in object context" exception code into single VM helper.

7 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Wed, 14 Jun 2017 02:42:37 +0000 (10:42 +0800)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  Change PHP_OS_FAMILY to "Darwin" instead of "Mac" for Darwin based systems (as suggested by Davey)
  Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
  Use "Mac" instead of "OSX" to identify macOS in PHP_OS_FAMILY
  Avoid run-time checks performed at compile-time.
  Fixed performance degradaton introduced in f6ac96b
  NEWS
  NEWS
  Fix bug #74705 for collator_get_sort_key
  Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()
  NEWS
  NEWS
  Fixes bug #74708 reflection signatures for random_bytes+random_int

7 years agoChange PHP_OS_FAMILY to "Darwin" instead of "Mac" for Darwin based systems (as sugges...
Kalle Sommer Nielsen [Wed, 14 Jun 2017 01:29:06 +0000 (03:29 +0200)]
Change PHP_OS_FAMILY to "Darwin" instead of "Mac" for Darwin based systems (as suggested by Davey)

7 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Tue, 13 Jun 2017 14:17:57 +0000 (17:17 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Use "Mac" instead of "OSX" to identify macOS in PHP_OS_FAMILY

7 years agoMerge branch 'PHP-7.1'
Dmitry Stogov [Tue, 13 Jun 2017 14:17:26 +0000 (17:17 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Tue, 13 Jun 2017 14:16:13 +0000 (17:16 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)

7 years agoFixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)
Dmitry Stogov [Tue, 13 Jun 2017 14:15:47 +0000 (17:15 +0300)]
Fixed bug #74679 (Incorrect conversion array with WSDL_CACHE_MEMORY)

7 years agoUse "Mac" instead of "OSX" to identify macOS in PHP_OS_FAMILY
Sebastian Bergmann [Tue, 13 Jun 2017 13:45:57 +0000 (15:45 +0200)]
Use "Mac" instead of "OSX" to identify macOS in PHP_OS_FAMILY

7 years agoAvoid run-time checks performed at compile-time.
Dmitry Stogov [Tue, 13 Jun 2017 10:48:58 +0000 (13:48 +0300)]
Avoid run-time checks performed at compile-time.

7 years agoFixed performance degradaton introduced in f6ac96b
Dmitry Stogov [Tue, 13 Jun 2017 09:20:14 +0000 (12:20 +0300)]
Fixed performance degradaton introduced in f6ac96b

7 years agoMerge branch 'PHP-7.1'
Remi Collet [Tue, 13 Jun 2017 06:50:30 +0000 (08:50 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  NEWS
  NEWS
  Fix bug #74705 for collator_get_sort_key
  Fixes bug #74705 Wrong ReflectionInfo for Collator::getSortKey()

7 years agoNEWS
Remi Collet [Tue, 13 Jun 2017 06:50:24 +0000 (08:50 +0200)]
NEWS