]> granicus.if.org Git - php/log
php
7 years agoUse zval_ptr_dtor_nogc() in places where circular zvals are not possible
Dmitry Stogov [Mon, 9 Oct 2017 09:24:11 +0000 (12:24 +0300)]
Use zval_ptr_dtor_nogc() in places where circular zvals are not possible

7 years agoUpdate README information for the libmbfl library
Peter Kokot [Sun, 8 Oct 2017 15:29:46 +0000 (17:29 +0200)]
Update README information for the libmbfl library

The libmbfl library is bundled with PHP and has its own repository for
development and bug fixes. To avoid confusion and faster development the
README has been updated to include the information of the original library and
to use the bundled library as a fork of the upstream repository instead.

7 years agoRefactor mbstring READMEs
Peter Kokot [Sun, 8 Oct 2017 12:08:23 +0000 (14:08 +0200)]
Refactor mbstring READMEs

7 years agoRemove code examples from dom extension
Peter Kokot [Sun, 8 Oct 2017 01:09:37 +0000 (03:09 +0200)]
Remove code examples from dom extension

PHP documentation is a better place to present code examples. Tests
for ext/dom already include all used PHP code.

7 years agoRemove old apache_hooks occurrence
Peter Kokot [Thu, 5 Oct 2017 17:07:28 +0000 (19:07 +0200)]
Remove old apache_hooks occurrence

The apache_hooks SAPI has been removed since PHP >= 7.0 and there is no
need to have two different php_request_startup definitions.

Also php_request_startup_for_hook() and php_request_shutdown_for_hook() functions
are not used in the PHP source code directly anymore. They are out of sync and
are not touched when making changes to the shutdown sequence.

The php_start_sapi() function was therefore not used anymore and is
removed.

7 years agoRemove some old apache2filter occurrences
Peter Kokot [Thu, 5 Oct 2017 15:55:29 +0000 (17:55 +0200)]
Remove some old apache2filter occurrences

apache2filter was supported in PHP <= 5.6. This patch removes some old
apache2filter occurrences. Also FreeBSD warning therefore is not needed
anymore when building PHP with apache2filter and in later versions don't
need to set the --with-tsrm-pth option.

7 years agoRemove unused Travis configuration for sapi/phpdbg
Peter Kokot [Thu, 5 Oct 2017 14:49:43 +0000 (16:49 +0200)]
Remove unused Travis configuration for sapi/phpdbg

The phpdbg sapi has been initially developed under the
github.com/krakjoe/krakjoe/phpdbg repository with its own Travis-CI.org
configuration. Since 2017-03-16 the main development is happening in the main
php-src repository.

7 years agoRemove README from ext/tidy in favor of the PHP docs
Peter Kokot [Fri, 6 Oct 2017 21:37:32 +0000 (23:37 +0200)]
Remove README from ext/tidy in favor of the PHP docs

The tidy introduction includes an outdated link to tidy HTML library homepage,
and PHP documentation presents the tidy PHP extension better instead.

7 years agoRemove outdated README from ext/com_dotnet
Peter Kokot [Sat, 7 Oct 2017 20:31:38 +0000 (22:31 +0200)]
Remove outdated README from ext/com_dotnet

The PHP documentation includes updated and better com_dotnet
information.

7 years agoRemove done TODO file from date extension
Peter Kokot [Sat, 7 Oct 2017 22:45:36 +0000 (00:45 +0200)]
Remove done TODO file from date extension

TODO file for date extension has been outdated:

- date_default_timezone_set_error.phpt includes checking that
  date_default_timezone_set() validates the passed timezone identifiers.

- ext/date/php_date.c includes timezone caching

- errors are included in date_parse() return value.

