]> granicus.if.org Git - php/log
php
7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Remi Collet [Wed, 3 Jan 2018 14:07:18 +0000 (15:07 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  2018

7 years agomissing changelog entries
Remi Collet [Wed, 3 Jan 2018 14:07:09 +0000 (15:07 +0100)]
missing changelog entries

7 years ago2018
Remi Collet [Wed, 3 Jan 2018 14:04:48 +0000 (15:04 +0100)]
2018

7 years agoMerge branch 'PHP-7.1-copyright' of https://github.com/kaplanlior/php-src into PHP-7.1
Xinchen Hui [Wed, 3 Jan 2018 07:59:05 +0000 (15:59 +0800)]
Merge branch 'PHP-7.1-copyright' of https://github.com/kaplanlior/php-src into PHP-7.1

* 'PHP-7.1-copyright' of https://github.com/kaplanlior/php-src:
  Happy new year (Update copyright to 2018)

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Tue, 2 Jan 2018 23:34:24 +0000 (00:34 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Tue, 2 Jan 2018 23:33:20 +0000 (00:33 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

7 years agophp 5.6.34 is next
Ferenc Kovacs [Tue, 2 Jan 2018 23:30:58 +0000 (00:30 +0100)]
php 5.6.34 is next

7 years agoHappy new year (Update copyright to 2018)
Lior Kaplan [Tue, 2 Jan 2018 21:42:29 +0000 (23:42 +0200)]
Happy new year (Update copyright to 2018)

7 years agoSkip test for pdo_odbc
Anatol Belski [Tue, 2 Jan 2018 11:12:46 +0000 (12:12 +0100)]
Skip test for pdo_odbc

The error messages are too discrepant and '-' is otherwise not allowed
by the parser.

7 years agoFix test for pdo_odbc
Anatol Belski [Tue, 2 Jan 2018 10:34:57 +0000 (11:34 +0100)]
Fix test for pdo_odbc

SqlServer requires parentheses to the TOP argument.

7 years agoFix some int/long confusion issues in GMP
Stanislav Malyshev [Tue, 2 Jan 2018 08:10:27 +0000 (00:10 -0800)]
Fix some int/long confusion issues in GMP

mpz_setbit seems to have limit of INT_MAX * GMP_NUMB_BITS on
the number of bits supported, and will abort() if that limit
is exceeded.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 2 Jan 2018 06:49:53 +0000 (07:49 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Tue, 2 Jan 2018 06:49:09 +0000 (07:49 +0100)]
[ci skip] update NEWS

7 years agoregenerated with newer re2c
Xinchen Hui [Tue, 2 Jan 2018 05:54:29 +0000 (13:54 +0800)]
regenerated with newer re2c

7 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Xinchen Hui [Tue, 2 Jan 2018 05:49:58 +0000 (13:49 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS

7 years agoyear++
Xinchen Hui [Tue, 2 Jan 2018 04:53:31 +0000 (12:53 +0800)]
year++

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Stanislav Malyshev [Tue, 2 Jan 2018 04:52:34 +0000 (20:52 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS

7 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Tue, 2 Jan 2018 04:28:01 +0000 (20:28 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Update NEWS
  Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
  Fix bug #74782: remove file name from output to avoid XSS

7 years agoUpdate NEWS
Stanislav Malyshev [Tue, 2 Jan 2018 03:53:00 +0000 (19:53 -0800)]
Update NEWS

7 years agoFixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx
Christoph M. Becker [Wed, 29 Nov 2017 17:52:33 +0000 (18:52 +0100)]
Fixed bug #75571: Potential infinite loop in gdImageCreateFromGifCtx

Due to a signedness confusion in `GetCode_` a corrupt GIF file can
trigger an infinite loop.  Furthermore we make sure that a GIF without
any palette entries is treated as invalid *after* open palette entries
have been removed.

7 years agoFix bug #74782: remove file name from output to avoid XSS
Stanislav Malyshev [Sun, 2 Jul 2017 20:29:37 +0000 (13:29 -0700)]
Fix bug #74782: remove file name from output to avoid XSS

7 years agoFixed bug #75502
Nikita Popov [Mon, 1 Jan 2018 20:23:10 +0000 (21:23 +0100)]
Fixed bug #75502

The string keys were not duplicated into persistent memory in this
case.

7 years agoUse seialize_precision instead of precision in all json tests
Jakub Zelenka [Sat, 30 Dec 2017 17:34:01 +0000 (17:34 +0000)]
Use seialize_precision instead of precision in all json tests

7 years agoFixed bug #75720 (File cache not populated after SHM runs full)
Dmitry Stogov [Thu, 28 Dec 2017 11:08:12 +0000 (14:08 +0300)]
Fixed bug #75720 (File cache not populated after SHM runs full)

7 years agoFixed reference-counting
Dmitry Stogov [Thu, 28 Dec 2017 08:19:52 +0000 (11:19 +0300)]
Fixed reference-counting

7 years agoFixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)
Xinchen Hui [Wed, 27 Dec 2017 04:51:50 +0000 (12:51 +0800)]
Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry)

7 years agoRevert to Postgres 9.6, AppVeyor seems to have issues with 10
Anatol Belski [Fri, 22 Dec 2017 22:38:04 +0000 (23:38 +0100)]
Revert to Postgres 9.6, AppVeyor seems to have issues with 10

7 years agoUpdate tool path
Anatol Belski [Fri, 22 Dec 2017 22:25:24 +0000 (23:25 +0100)]
Update tool path

7 years agoSwitch AppVeyor to PostgreSQL 10 for tests
Anatol Belski [Fri, 22 Dec 2017 22:12:27 +0000 (23:12 +0100)]
Switch AppVeyor to PostgreSQL 10 for tests

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 22 Dec 2017 17:59:30 +0000 (18:59 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update NEWS
  Fixed bug #75579 (Interned strings buffer overflow may cause crash)

7 years ago[ci skip] update NEWS
Anatol Belski [Fri, 22 Dec 2017 17:22:33 +0000 (18:22 +0100)]
[ci skip] update NEWS

7 years agoFixed bug #75579 (Interned strings buffer overflow may cause crash)
Dmitry Stogov [Thu, 21 Dec 2017 20:34:21 +0000 (23:34 +0300)]
Fixed bug #75579 (Interned strings buffer overflow may cause crash)

(cherry picked from commit 37bf8bdc1494abb2ce5cac40e0be80e23682f851)

7 years agoFixed bug #73209
Nikita Popov [Fri, 22 Dec 2017 17:11:38 +0000 (18:11 +0100)]
Fixed bug #73209

7 years agoFixed bug #75242
Nikita Popov [Fri, 22 Dec 2017 17:11:38 +0000 (18:11 +0100)]
Fixed bug #75242

7 years agoFixed bug #75717
Nikita Popov [Fri, 22 Dec 2017 17:00:17 +0000 (18:00 +0100)]
Fixed bug #75717

7 years agoFixed bug #70469
Anton Artamonov [Sat, 4 Nov 2017 12:51:33 +0000 (19:51 +0700)]
Fixed bug #70469

Don't generate an E_ERROR if we've already thrown an exception.
This interacts badly with error_get_last() checks.

7 years agoFix wrong return value for fail case in set attribute handler in pdo_odbc
Anatol Belski [Fri, 22 Dec 2017 15:41:46 +0000 (16:41 +0100)]
Fix wrong return value for fail case in set attribute handler in pdo_odbc

7 years agopdo_odbc has no driver API for quoting, skip the test
Anatol Belski [Fri, 22 Dec 2017 15:22:12 +0000 (16:22 +0100)]
pdo_odbc has no driver API for quoting, skip the test

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Thu, 21 Dec 2017 20:35:23 +0000 (23:35 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75579 (Interned strings buffer overflow may cause crash)

7 years agoFixed bug #75579 (Interned strings buffer overflow may cause crash)
Dmitry Stogov [Thu, 21 Dec 2017 20:34:21 +0000 (23:34 +0300)]
Fixed bug #75579 (Interned strings buffer overflow may cause crash)

7 years agoEnsure expected items delivered in same order
Anatol Belski [Thu, 21 Dec 2017 17:37:23 +0000 (18:37 +0100)]
Ensure expected items delivered in same order

7 years agoFix segfault. Compile param --with-tsrm-pth=yes
Evgeny Kalashnikov [Thu, 21 Dec 2017 12:48:10 +0000 (13:48 +0100)]
Fix segfault. Compile param --with-tsrm-pth=yes

7 years agoTemplatize driver name in the expected string
Anatol Belski [Wed, 20 Dec 2017 17:46:56 +0000 (18:46 +0100)]
Templatize driver name in the expected string

7 years agoMove includes in ps_title.c
David Carlier [Mon, 2 Oct 2017 13:42:58 +0000 (13:42 +0000)]
Move includes in ps_title.c

The HAVE_UNISTD_H check has to be after including config.h.

Also include sys/types.h, which may be needed for setproctitle.

7 years agoFix bug #69727: Support SOURCE_DATE_EPOCH for Build Date
Jelle van der Waa [Fri, 8 Dec 2017 18:19:22 +0000 (19:19 +0100)]
Fix bug #69727: Support SOURCE_DATE_EPOCH for Build Date

When checking for reproducible builds php is build twice, once with the
current date and once with a date in the future. To keep the build date
supported and reproducible builds possible, SOURCE_DATE_EPOCH is
introduced which can be set to the same epoch value for both builds.

7 years ago[ci skip] update NEWS
Anatol Belski [Fri, 15 Dec 2017 15:25:36 +0000 (16:25 +0100)]
[ci skip] update NEWS

7 years agoFixed bug #75671 pg_version() crashes when called on a connection to cockroach
Anatol Belski [Fri, 15 Dec 2017 14:33:14 +0000 (15:33 +0100)]
Fixed bug #75671 pg_version() crashes when called on a connection to cockroach

7 years ago[ci skip] update NEWS
Anatol Belski [Thu, 14 Dec 2017 17:17:19 +0000 (18:17 +0100)]
[ci skip] update NEWS

7 years agoFixed bug #75679 Path 260 character problem
Anatol Belski [Thu, 14 Dec 2017 15:16:50 +0000 (16:16 +0100)]
Fixed bug #75679 Path 260 character problem

7 years agoFix copy-and-paste bugs
Levi Morrison [Wed, 13 Dec 2017 05:39:28 +0000 (22:39 -0700)]
Fix copy-and-paste bugs

7 years agoSync known vc++ versions in 7.1
Anatol Belski [Mon, 11 Dec 2017 13:13:14 +0000 (14:13 +0100)]
Sync known vc++ versions in 7.1

7 years agoext/imap/config.m4: fix ac_cv_u8t_decompose check
Michael Heimpold [Sun, 26 Nov 2017 17:29:42 +0000 (18:29 +0100)]
ext/imap/config.m4: fix ac_cv_u8t_decompose check

Once upon the time, commit c58f63a38ae19caaab339c61486fc3bd7e5894f9
changed the check from U8T_CANONICAL to U8T_DECOMPOSE. However,
the autoconf cache id was not renamed.

Sometimes it is desirable to preseed the autoconf variables, e.g. when
cross-compiling to avoid the tests running on the host system. In this
case it's confusing when the cache id does not match the variable to
set, so let's adjust it.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
7 years agoFix yet one data race in PCRE
Anatol Belski [Wed, 6 Dec 2017 14:59:21 +0000 (15:59 +0100)]
Fix yet one data race in PCRE

PCRE 8.x initializes the pattern compiler on demand during the first
pcre_study call. It could be worse, but since the compiled patterns are
cached, the locking impact is minimal. PCRE 10.x always compiles the
pattern and thread sanitizer doesn't complain about the compiler
initialization, thus the newer PCRE version seems to be unafected.

7 years agoFix use after free revealed by phpdbg
Anatol Belski [Tue, 5 Dec 2017 17:32:32 +0000 (18:32 +0100)]
Fix use after free revealed by phpdbg

7 years agoFixed bug #75601 Thread race in PCRE JIT support
Anatol Belski [Tue, 5 Dec 2017 16:38:18 +0000 (17:38 +0100)]
Fixed bug #75601 Thread race in PCRE JIT support

7 years agobump versions
krakjoe [Tue, 5 Dec 2017 13:18:48 +0000 (14:18 +0100)]
bump versions

7 years ago[ci skip] update NEWS
Anatol Belski [Tue, 5 Dec 2017 07:59:33 +0000 (08:59 +0100)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 5 Dec 2017 07:52:14 +0000 (08:52 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  7.0.28 is next

7 years ago7.0.28 is next
Anatol Belski [Tue, 5 Dec 2017 07:51:30 +0000 (08:51 +0100)]
7.0.28 is next

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 5 Dec 2017 07:42:02 +0000 (08:42 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Tue, 5 Dec 2017 07:41:24 +0000 (08:41 +0100)]
[ci skip] update NEWS

7 years agoFixed bug #75608 ("Narrowing occurred during type inference" error)
Dmitry Stogov [Mon, 4 Dec 2017 14:22:06 +0000 (17:22 +0300)]
Fixed bug #75608 ("Narrowing occurred during type inference" error)

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 4 Dec 2017 13:16:23 +0000 (14:16 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Use dtor unconditionally in error case

7 years agoUse dtor unconditionally in error case
Anatol Belski [Mon, 4 Dec 2017 13:11:40 +0000 (14:11 +0100)]
Use dtor unconditionally in error case

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 4 Dec 2017 10:52:09 +0000 (11:52 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)

7 years agoFixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
Xinchen Hui [Wed, 29 Nov 2017 06:46:21 +0000 (14:46 +0800)]
Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)

(cherry picked from commit 3b9ba7b6bd9e24bdbeca8e8e3f24cee2fccc51d8)

7 years agoFix compat with libcurl 7.56.1+ and file:// wrapper
Anatol Belski [Sun, 3 Dec 2017 11:23:25 +0000 (12:23 +0100)]
Fix compat with libcurl 7.56.1+ and file:// wrapper

Since 7.52.x libcurl file:// scheme was implemented in a way described
in https://tools.ietf.org/html/draft-ietf-appsawg-file-scheme-16 . The
draft is still not accepted and the change contained a BC breach with
win32 path handling. It was reported upstream and 7.52.x fixed it, but
the BC breaching behavior was reintroduced in 7.56.1. Thus, it is better
to handle this on the PHP side.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 2 Dec 2017 17:11:03 +0000 (18:11 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFix ZEND_SIGNED_MULTIPLY_LONG for AArch64
Andy Postnikov [Sat, 10 Dec 2016 20:51:17 +0000 (23:51 +0300)]
Fix ZEND_SIGNED_MULTIPLY_LONG for AArch64

Register operands are required in this context.

This is a backport of 8c8679207ae5ada8751288e75b78c928a4d34d1d
to PHP 7.0+. The current code caused incorrect behavior on AArch64
when compiling with clang.

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 1 Dec 2017 15:02:38 +0000 (16:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Consider Xdebug for tmi ini generation, too

7 years agoConsider Xdebug for tmi ini generation, too
Anatol Belski [Fri, 1 Dec 2017 15:01:34 +0000 (16:01 +0100)]
Consider Xdebug for tmi ini generation, too

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Fri, 1 Dec 2017 14:00:42 +0000 (17:00 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Set trailing zero

7 years agoSet trailing zero
Dmitry Stogov [Fri, 1 Dec 2017 14:00:11 +0000 (17:00 +0300)]
Set trailing zero

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 29 Nov 2017 15:53:11 +0000 (16:53 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Define floorf if system doesn't have it (follow up for 22c48761)

7 years agoDefine floorf if system doesn't have it (follow up for 22c48761)
Lior Kaplan [Wed, 29 Nov 2017 11:45:21 +0000 (13:45 +0200)]
Define floorf if system doesn't have it (follow up for 22c48761)

floorf is checked in config.m4

7 years ago[ci skip] update NEWS
Anatol Belski [Wed, 29 Nov 2017 08:28:21 +0000 (09:28 +0100)]
[ci skip] update NEWS

Move entry to proper section

7 years agoFixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
Xinchen Hui [Wed, 29 Nov 2017 06:46:21 +0000 (14:46 +0800)]
Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)

7 years agoFixed #73124: php_ini_scanned_files()
johnstevenson [Thu, 16 Nov 2017 17:56:32 +0000 (17:56 +0000)]
Fixed #73124: php_ini_scanned_files()

Additional ini files are reported using the --ini option, but not by
`php_ini_scanned_files()`, which relied on PHP_CONFIG_FILE_SCAN_DIR.

7 years agoFollow up on bug #75574 for FCGI side
Anatol Belski [Tue, 28 Nov 2017 19:31:48 +0000 (20:31 +0100)]
Follow up on bug #75574 for FCGI side

7 years agoNEWS
Remi Collet [Tue, 28 Nov 2017 17:00:07 +0000 (18:00 +0100)]
NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Remi Collet [Tue, 28 Nov 2017 16:59:36 +0000 (17:59 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  NEWS
  Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)

7 years agoNEWS
Remi Collet [Tue, 28 Nov 2017 16:59:16 +0000 (17:59 +0100)]
NEWS

7 years agoFixed bug #64938 libxml_disable_entity_loader setting is shared between requests...
Remi Collet [Mon, 27 Nov 2017 16:06:57 +0000 (17:06 +0100)]
Fixed bug #64938 libxml_disable_entity_loader setting is shared between requests (FPM)

7 years agobetter fix for #75514
Remi Collet [Tue, 28 Nov 2017 16:42:43 +0000 (17:42 +0100)]
better fix for #75514

7 years ago[ci skip] update NEWS
Anatol Belski [Tue, 28 Nov 2017 11:45:30 +0000 (12:45 +0100)]
[ci skip] update NEWS

7 years agoFixed bug #73830 Directory does not exist.
Anatol Belski [Tue, 28 Nov 2017 11:41:49 +0000 (12:41 +0100)]
Fixed bug #73830 Directory does not exist.

7 years agoUpdate NEWs (added bug entry)
Xinchen Hui [Tue, 28 Nov 2017 05:15:54 +0000 (13:15 +0800)]
Update NEWs (added bug entry)

7 years agoFix allocation
Anatol Belski [Mon, 27 Nov 2017 20:18:08 +0000 (21:18 +0100)]
Fix allocation

7 years agoFix memory leak
Anatol Belski [Mon, 27 Nov 2017 19:24:30 +0000 (20:24 +0100)]
Fix memory leak

7 years agoFixed bug #75574 putenv does not work properly if parameter contains non-ASCII unicod...
Anatol Belski [Mon, 27 Nov 2017 17:49:02 +0000 (18:49 +0100)]
Fixed bug #75574 putenv does not work properly if parameter contains non-ASCII unicode character

7 years agoFix normalized path length calculation and error handling
Anatol Belski [Mon, 27 Nov 2017 11:32:19 +0000 (12:32 +0100)]
Fix normalized path length calculation and error handling

7 years agoFixed bug in type inference
Dmitry Stogov [Mon, 27 Nov 2017 07:16:16 +0000 (10:16 +0300)]
Fixed bug in type inference

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
krakjoe [Wed, 22 Nov 2017 04:49:34 +0000 (04:49 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Check for binary_location allocation failure

7 years agoCheck for binary_location allocation failure
Sebastian Ramadan [Wed, 15 Nov 2017 02:24:28 +0000 (13:24 +1100)]
Check for binary_location allocation failure

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
krakjoe [Wed, 22 Nov 2017 04:30:59 +0000 (04:30 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix bug #75409

7 years agoFix bug #75409
Scott [Wed, 22 Nov 2017 03:02:07 +0000 (22:02 -0500)]
Fix bug #75409

7 years ago[ci skip] update NEWS
Anatol Belski [Tue, 21 Nov 2017 21:23:31 +0000 (22:23 +0100)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 21 Nov 2017 21:22:59 +0000 (22:22 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] update NEWS

7 years ago[ci skip] update NEWS
Anatol Belski [Tue, 21 Nov 2017 21:22:21 +0000 (22:22 +0100)]
[ci skip] update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 21 Nov 2017 19:10:49 +0000 (20:10 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #75539 and #74183 - preg_last_error not returning error code after error