]> granicus.if.org Git - php/log
php
5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Fri, 1 Mar 2019 21:44:37 +0000 (22:44 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Update NEWS
  Fix #77609: Tests from mailparse extension fails

5 years agoUpdate NEWS
Peter Kokot [Fri, 1 Mar 2019 21:44:22 +0000 (22:44 +0100)]
Update NEWS

5 years agoFix #77609: Tests from mailparse extension fails
Ralf Habacker [Fri, 1 Mar 2019 21:32:01 +0000 (22:32 +0100)]
Fix #77609: Tests from mailparse extension fails

Add installed php extensions to temporary created ini file

In php extensions configured with phpize, a temporarily generated
php.ini is used for testing, but currently contains no installed
PHP extensions, which is required by the mailparse extension,
for example.

Installed extensions must be added with their absolute path,
because the extension_dir parameter is already occupied.

See https://bugs.php.net/bug.php?id=77609

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 1 Mar 2019 13:55:15 +0000 (14:55 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agocurl_error: return an empty string if no error occurred
Jay Satiro [Fri, 1 Mar 2019 06:37:00 +0000 (01:37 -0500)]
curl_error: return an empty string if no error occurred

CURLOPT_ERRORBUFFER doc says "Do not rely on the contents of the
buffer unless an error code was returned." [1]

Prior to this change the error buffer was returned even if no error had
occurred, and that buffer may contain incorrect information in such a
case. [2]

[1]: https://curl.haxx.se/libcurl/c/CURLOPT_ERRORBUFFER.html
[2]: https://github.com/curl/curl/issues/3629

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 1 Mar 2019 13:51:37 +0000 (14:51 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix bug #77677: WCOREDUMP not available on all systems
Kevin Adler [Mon, 18 Feb 2019 16:32:38 +0000 (10:32 -0600)]
Fix bug #77677: WCOREDUMP not available on all systems

Add #ifdef WCOREDUMP around all uses.

Also Change core dump message to yes/no/unknown in lsapilib.

5 years agoCheck for NULL GC type in objects_store_del
Nikita Popov [Fri, 1 Mar 2019 13:32:11 +0000 (14:32 +0100)]
Check for NULL GC type in objects_store_del

This might happen if OBJ_RELEASE is used on an object that was already
released by GC. Specific cases of this issue were previously fixed in
ffaee27478a9cb338e40edeb5acf233f9cb67111 and
72104d2b6ecbbabd18de15f10739be5ce3dc9ce0, however the issue still
affects 3rd-party extensions using OBJ_RELEASE.

The whole GC type NULL + OBJ_IS_VALID + IS_FREE_CALLED system seems
overly complicated and can probably be simplified in 7.4.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Derick Rethans [Thu, 28 Feb 2019 13:51:10 +0000 (13:51 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoMerge branch 'DateIntervalBogusData' into PHP-7.2
Derick Rethans [Thu, 28 Feb 2019 13:50:58 +0000 (13:50 +0000)]
Merge branch 'DateIntervalBogusData' into PHP-7.2

5 years agoFixed bug #50020 (DateInterval:createDateFromString() silently fails)
Derick Rethans [Thu, 28 Feb 2019 13:50:35 +0000 (13:50 +0000)]
Fixed bug #50020 (DateInterval:createDateFromString() silently fails)

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Thu, 28 Feb 2019 11:52:28 +0000 (12:52 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Sync with behavior change in OpenSSL 1.1.1b

5 years agoSync with behavior change in OpenSSL 1.1.1b
Anatol Belski [Thu, 28 Feb 2019 11:48:47 +0000 (12:48 +0100)]
Sync with behavior change in OpenSSL 1.1.1b

A behavior change in revealed by some openssl_decrypt() based test,
where an encrypt API is used with a decrypt context. The EVP_Cipher*
functions will automatically choose the right operation depending on the
context passed.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 28 Feb 2019 08:58:30 +0000 (09:58 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #77669
Nikita Popov [Thu, 28 Feb 2019 08:58:01 +0000 (09:58 +0100)]
Fixed bug #77669

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 25 Feb 2019 12:01:18 +0000 (13:01 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix assertion in Exception::getMessage() if $message is a ref
Nikita Popov [Mon, 25 Feb 2019 12:00:16 +0000 (13:00 +0100)]
Fix assertion in Exception::getMessage() if $message is a ref

And same for other properties. Encountered in Symfony.

5 years agoFixed compiler warning
Xinchen Hui [Mon, 25 Feb 2019 07:04:04 +0000 (15:04 +0800)]
Fixed compiler warning

5 years agoUpdate NEWS
Xinchen Hui [Mon, 25 Feb 2019 07:00:37 +0000 (15:00 +0800)]
Update NEWS

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Xinchen Hui [Mon, 25 Feb 2019 07:00:23 +0000 (15:00 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #77660 (Segmentation fault on break 2147483648)

5 years agoFixed bug #77660 (Segmentation fault on break 2147483648)
Xinchen Hui [Mon, 25 Feb 2019 07:00:14 +0000 (15:00 +0800)]
Fixed bug #77660 (Segmentation fault on break 2147483648)

5 years agoUpdate NEWS
Xinchen Hui [Mon, 25 Feb 2019 06:42:18 +0000 (14:42 +0800)]
Update NEWS

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Xinchen Hui [Mon, 25 Feb 2019 06:42:01 +0000 (14:42 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)

5 years agoFixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)
Xinchen Hui [Mon, 25 Feb 2019 06:40:53 +0000 (14:40 +0800)]
Fixed bug #77664 (Segmentation fault when using undefined constant in custom wrapper)

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 24 Feb 2019 13:14:36 +0000 (13:14 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoPrint empty string in test for but 77390 just once
Jakub Zelenka [Sun, 24 Feb 2019 13:11:27 +0000 (13:11 +0000)]
Print empty string in test for but 77390 just once

5 years agoUse spaces instead of tabs in bug 77390 test
Jakub Zelenka [Sun, 24 Feb 2019 13:05:43 +0000 (13:05 +0000)]
Use spaces instead of tabs in bug 77390 test

5 years agoRemove result def during jmp_set optimization
Nikita Popov [Fri, 22 Feb 2019 12:41:47 +0000 (13:41 +0100)]
Remove result def during jmp_set optimization

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 22 Feb 2019 11:00:20 +0000 (12:00 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix inference warning about missing key type
Nikita Popov [Fri, 22 Feb 2019 10:55:16 +0000 (11:55 +0100)]
Fix inference warning about missing key type

5 years agoFix #77648: BOM in sapi/apache2handler/php_functions.c
Christoph M. Becker [Fri, 22 Feb 2019 10:03:52 +0000 (11:03 +0100)]
Fix #77648: BOM in sapi/apache2handler/php_functions.c

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 22 Feb 2019 09:13:07 +0000 (10:13 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #77652
Nikita Popov [Fri, 22 Feb 2019 09:11:54 +0000 (10:11 +0100)]
Fixed bug #77652

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Frank Denis [Thu, 21 Feb 2019 15:34:42 +0000 (16:34 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix bug #77646

5 years agoFix bug #77646
Frank Denis [Thu, 21 Feb 2019 15:10:27 +0000 (16:10 +0100)]
Fix bug #77646

5 years agoFix bug #77646
Frank Denis [Thu, 21 Feb 2019 15:10:27 +0000 (16:10 +0100)]
Fix bug #77646

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 21 Feb 2019 12:45:25 +0000 (13:45 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #77597
Nikita Popov [Thu, 21 Feb 2019 12:42:47 +0000 (13:42 +0100)]
Fixed bug #77597

The same variable was reused in two nested loops... The test doesn't
fail on 7.2, but I'm fixing this here anyway as the code is clearly
wrong, and probably erroneous in other situations.

5 years agoFix issue mentioned in #77302
Nikita Popov [Thu, 21 Feb 2019 11:04:49 +0000 (12:04 +0100)]
Fix issue mentioned in #77302

Apparently Serializable::serialize() can return NULL, which is encoded
as N;. As we do not allow back-references to non-object values in
PHP 7.3 we need to make sure that any references are also compiled to
N;.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 20 Feb 2019 11:11:56 +0000 (12:11 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoOpenSSL: Improve non-blocking eof test
Abyr Valg [Sat, 9 Feb 2019 09:15:55 +0000 (12:15 +0300)]
OpenSSL: Improve non-blocking eof test

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Wed, 20 Feb 2019 00:11:06 +0000 (11:11 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoCorrect skipif use for OCI8 password tests
Christopher Jones [Wed, 20 Feb 2019 00:10:57 +0000 (11:10 +1100)]
Correct skipif use for OCI8 password tests

5 years agoPrepare main branch for PHP 7.3.4
Christoph M. Becker [Tue, 19 Feb 2019 12:06:40 +0000 (13:06 +0100)]
Prepare main branch for PHP 7.3.4

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Remi Collet [Tue, 19 Feb 2019 11:47:00 +0000 (12:47 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  bump version to 7.2.17-dev

5 years agobump version to 7.2.17-dev
Remi Collet [Tue, 19 Feb 2019 11:46:52 +0000 (12:46 +0100)]
bump version to 7.2.17-dev

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 18 Feb 2019 13:04:15 +0000 (14:04 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoMake MADV_HUGEPAGE conditional on USE_ZEND_ALLOC_HUGE_PAGES
Nikita Popov [Mon, 18 Feb 2019 13:01:45 +0000 (14:01 +0100)]
Make MADV_HUGEPAGE conditional on USE_ZEND_ALLOC_HUGE_PAGES

There have been multiple reports of large slowdowns due to the
use of MADV_HUGEPAGE, so make it conditional on
USE_ZEND_ALLOC_HUGE_PAGES, just like MAP_HUGETLB already is.

5 years agoFix #77626: Persistence confusion in php_com_import_typelib()
Christoph M. Becker [Fri, 15 Feb 2019 17:50:13 +0000 (18:50 +0100)]
Fix #77626: Persistence confusion in php_com_import_typelib()

We apply only the most minimal fix here, and will cater to the
unnecessary re-allocation for PHP-7.4.

We don't need to add a regression test, since bug39606.phpt and
bug77621.phpt already show the misbehavior.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Thu, 14 Feb 2019 23:37:39 +0000 (00:37 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77621: Already defined constants are not properly reported

5 years agoFix #77621: Already defined constants are not properly reported
Christoph M. Becker [Thu, 14 Feb 2019 23:35:21 +0000 (00:35 +0100)]
Fix #77621: Already defined constants are not properly reported

We must not check uninitialized values (i.e. `c.value`), and we have to
use proper types for printf-style formats (i.e. `char *` instead of
`zend_string *`).

5 years agoFixed bug #77612
Nikita Popov [Thu, 14 Feb 2019 09:42:59 +0000 (10:42 +0100)]
Fixed bug #77612

Port php_setcookie() to use the smart_str API to ensure that there
can be no string truncation issues.

5 years agoWork around compiler flag dependent ABI
Nikita Popov [Wed, 13 Feb 2019 15:52:46 +0000 (16:52 +0100)]
Work around compiler flag dependent ABI

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Peter Kokot [Wed, 13 Feb 2019 18:26:02 +0000 (19:26 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Refactor timelib.m4

5 years agoRefactor timelib.m4
Peter Kokot [Wed, 26 Sep 2018 17:29:25 +0000 (19:29 +0200)]
Refactor timelib.m4

The ext/date/lib is bundled library and also includes additional
timelib.m4 macros and checks specific for PHP.

All the checks in the timelib.m4 are already done in the PHP's
configure.ac:
- headers except for io.h and strings.h
- two functions checked strftime and gettimeofday
- if size of longint is 8
- if size of int is 4
- int32_t and uint32_t types using the PHP_CHECK_STDINT_TYPES

Macro `AC_TIMELIB_C_BIGENDIAN` defined in timelib.m4 is not used.

The two checkings for strtoll and atoll have been moved to date extension's
config0.m4 file.

Additional check for headers <io.h> and <strings.h> has been added to
config0.m4 of the date extension.

Therefore the timelib.m4 can be simplified and removed from the bundled
library to have easier maintenance in the later branches and also
upstream library.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Johannes Schlüter [Tue, 12 Feb 2019 14:00:15 +0000 (15:00 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoMerge remote-tracking branch 'origin/PHP-7.3' into PHP-7.3
Johannes Schlüter [Tue, 12 Feb 2019 13:59:59 +0000 (14:59 +0100)]
Merge remote-tracking branch 'origin/PHP-7.3' into PHP-7.3

5 years agoMerge remote-tracking branch 'origin/PHP-7.2' into PHP-7.2
Johannes Schlüter [Tue, 12 Feb 2019 13:59:27 +0000 (14:59 +0100)]
Merge remote-tracking branch 'origin/PHP-7.2' into PHP-7.2

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 12 Feb 2019 10:43:23 +0000 (11:43 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #75546
DanielCiochiu [Tue, 12 Feb 2019 10:40:46 +0000 (11:40 +0100)]
Fixed bug #75546

By respecting the SILENT flag when checking the visibility of a
class constant.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 12 Feb 2019 09:50:09 +0000 (10:50 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #77608
Nikita Popov [Tue, 12 Feb 2019 09:49:20 +0000 (10:49 +0100)]
Fixed bug #77608

Remove special handling of doubles and escape them as usual instead.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 12 Feb 2019 09:10:22 +0000 (10:10 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoMake pid & uid available while handling realtime signals
hsldymq [Wed, 27 Jun 2018 18:25:11 +0000 (02:25 +0800)]
Make pid & uid available while handling realtime signals

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 12 Feb 2019 08:57:18 +0000 (09:57 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoRemove "defensive copy" of DatePeriod properties
Nikita Popov [Tue, 12 Feb 2019 08:54:52 +0000 (09:54 +0100)]
Remove "defensive copy" of DatePeriod properties

get_properties() constructs these as fresh objects with no relation
to the internals, there is no need to clone them again. Additionally
the current implementation leaks memory, because the original objects
are never freed (see PR #3121).

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 12 Feb 2019 08:28:47 +0000 (09:28 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFixed bug #77564: Memory leak in exif_process_IFD_TAG
Ben Ramsey [Sun, 10 Feb 2019 18:25:19 +0000 (12:25 -0600)]
Fixed bug #77564: Memory leak in exif_process_IFD_TAG

The memory leak occurs when more than one UserComment tag is present in
the EXIF data. It's still considered corrupt EXIF data, but this ensures
the memory is freed before trying to set to already allocated memory.

5 years agoFixed bug #77599 (Unbuffered queries; native prepared statements memory leak)
Dmitry Stogov [Tue, 12 Feb 2019 07:55:05 +0000 (10:55 +0300)]
Fixed bug #77599 (Unbuffered queries; native prepared statements memory leak)

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Tue, 12 Feb 2019 07:21:59 +0000 (10:21 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Avoid dependency on "struct flock" fields order.

5 years agoAvoid dependency on "struct flock" fields order.
Dmitry Stogov [Tue, 12 Feb 2019 07:15:16 +0000 (10:15 +0300)]
Avoid dependency on "struct flock" fields order.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Tue, 12 Feb 2019 06:30:28 +0000 (22:30 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Replace broken binary SDK version

5 years agoReplace broken binary SDK version
Anatol Belski [Tue, 12 Feb 2019 06:28:34 +0000 (22:28 -0800)]
Replace broken binary SDK version

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Tue, 12 Feb 2019 06:13:42 +0000 (22:13 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Update SDK version for AppVeyor

5 years agoUpdate SDK version for AppVeyor
Anatol Belski [Tue, 12 Feb 2019 06:12:16 +0000 (22:12 -0800)]
Update SDK version for AppVeyor

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Darek Slusarczyk [Mon, 11 Feb 2019 17:18:57 +0000 (18:18 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoMerge branch 'PHP-7.1' into PHP-7.2
Darek Slusarczyk [Mon, 11 Feb 2019 17:08:21 +0000 (18:08 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

5 years agosecurity fix - by default 'local infile' is disabled:
Darek Slusarczyk [Mon, 11 Feb 2019 16:16:49 +0000 (17:16 +0100)]
security fix - by default 'local infile' is disabled:
- set default for mysqli.allow_local_infile=0
- explicitly disable PDO::MYSQL_ATTR_LOCAL_INFILE in case of lack of driver options
- add getAttribute support for PDO::MYSQL_ATTR_LOCAL_INFILE
- update existing tests where needed
- add new tests [checking default value and setting on] the 'local infile' in ext/mysqli and ext/pdo_mysql

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 11 Feb 2019 14:50:33 +0000 (15:50 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix bug #51068 (glob:// do not support current path relative)
Ahmed Abdou [Tue, 29 Jan 2019 07:59:45 +0000 (08:59 +0100)]
Fix bug #51068 (glob:// do not support current path relative)

Fix DirectoryIterator glob://* current path relative queries

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 11 Feb 2019 10:32:42 +0000 (11:32 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix #77552: Uninitialized buffer in stat functions
johnstevenson [Fri, 1 Feb 2019 19:45:20 +0000 (19:45 +0000)]
Fix #77552: Uninitialized buffer in stat functions

5 years agoFix tests bareword fallback with error suppression
Guilliam Xavier [Thu, 31 Jan 2019 11:25:51 +0000 (12:25 +0100)]
Fix tests bareword fallback with error suppression

(cherry picked from commit aad39879f2d2e89de105c4f87d334ee129b4321c)
(cherry picked from commit 76f8a908bb18aee92b8f3d523b74b06c9d12cb6b)

5 years agoregenerate with re2c 1.0.3
Xinchen Hui [Mon, 11 Feb 2019 07:42:55 +0000 (15:42 +0800)]
regenerate with re2c 1.0.3

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Xinchen Hui [Mon, 11 Feb 2019 07:28:44 +0000 (15:28 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #77589 (Core dump using parse_ini_string with numeric sections)

Conflicts:
Zend/zend_ini_scanner.c

5 years agoFixed bug #77589 (Core dump using parse_ini_string with numeric sections)
Xinchen Hui [Mon, 11 Feb 2019 07:27:29 +0000 (15:27 +0800)]
Fixed bug #77589 (Core dump using parse_ini_string with numeric sections)

Section name should not be typed(NULL, FALSE, TRUE etc)

5 years agoMerge PDO_OCI PR
Christopher Jones [Mon, 11 Feb 2019 05:38:23 +0000 (16:38 +1100)]
Merge PDO_OCI PR

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Mon, 11 Feb 2019 05:36:39 +0000 (16:36 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  PDO_OCI tracing attribute PR merge
  pdo_oci: Add client identifier and module attrs
  pdo_oci: Register new attr constants and add tests
  pdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFO

5 years agoPDO_OCI tracing attribute PR merge
Christopher Jones [Mon, 11 Feb 2019 05:19:13 +0000 (16:19 +1100)]
PDO_OCI tracing attribute PR merge

5 years agopdo_oci: Add client identifier and module attrs
Cameron Porter [Fri, 25 Jan 2019 17:44:10 +0000 (11:44 -0600)]
pdo_oci: Add client identifier and module attrs

Add tests for the new attributes, and check the setAttribute return
value.

5 years agopdo_oci: Register new attr constants and add tests
Cameron Porter [Thu, 24 Jan 2019 18:40:26 +0000 (12:40 -0600)]
pdo_oci: Register new attr constants and add tests

5 years agopdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFO
Cameron Porter [Thu, 24 Jan 2019 02:14:00 +0000 (20:14 -0600)]
pdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFO

Add the ability to set the action and client info on the database
session for PDO OCI using PDO attributes.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 8 Feb 2019 09:09:39 +0000 (10:09 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoFix FTPS passive mode of data channel event poll
YanTao [Fri, 8 Feb 2019 03:41:41 +0000 (11:41 +0800)]
Fix FTPS passive mode of data channel event poll

Bugfix: when using passive mode of FTPS protocol, data channel events
should be polled when creating data connection channel, instead of polling
the event of ftp's self control channel, which may cause ftp transfer
problem while using ftps and passive mode.

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Fri, 8 Feb 2019 06:28:45 +0000 (22:28 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Sync test with changes in libcurl 7.64.0
  Sync test for libcurl 7.64.0

5 years agoSync test with changes in libcurl 7.64.0
Anatol Belski [Fri, 8 Feb 2019 06:22:38 +0000 (22:22 -0800)]
Sync test with changes in libcurl 7.64.0

5 years agoSync test for libcurl 7.64.0
Anatol Belski [Fri, 8 Feb 2019 06:21:59 +0000 (22:21 -0800)]
Sync test for libcurl 7.64.0

5 years agoUse pkg-config for ICU, as the old icu-config has been deprecated
Derick Rethans [Wed, 6 Feb 2019 10:39:55 +0000 (10:39 +0000)]
Use pkg-config for ICU, as the old icu-config has been deprecated

5 years agoMerge branch 'PHP-7.2' into PHP-7.3
Derick Rethans [Thu, 7 Feb 2019 11:12:42 +0000 (11:12 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3

5 years agoUse pkg-config for ICU, as the old icu-config has been deprecated
Derick Rethans [Wed, 6 Feb 2019 10:39:55 +0000 (10:39 +0000)]
Use pkg-config for ICU, as the old icu-config has been deprecated