]> granicus.if.org Git - php/log
php
7 years agoConvert some mysqlnd file encodings to UTF-8
Peter Kokot [Sat, 14 Oct 2017 20:18:25 +0000 (22:18 +0200)]
Convert some mysqlnd file encodings to UTF-8

7 years agoMerge branch 'PHP-7.2'
Joe Watkins [Thu, 19 Oct 2017 10:40:58 +0000 (11:40 +0100)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Escape newline on curl config.m4

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Joe Watkins [Thu, 19 Oct 2017 10:40:48 +0000 (11:40 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Escape newline on curl config.m4

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Thu, 19 Oct 2017 10:40:05 +0000 (11:40 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Escape newline on curl config.m4

7 years agoEscape newline on curl config.m4
Ryan Volz [Thu, 19 Oct 2017 00:49:17 +0000 (20:49 -0400)]
Escape newline on curl config.m4

7 years agoConstify key access for hash and formal params
Anatol Belski [Thu, 19 Oct 2017 09:32:42 +0000 (11:32 +0200)]
Constify key access for hash and formal params

Keys created in shared memory and won't be modified and are free'd on
restart. Otherwise, keys passed to functions should not be modified,
too.

7 years agoFix datatype
Anatol Belski [Thu, 19 Oct 2017 08:26:39 +0000 (10:26 +0200)]
Fix datatype

7 years agoExtend zend_string API to avoid reallocation in zend_string_init_interned()
Dmitry Stogov [Wed, 18 Oct 2017 21:02:56 +0000 (00:02 +0300)]
Extend zend_string API to avoid reallocation in zend_string_init_interned()

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Wed, 18 Oct 2017 15:47:51 +0000 (17:47 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Move to php-sdk-2.0.0beta3 for Appveyor

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 18 Oct 2017 15:47:27 +0000 (17:47 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Move to php-sdk-2.0.0beta3 for Appveyor

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 18 Oct 2017 15:46:40 +0000 (17:46 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Move to php-sdk-2.0.0beta3 for Appveyor

7 years agoMove to php-sdk-2.0.0beta3 for Appveyor
Anatol Belski [Wed, 18 Oct 2017 15:45:33 +0000 (17:45 +0200)]
Move to php-sdk-2.0.0beta3 for Appveyor

Supposed to fix sporadic tool crashes on the test image

7 years agoMerge branch 'master' of git.php.net:php-src
Dmitry Stogov [Wed, 18 Oct 2017 15:27:21 +0000 (18:27 +0300)]
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Backport 7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+

7 years agoMoved ZCG(function_table) back into accel_acrivate. It should be unique per thread.
Dmitry Stogov [Wed, 18 Oct 2017 15:26:30 +0000 (18:26 +0300)]
Moved ZCG(function_table) back into accel_acrivate. It should be unique per thread.

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Wed, 18 Oct 2017 14:30:46 +0000 (16:30 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Backport 7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 18 Oct 2017 14:27:31 +0000 (16:27 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Backport 7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 18 Oct 2017 14:24:23 +0000 (16:24 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Backport 7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+

7 years agoMove a part of opcache initialization into post_startup phase (when all extensions...
Dmitry Stogov [Wed, 18 Oct 2017 14:18:54 +0000 (17:18 +0300)]
Move a part of opcache initialization into post_startup phase (when all extensions already loaded).

7 years agoBackport 7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+
Anatol Belski [Wed, 18 Oct 2017 14:02:56 +0000 (16:02 +0200)]
Backport 7ff13badda58b966ff8fbcc61add48bb5b14117b into 7.0+

7 years agoFixed required SHM memeory size calculation for scripts when opcache.revalidate_path...
Dmitry Stogov [Wed, 18 Oct 2017 11:26:44 +0000 (14:26 +0300)]
Fixed required SHM memeory size calculation for scripts when opcache.revalidate_path is set.

7 years agoCleanup cfg flags & Added ZEND_FUNC_HAS_EXTENED_INFO
Xinchen Hui [Wed, 18 Oct 2017 09:03:07 +0000 (17:03 +0800)]
Cleanup cfg flags & Added ZEND_FUNC_HAS_EXTENED_INFO

7 years agoImplemented request #69592: allow 0-column rowsets to be skipped automatically
fandrieu [Tue, 17 Oct 2017 18:16:38 +0000 (14:16 -0400)]
Implemented request #69592: allow 0-column rowsets to be skipped automatically

This adds a new attribute PDO::DBLIB_ATTR_SKIP_EMPTY_ROWSETS to enable automatic
skipping of empty rowsets.

This happens with some SQL commands (like PRINT or SET): a rowset with 0 columns
is returned by the driver.

With this option enabled, 0 columns rowsets are automatically skipped, mirroring
the behavior of the deprecated mssql extension.

Credits go to MiRacLe-RPZ for developping and promoting this patch.

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Tue, 17 Oct 2017 13:38:01 +0000 (15:38 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  One more folder to delete in AppVeyor image

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Tue, 17 Oct 2017 13:37:23 +0000 (15:37 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  One more folder to delete in AppVeyor image

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 17 Oct 2017 13:34:42 +0000 (15:34 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  One more folder to delete in AppVeyor image

7 years agoOne more folder to delete in AppVeyor image
Anatol Belski [Tue, 17 Oct 2017 13:32:47 +0000 (15:32 +0200)]
One more folder to delete in AppVeyor image

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Tue, 17 Oct 2017 11:47:40 +0000 (19:47 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug (assertion fails with extended info generated)

7 years agoFixed bug (assertion fails with extended info generated)
Xinchen Hui [Tue, 17 Oct 2017 11:47:29 +0000 (19:47 +0800)]
Fixed bug (assertion fails with extended info generated)

7 years agoAdded test
Dmitry Stogov [Tue, 17 Oct 2017 10:45:46 +0000 (13:45 +0300)]
Added test

7 years agoMake assertions in DO_ICALL and CALL_TRAMPOLINE to be consistent with DO_FCALL.
Dmitry Stogov [Tue, 17 Oct 2017 10:35:59 +0000 (13:35 +0300)]
Make assertions in DO_ICALL and CALL_TRAMPOLINE to be consistent with DO_FCALL.

7 years agoRevert "Allow internal functions to return values by reference (this was disabled...
Dmitry Stogov [Tue, 17 Oct 2017 10:25:19 +0000 (13:25 +0300)]
Revert "Allow internal functions to return values by reference (this was disabled in implementation of DO_ICALL, but enabled in DO_FCALL)."

This reverts commit da781a5ac2cb9d2f983ef9fe070900664db12c67.

7 years agoAllow internal functions to return values by reference (this was disabled in implemen...
Dmitry Stogov [Tue, 17 Oct 2017 08:50:34 +0000 (11:50 +0300)]
Allow internal functions to return values by reference (this was disabled in implementation of DO_ICALL, but enabled in DO_FCALL).
However, don't require internal functions returning by reference to return a reference.
Mark unserialize() as returning by reference and remove unwrap_reference hack, to allow proper returning of self referenced arrays using a reference.
Currently unserialize() is the only internal function that may return a reference.

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Tue, 17 Oct 2017 04:20:48 +0000 (12:20 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed test

7 years agoFixed test
Xinchen Hui [Tue, 17 Oct 2017 04:20:25 +0000 (12:20 +0800)]
Fixed test

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Tue, 17 Oct 2017 03:35:57 +0000 (11:35 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Try to fix test

7 years agoTry to fix test
Xinchen Hui [Tue, 17 Oct 2017 03:35:40 +0000 (11:35 +0800)]
Try to fix test

7 years agoMerge branch 'PHP-7.2'
Tianfang Yang [Mon, 16 Oct 2017 23:28:50 +0000 (19:28 -0400)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Tianfang Yang [Mon, 16 Oct 2017 23:25:53 +0000 (19:25 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Tianfang Yang [Mon, 16 Oct 2017 23:21:44 +0000 (19:21 -0400)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFixed valgrind issue
Tianfang Yang [Mon, 16 Oct 2017 23:20:24 +0000 (19:20 -0400)]
Fixed valgrind issue

7 years agoFixed valgrind issue
Tianfang Yang [Mon, 16 Oct 2017 23:16:30 +0000 (19:16 -0400)]
Fixed valgrind issue

7 years agoReuse interned strings from opcache SHM, if possible.
Dmitry Stogov [Mon, 16 Oct 2017 16:20:16 +0000 (19:20 +0300)]
Reuse interned strings from opcache SHM, if possible.

7 years agoMerge branch 'PHP-7.2'
Anatol Belski [Mon, 16 Oct 2017 16:08:09 +0000 (18:08 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Move to next binary SDK version for AppVeyor

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Mon, 16 Oct 2017 16:07:41 +0000 (18:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Move to next binary SDK version for AppVeyor

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 16 Oct 2017 16:06:38 +0000 (18:06 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Move to next binary SDK version for AppVeyor

7 years agoMove to next binary SDK version for AppVeyor
Anatol Belski [Mon, 16 Oct 2017 16:05:56 +0000 (18:05 +0200)]
Move to next binary SDK version for AppVeyor

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Mon, 16 Oct 2017 16:02:46 +0000 (19:02 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Mon, 16 Oct 2017 16:02:22 +0000 (19:02 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Mon, 16 Oct 2017 16:02:07 +0000 (19:02 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql

7 years agoPrevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql
Dmitry Stogov [Mon, 16 Oct 2017 16:00:12 +0000 (19:00 +0300)]
Prevent crash on ext/pdo_mysql/tests/bug_39858.phpt when built with libmysql

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Mon, 16 Oct 2017 11:09:13 +0000 (19:09 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75378 ([REGRESSION] IntlDateFormatter::parse() does not change $position argument)

7 years agoMerge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2
Xinchen Hui [Mon, 16 Oct 2017 11:07:55 +0000 (19:07 +0800)]
Merge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2

* 'PHP-7.2' of git.php.net:/php-src:
  [ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")
  Properly fix #75363 and address some other leaks with cert

7 years agoFixed bug #75378 ([REGRESSION] IntlDateFormatter::parse() does not change $position...
Xinchen Hui [Mon, 16 Oct 2017 11:07:34 +0000 (19:07 +0800)]
Fixed bug #75378 ([REGRESSION] IntlDateFormatter::parse() does not change $position argument)

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Mon, 16 Oct 2017 09:13:05 +0000 (11:13 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  [ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Mon, 16 Oct 2017 09:12:17 +0000 (11:12 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  [ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")

7 years ago[ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")
Christoph M. Becker [Mon, 16 Oct 2017 09:11:34 +0000 (11:11 +0200)]
[ci skip] Fixed bug #75383 (The date is "Sep", it should say "Oct")

7 years agoMerge branch 'PHP-7.2'
Jakub Zelenka [Mon, 16 Oct 2017 08:55:18 +0000 (09:55 +0100)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2
Jakub Zelenka [Mon, 16 Oct 2017 08:54:03 +0000 (09:54 +0100)]
Merge branch 'PHP-7.2' of git.php.net:php-src into PHP-7.2

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Mon, 16 Oct 2017 07:23:02 +0000 (15:23 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug (Phi sources removel)

7 years agoFixed bug (Phi sources removel)
Xinchen Hui [Mon, 16 Oct 2017 06:19:37 +0000 (14:19 +0800)]
Fixed bug (Phi sources removel)

7 years agoMerge branch 'PHP-7.2'
Jakub Zelenka [Sun, 15 Oct 2017 19:33:49 +0000 (20:33 +0100)]
Merge branch 'PHP-7.2'

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Sun, 15 Oct 2017 19:33:22 +0000 (20:33 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Jakub Zelenka [Sun, 15 Oct 2017 19:31:25 +0000 (20:31 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoProperly fix #75363 and address some other leaks with cert
Jakub Zelenka [Sun, 15 Oct 2017 19:25:58 +0000 (20:25 +0100)]
Properly fix #75363 and address some other leaks with cert

7 years agoMerge branch 'PHP-7.2'
Jakub Zelenka [Sun, 15 Oct 2017 18:37:22 +0000 (19:37 +0100)]
Merge branch 'PHP-7.2'

7 years agoFix bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key)
Jakub Zelenka [Sun, 15 Oct 2017 18:36:15 +0000 (19:36 +0100)]
Fix bug #68567 (JSON_PARTIAL_OUTPUT_ON_ERROR can result in JSON with null key)

7 years agoRemove PHP code examples from xmlwriter extension
Peter Kokot [Sun, 8 Oct 2017 22:44:56 +0000 (00:44 +0200)]
Remove PHP code examples from xmlwriter extension

PHP documentation can present PHP code examples better instead.

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Sun, 15 Oct 2017 12:08:03 +0000 (14:08 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sun, 15 Oct 2017 12:03:24 +0000 (14:03 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 15 Oct 2017 11:58:20 +0000 (13:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)

7 years agoFixed bug #53070 (enchant_broker_get_path crashes if no path is set)
Jelle van der Waa [Mon, 9 Oct 2017 18:35:53 +0000 (20:35 +0200)]
Fixed bug #53070 (enchant_broker_get_path crashes if no path is set)

enchant_broker_get_dict_path segfaults when the dict path is not setup,
instead of segfaulting return false instead.

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Sun, 15 Oct 2017 11:36:25 +0000 (13:36 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75365 (Enchant still reports version 1.1.0)

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sun, 15 Oct 2017 11:31:30 +0000 (13:31 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75365 (Enchant still reports version 1.1.0)

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Sun, 15 Oct 2017 11:21:37 +0000 (13:21 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75365 (Enchant still reports version 1.1.0)

7 years agoFixed bug #75365 (Enchant still reports version 1.1.0)
Christoph M. Becker [Thu, 12 Oct 2017 13:37:47 +0000 (15:37 +0200)]
Fixed bug #75365 (Enchant still reports version 1.1.0)

Since Enchant is bundled, we make `PHP_ENCHANT_VERSION` an alias of
`PHP_VERSION` and also drop the rather meaningless revision hash from
the PHP info.

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Sun, 15 Oct 2017 02:29:56 +0000 (10:29 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS
  Update NEWS
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)

7 years agoUpdate NEWS
Xinchen Hui [Sun, 15 Oct 2017 02:29:40 +0000 (10:29 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Xinchen Hui [Sun, 15 Oct 2017 02:29:28 +0000 (10:29 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Update NEWS
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)

7 years agoUpdate NEWS
Xinchen Hui [Sun, 15 Oct 2017 02:29:10 +0000 (10:29 +0800)]
Update NEWS

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Sun, 15 Oct 2017 02:28:46 +0000 (10:28 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)

7 years agoFixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)
Xinchen Hui [Sun, 15 Oct 2017 02:28:28 +0000 (10:28 +0800)]
Fixed bug #75287 (Builtin webserver crash after chdir in a shutdown function)

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Sat, 14 Oct 2017 15:12:48 +0000 (23:12 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75357 (segfault loading WordPress wp-admin)

7 years agoFixed bug #75357 (segfault loading WordPress wp-admin)
Xinchen Hui [Sat, 14 Oct 2017 15:12:29 +0000 (23:12 +0800)]
Fixed bug #75357 (segfault loading WordPress wp-admin)

7 years agoFixed unzserialize(), to disable creation of unsupported data structures through...
Dmitry Stogov [Fri, 13 Oct 2017 12:53:11 +0000 (15:53 +0300)]
Fixed unzserialize(), to disable creation of unsupported data structures through manually crafted strings. (Dmitry)

7 years agoMerge branch 'PHP-7.2'
Dmitry Stogov [Fri, 13 Oct 2017 11:02:16 +0000 (14:02 +0300)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Dmitry Stogov [Fri, 13 Oct 2017 11:00:21 +0000 (14:00 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Fri, 13 Oct 2017 10:56:23 +0000 (13:56 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)

7 years agoFixed bug #75368 (mmap/munmap trashing on unlucky allocations)
Dmitry Stogov [Fri, 13 Oct 2017 10:56:06 +0000 (13:56 +0300)]
Fixed bug #75368 (mmap/munmap trashing on unlucky allocations)

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Fri, 13 Oct 2017 10:24:27 +0000 (18:24 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Prevent from being affected by local php.ini
  Added skipf

7 years agoPrevent from being affected by local php.ini
Xinchen Hui [Fri, 13 Oct 2017 10:23:56 +0000 (18:23 +0800)]
Prevent from being affected by local php.ini

7 years agoAdded skipf
Xinchen Hui [Fri, 13 Oct 2017 10:21:41 +0000 (18:21 +0800)]
Added skipf

7 years agoMerge branch 'PHP-7.2'
Xinchen Hui [Fri, 13 Oct 2017 10:19:19 +0000 (18:19 +0800)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75370 (Webserver hangs on valid PHP text)
  Fixed typo

7 years agoFixed bug #75370 (Webserver hangs on valid PHP text)
Xinchen Hui [Fri, 13 Oct 2017 10:18:10 +0000 (18:18 +0800)]
Fixed bug #75370 (Webserver hangs on valid PHP text)

7 years agoFix gc_032.phpt
Nikita Popov [Fri, 13 Oct 2017 09:59:28 +0000 (11:59 +0200)]
Fix gc_032.phpt

Use var_dump instead of debug_zval_dump. The refcounts are not
important for this test and change depending on whether opcache
is loaded or not.

7 years agoFixed typo
Xinchen Hui [Fri, 13 Oct 2017 09:35:02 +0000 (17:35 +0800)]
Fixed typo

7 years agoMerge branch 'develop_operators' of github.com:tianhe1986/php-src
Dmitry Stogov [Fri, 13 Oct 2017 08:39:42 +0000 (11:39 +0300)]
Merge branch 'develop_operators' of github.com:tianhe1986/php-src

* 'develop_operators' of github.com:tianhe1986/php-src:
  `memcmp` begins from the second char.

7 years ago`memcmp` begins from the second char.
tianhe1986 [Thu, 12 Oct 2017 14:46:26 +0000 (22:46 +0800)]
`memcmp` begins from the second char.

Signed-off-by: tianhe1986 <w1s2j3229@163.com>
7 years agoPHP must not create circular arrays when element is assigned by value.
Dmitry Stogov [Thu, 12 Oct 2017 13:23:45 +0000 (16:23 +0300)]
PHP must not create circular arrays when element is assigned by value.

7 years agoMerge branch 'PHP-7.2'
Christoph M. Becker [Thu, 12 Oct 2017 10:52:58 +0000 (12:52 +0200)]
Merge branch 'PHP-7.2'

* PHP-7.2:
  Fixed bug #75221 (Argon2i always throws NUL at the end)

7 years agoFixed bug #75221 (Argon2i always throws NUL at the end)
Christoph M. Becker [Mon, 18 Sep 2017 16:09:53 +0000 (18:09 +0200)]
Fixed bug #75221 (Argon2i always throws NUL at the end)

Apparently, `argon2_encodedlen()` also counts the terminating NUL byte;
that doesn't appear to be documented somewhere, but from looking at the
implementation[1] it is pretty obvious.  Therefore, the respective
`zend_string` has to be one byte shorter.

[1] <https://github.com/P-H-C/phc-winner-argon2/blob/20161029/src/argon2.c#L431-L436>