7 years agoMerge branch 'PHP-7.2'
Sara Golemon [Sat, 7 Oct 2017 14:14:11 +0000 (10:14 -0400)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS
  Add line numbers to Optimizer debug output

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Sara Golemon [Sat, 7 Oct 2017 14:14:03 +0000 (10:14 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Sara Golemon [Sat, 7 Oct 2017 14:13:54 +0000 (10:13 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS

7 years agoBugfix #74556 stream_socket_get_name() returns null bytes on MacOS
Sara Golemon [Sat, 7 Oct 2017 14:08:34 +0000 (10:08 -0400)]
Bugfix #74556 stream_socket_get_name() returns null bytes on MacOS

7 years agoAdd line numbers to Optimizer debug output
Rasmus Lerdorf [Fri, 6 Oct 2017 20:18:12 +0000 (17:18 -0300)]
Add line numbers to Optimizer debug output

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Fri, 6 Oct 2017 15:16:54 +0000 (17:16 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Fri, 6 Oct 2017 14:56:46 +0000 (16:56 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 6 Oct 2017 14:46:22 +0000 (16:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)

7 years agoFixed bug #75318 (The parameter of UConverter::getAliases() is not optional)
Christoph M. Becker [Fri, 6 Oct 2017 14:45:07 +0000 (16:45 +0200)]
Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)

Of course, reflection has to know that as well.

7 years agoAdd line numbers to Opcache's zend_dump_op() debug output
Rasmus Lerdorf [Fri, 6 Oct 2017 14:03:07 +0000 (11:03 -0300)]
Add line numbers to Opcache's zend_dump_op() debug output

7 years agomb_convert_variables() refactored to use simple recursion.
Dmitry Stogov [Fri, 6 Oct 2017 09:08:55 +0000 (12:08 +0300)]
mb_convert_variables() refactored to use simple recursion.
Fixed incorrect recursion protection (previous implementation kept protection flag or apply counter in non-zero state).

7 years agoFixed incorrect recursion detection
Dmitry Stogov [Fri, 6 Oct 2017 08:47:11 +0000 (11:47 +0300)]
Fixed incorrect recursion detection

7 years agoHASH_FLAG_PERSISTENT renamed into IS_ARRAY_PERSISTENT and moved into GC_FLAGS (to...
Dmitry Stogov [Thu, 5 Oct 2017 23:54:14 +0000 (02:54 +0300)]
HASH_FLAG_PERSISTENT renamed into IS_ARRAY_PERSISTENT and moved into GC_FLAGS (to be consistent with IS_STR_PERSISTENT).

7 years agoRefactored recursion pretection
Dmitry Stogov [Thu, 5 Oct 2017 22:34:50 +0000 (01:34 +0300)]
Refactored recursion pretection

7 years agoJoin untracked files to root .gitignore
Peter Kokot [Thu, 5 Oct 2017 00:24:11 +0000 (02:24 +0200)]
Join untracked files to root .gitignore

7 years agoRemove ident gitattribute for Zend/RFC/
Peter Kokot [Wed, 27 Sep 2017 23:21:59 +0000 (01:21 +0200)]
Remove ident gitattribute for Zend/RFC/

7 years agoRemove PHP examples from simplexml
Peter Kokot [Wed, 4 Oct 2017 22:30:53 +0000 (00:30 +0200)]
Remove PHP examples from simplexml

7 years agoRemove enchant PHP example
Peter Kokot [Wed, 4 Oct 2017 21:53:51 +0000 (23:53 +0200)]
Remove enchant PHP example

7 years agoMerge branch 'PHP-7.2'
Nikita Popov [Thu, 5 Oct 2017 10:26:32 +0000 (12:26 +0200)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Thu, 5 Oct 2017 10:25:52 +0000 (12:25 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 5 Oct 2017 10:25:20 +0000 (12:25 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFixed bug #75311
Mathieu CARBONNEAUX [Wed, 4 Oct 2017 23:34:20 +0000 (01:34 +0200)]
Fixed bug #75311

7 years agoRemoved unused flags
Dmitry Stogov [Wed, 4 Oct 2017 21:04:59 +0000 (00:04 +0300)]
Removed unused flags

7 years agoChanged the way VM accesses constant operands in 64-bit builds.
Dmitry Stogov [Wed, 4 Oct 2017 13:53:01 +0000 (16:53 +0300)]
Changed the way VM accesses constant operands in 64-bit builds.

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Wed, 4 Oct 2017 13:40:03 +0000 (16:40 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed rarely possible use-after-free

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Wed, 4 Oct 2017 13:39:47 +0000 (16:39 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed rarely possible use-after-free

7 years agoFixed rarely possible use-after-free
Dmitry Stogov [Wed, 4 Oct 2017 13:38:55 +0000 (16:38 +0300)]
Fixed rarely possible use-after-free

7 years agoFixed invalid type
Dmitry Stogov [Wed, 4 Oct 2017 13:06:57 +0000 (16:06 +0300)]
Fixed invalid type

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Wed, 4 Oct 2017 07:00:07 +0000 (10:00 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Bumped ext/oci8 version
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Wed, 4 Oct 2017 06:59:27 +0000 (09:59 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Bumped ext/oci8 version
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Wed, 4 Oct 2017 06:58:32 +0000 (09:58 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Bumped ext/oci8 version
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs

7 years agoBumped ext/oci8 version
Dmitry Stogov [Wed, 4 Oct 2017 06:56:25 +0000 (09:56 +0300)]
Bumped ext/oci8 version

7 years agoMerge branch 'oci8_fix' into PHP-7.0
Dmitry Stogov [Wed, 4 Oct 2017 06:49:40 +0000 (09:49 +0300)]
Merge branch 'oci8_fix' into PHP-7.0

* oci8_fix:
  Use dereferenced value
  Fixed compilation errors
  Restored code for BOOL variables
  Fixed few ext/oci8 bugs

7 years ago[ci skip] Merge branch 'PHP-7.2'
Christoph M. Becker [Tue, 3 Oct 2017 22:31:47 +0000 (00:31 +0200)]
[ci skip] Merge branch 'PHP-7.2'

* PHP-7.2:
  Change EXTENSIONS file encoding from iso-8859-1 to utf-8

7 years ago[ci skip] Merge branch 'pull-request/2776' into PHP-7.2
Christoph M. Becker [Tue, 3 Oct 2017 22:26:47 +0000 (00:26 +0200)]
[ci skip] Merge branch 'pull-request/2776' into PHP-7.2

* pull-request/2776:
  Change EXTENSIONS file encoding from iso-8859-1 to utf-8

7 years agoDon't pass useless arguments
Dmitry Stogov [Tue, 3 Oct 2017 12:24:02 +0000 (15:24 +0300)]
Don't pass useless arguments

7 years agoUse dereferenced value
Dmitry Stogov [Tue, 3 Oct 2017 07:49:56 +0000 (10:49 +0300)]
Use dereferenced value

7 years agoRemove done TODO line from ext/date
Peter Kokot [Sun, 1 Oct 2017 16:45:30 +0000 (18:45 +0200)]
Remove done TODO line from ext/date

7 years agoRemove outdated README from ext/gmp
Peter Kokot [Sat, 30 Sep 2017 01:48:47 +0000 (03:48 +0200)]
Remove outdated README from ext/gmp

The PHP manual now includes better GMP introduction with updated links
to GNU MP library homepage.

7 years agoRemove exif PHP example files
Peter Kokot [Sat, 30 Sep 2017 01:13:24 +0000 (03:13 +0200)]
Remove exif PHP example files

The PHP documentation has all exif functions well documented so these
can be left out of php-src. The exif PHP tests also include all exif_*
functions.

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Tue, 3 Oct 2017 06:22:26 +0000 (07:22 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Typo in status.html

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Tue, 3 Oct 2017 06:22:15 +0000 (07:22 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Typo in status.html

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Tue, 3 Oct 2017 06:22:04 +0000 (07:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Typo in status.html

7 years agoTypo in status.html
Viktor Szépe [Fri, 29 Sep 2017 12:36:23 +0000 (14:36 +0200)]
Typo in status.html

feet needs -> fit needs

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Tue, 3 Oct 2017 06:20:00 +0000 (07:20 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix bug #74905

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Tue, 3 Oct 2017 06:19:23 +0000 (07:19 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #74905

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Tue, 3 Oct 2017 06:19:00 +0000 (07:19 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #74905

7 years agoFix bug #74905
Peter Kokot [Thu, 28 Sep 2017 01:13:18 +0000 (03:13 +0200)]
Fix bug #74905

7 years agoChange ident gitattribute for ext/ext_skel.php
Peter Kokot [Wed, 27 Sep 2017 23:26:50 +0000 (01:26 +0200)]
Change ident gitattribute for ext/ext_skel.php

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Tue, 3 Oct 2017 06:15:27 +0000 (07:15 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Remove ident gitattribute for ext/zip/php_zip.c

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Tue, 3 Oct 2017 06:15:14 +0000 (07:15 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Remove ident gitattribute for ext/zip/php_zip.c

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Tue, 3 Oct 2017 06:15:02 +0000 (07:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Remove ident gitattribute for ext/zip/php_zip.c

7 years agoRemove ident gitattribute for ext/zip/php_zip.c
Peter Kokot [Wed, 27 Sep 2017 23:17:04 +0000 (01:17 +0200)]
Remove ident gitattribute for ext/zip/php_zip.c

7 years agoFixed compilation errors
Dmitry Stogov [Tue, 3 Oct 2017 06:08:28 +0000 (09:08 +0300)]
Fixed compilation errors

7 years agoMerge branch 'PHP-7.2'
Remi Collet [Tue, 3 Oct 2017 04:42:48 +0000 (06:42 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  NEWS
  Fix Bug #75284 sha3 is not supported on bigendian machine
  NEWS

7 years agoNEWS
Remi Collet [Tue, 3 Oct 2017 04:42:39 +0000 (06:42 +0200)]
NEWS

7 years agoFix Bug #75284 sha3 is not supported on bigendian machine
Remi Collet [Fri, 29 Sep 2017 12:38:21 +0000 (14:38 +0200)]
Fix Bug #75284 sha3 is not supported on bigendian machine

7 years agoNEWS
Frank Denis [Mon, 2 Oct 2017 20:47:06 +0000 (22:47 +0200)]
NEWS

7 years agoMerge branch 'PHP-7.2'
Frank Denis [Mon, 2 Oct 2017 20:32:22 +0000 (22:32 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  ext/sodium: untab tests
  ext/sodium: import secretstream test
  ext/sodium: sodium_compare() is always available
  ext/sodium: fix funky indentation
  ext/sodium: move pwhash_scrypt() after pwhash()
  ext/sodium: checks for crypto_box_SEALBYTES are not required
  ext/sodium: explicitly include <string.h>
  ext/sodium: zend_parse_parameters -> zend_parse_parameters_throw
  ext/sodium: fix funky indent on zend_parse_parameters_throw() calls
  ext/sodium: import bindings for secretstream
  ext/sodium: add crypto_pwhash_str_needs_rehash()
  ext/sodium: +base64 codecs (timing-safe)
  ext/sodium: add arginfo definitions that will be required later
  ext/sodium: sort prototypes

7 years agoext/sodium: untab tests
Frank Denis [Mon, 2 Oct 2017 20:28:46 +0000 (22:28 +0200)]
ext/sodium: untab tests

7 years agoext/sodium: import secretstream test
Frank Denis [Mon, 2 Oct 2017 20:28:33 +0000 (22:28 +0200)]
ext/sodium: import secretstream test

7 years agoext/sodium: sodium_compare() is always available
Frank Denis [Mon, 2 Oct 2017 20:23:53 +0000 (22:23 +0200)]
ext/sodium: sodium_compare() is always available

7 years agoext/sodium: fix funky indentation
Frank Denis [Mon, 2 Oct 2017 20:22:22 +0000 (22:22 +0200)]
ext/sodium: fix funky indentation

7 years agoext/sodium: move pwhash_scrypt() after pwhash()
Frank Denis [Mon, 2 Oct 2017 20:19:55 +0000 (22:19 +0200)]
ext/sodium: move pwhash_scrypt() after pwhash()

7 years agoext/sodium: checks for crypto_box_SEALBYTES are not required
Frank Denis [Mon, 2 Oct 2017 20:11:29 +0000 (22:11 +0200)]
ext/sodium: checks for crypto_box_SEALBYTES are not required

7 years agoext/sodium: explicitly include <string.h>
Frank Denis [Mon, 2 Oct 2017 20:10:30 +0000 (22:10 +0200)]
ext/sodium: explicitly include <string.h>

7 years agoext/sodium: zend_parse_parameters -> zend_parse_parameters_throw
Frank Denis [Mon, 2 Oct 2017 20:05:59 +0000 (22:05 +0200)]
ext/sodium: zend_parse_parameters -> zend_parse_parameters_throw

7 years agoext/sodium: fix funky indent on zend_parse_parameters_throw() calls
Frank Denis [Mon, 2 Oct 2017 20:02:47 +0000 (22:02 +0200)]
ext/sodium: fix funky indent on zend_parse_parameters_throw() calls

7 years agoext/sodium: import bindings for secretstream
Frank Denis [Mon, 2 Oct 2017 19:59:51 +0000 (21:59 +0200)]
ext/sodium: import bindings for secretstream

7 years agoext/sodium: add crypto_pwhash_str_needs_rehash()
Frank Denis [Mon, 2 Oct 2017 19:54:50 +0000 (21:54 +0200)]
ext/sodium: add crypto_pwhash_str_needs_rehash()

Also properly define xchacha20poly1305_ietf_keygen()

7 years agoext/sodium: +base64 codecs (timing-safe)
Frank Denis [Mon, 2 Oct 2017 19:43:54 +0000 (21:43 +0200)]
ext/sodium: +base64 codecs (timing-safe)

7 years agoext/sodium: add arginfo definitions that will be required later
Frank Denis [Mon, 2 Oct 2017 19:40:38 +0000 (21:40 +0200)]
ext/sodium: add arginfo definitions that will be required later

Don't check for existence of aesgcm symbols, since we only support
libsodium >= 1.0.8

7 years agoext/sodium: sort prototypes
Frank Denis [Mon, 2 Oct 2017 19:36:35 +0000 (21:36 +0200)]
ext/sodium: sort prototypes

7 years agoRestored code for BOOL variables
Dmitry Stogov [Mon, 2 Oct 2017 14:04:26 +0000 (17:04 +0300)]
Restored code for BOOL variables

7 years agoMerge branch 'PHP-7.2'
Remi Collet [Mon, 2 Oct 2017 09:27:09 +0000 (11:27 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  NEWS
  Fixed bug #75303 sha3 hangs on bigendian

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Remi Collet [Mon, 2 Oct 2017 09:26:46 +0000 (11:26 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  NEWS
  Fixed bug #75303 sha3 hangs on bigendian

7 years agoNEWS
Remi Collet [Mon, 2 Oct 2017 09:26:08 +0000 (11:26 +0200)]
NEWS

7 years agoFixed bug #75303 sha3 hangs on bigendian
Remi Collet [Mon, 2 Oct 2017 09:25:23 +0000 (11:25 +0200)]
Fixed bug #75303 sha3 hangs on bigendian

7 years agoMerge branch 'PHP-7.2'
Sara Golemon [Mon, 2 Oct 2017 01:38:55 +0000 (21:38 -0400)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Guard against AI_NUMERICSERV not being defined.

7 years agoGuard against AI_NUMERICSERV not being defined.
Sara Golemon [Mon, 2 Oct 2017 01:32:06 +0000 (21:32 -0400)]
Guard against AI_NUMERICSERV not being defined.

7 years agoGuard against AI_NUMERICSERV not being defined.
Sara Golemon [Mon, 2 Oct 2017 01:32:06 +0000 (21:32 -0400)]
Guard against AI_NUMERICSERV not being defined.

7 years agoMerge branch 'PHP-7.2'
Frank Denis [Sun, 1 Oct 2017 14:01:25 +0000 (16:01 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  ext/sodium: fix pwhash_argon2i test

7 years agoext/sodium: fix pwhash_argon2i test
Frank Denis [Sun, 1 Oct 2017 14:00:41 +0000 (16:00 +0200)]
ext/sodium: fix pwhash_argon2i test

7 years agoMerge branch 'patch-experimental' of https://github.com/petk/php-src
Xinchen Hui [Sat, 30 Sep 2017 04:24:39 +0000 (12:24 +0800)]
Merge branch 'patch-experimental' of https://github.com/petk/php-src

* 'patch-experimental' of https://github.com/petk/php-src:
  Remove EXPERIMENTAL files from fileinfo and pdo_odbc stable extensions

7 years agoMerge branch 'patch-mysqli-todo' of https://github.com/petk/php-src
Xinchen Hui [Sat, 30 Sep 2017 04:23:14 +0000 (12:23 +0800)]
Merge branch 'patch-mysqli-todo' of https://github.com/petk/php-src

* 'patch-mysqli-todo' of https://github.com/petk/php-src:
  Remove done and old TODO file from ext/mysqli

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Sat, 30 Sep 2017 04:16:05 +0000 (12:16 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix bug #75279

Conflicts:
ext/standard/dl.c

7 years agoMerge branch 'patch-compile-warning' of https://github.com/petk/php-src into PHP-7.2
Xinchen Hui [Sat, 30 Sep 2017 04:14:21 +0000 (12:14 +0800)]
Merge branch 'patch-compile-warning' of https://github.com/petk/php-src into PHP-7.2

* 'patch-compile-warning' of https://github.com/petk/php-src:
  Fix bug #75279

7 years agoRemove done and old TODO file from ext/mysqli
Peter Kokot [Sat, 30 Sep 2017 01:23:28 +0000 (03:23 +0200)]
Remove done and old TODO file from ext/mysqli

Since PHP documentation and ini settings should be updated for the
mysqli extension, this patch removes an old and done TODO file from
ext/mysqli folder.

7 years agoRemove EXPERIMENTAL files from fileinfo and pdo_odbc stable extensions
Peter Kokot [Fri, 29 Sep 2017 23:58:08 +0000 (01:58 +0200)]
Remove EXPERIMENTAL files from fileinfo and pdo_odbc stable extensions

7 years agoMerge branch 'PHP-7.2'
Andrea Faulds [Fri, 29 Sep 2017 20:39:26 +0000 (21:39 +0100)]
Merge branch 'PHP-7.2'