]> granicus.if.org Git - php/log
php
7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Fri, 20 Oct 2017 11:58:53 +0000 (13:58 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Sync some tests for compat with ICU 58.1, PHP 7.1+ part
  Sync some tests for compat with ICU 58.1+

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 20 Oct 2017 11:57:44 +0000 (13:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Sync some tests for compat with ICU 58.1+

7 years agoSync some tests for compat with ICU 58.1, PHP 7.1+ part
Anatol Belski [Fri, 20 Oct 2017 11:56:58 +0000 (13:56 +0200)]
Sync some tests for compat with ICU 58.1, PHP 7.1+ part

7 years agoSync some tests for compat with ICU 58.1+
Anatol Belski [Fri, 20 Oct 2017 11:55:32 +0000 (13:55 +0200)]
Sync some tests for compat with ICU 58.1+

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Fri, 20 Oct 2017 09:30:09 +0000 (11:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Add skip for incompatible ICU version

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 20 Oct 2017 09:28:51 +0000 (11:28 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Add skip for incompatible ICU version

7 years agoAdd skip for incompatible ICU version
Anatol Belski [Fri, 20 Oct 2017 09:27:54 +0000 (11:27 +0200)]
Add skip for incompatible ICU version

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

* PHP-7.1:
  Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination

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

* PHP-7.0:
  Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination

7 years agoFixed #75317 - UConverter::setDestinationEncoding changes source instead of destinati...
Nester [Mon, 9 Oct 2017 14:26:44 +0000 (14:26 +0000)]
Fixed #75317 - UConverter::setDestinationEncoding changes source instead of destinatination

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

* PHP-7.1:
  Update .editorconfig with some more configs

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

* PHP-7.0:
  Update .editorconfig with some more configs

7 years agoUpdate .editorconfig with some more configs
Peter Kokot [Wed, 11 Oct 2017 21:20:57 +0000 (23:20 +0200)]
Update .editorconfig with some more configs

Added support for .awk, .w32, .bat, .mk, .frag, .m4, .sh, .php, .phpt,
and Markdown files based on the current most used coding style in the
php-src repository.

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

* PHP-7.1:
  Fix issue with zend signals in php_request_startup

7 years agoFix issue with zend signals in php_request_startup
Herman J. Radtke III [Sat, 14 Oct 2017 17:50:30 +0000 (10:50 -0700)]
Fix issue with zend signals in php_request_startup

The zend_signals_activate() function is called in php_request_startup()
even if `--disable-zend-signals` is used. This causes uninitialized
variables to be used on ZTS builds.

This was removed in 7.1 in c870633. Removing guards from the SAPIs
should be fine, but removing the guard from main/main.c prevents anyone
using the static embedded library to integrate PHP into their programs.

For more details, see the "Additional remark" section in
https://bugs.php.net/bug.php?id=74149

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 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 '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 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 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 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 agoFixed test
Xinchen Hui [Tue, 17 Oct 2017 04:20:25 +0000 (12:20 +0800)]
Fixed 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.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 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.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' 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.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' 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 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.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 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 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.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 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 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 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 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 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 agoFixed typo
Xinchen Hui [Fri, 13 Oct 2017 09:35:02 +0000 (17:35 +0800)]
Fixed typo

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>

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Bob Weinand [Thu, 12 Oct 2017 10:32:30 +0000 (12:32 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Thu, 12 Oct 2017 10:31:20 +0000 (12:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

7 years agoFixed bug #75363 (openssl_x509_parse leaks memory)
Bob Weinand [Thu, 12 Oct 2017 10:30:20 +0000 (12:30 +0200)]
Fixed bug #75363 (openssl_x509_parse leaks memory)

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Wed, 11 Oct 2017 20:25:27 +0000 (22:25 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  It looks like i should've taken joint response on ext/fileinfo long ago

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 11 Oct 2017 20:24:52 +0000 (22:24 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  It looks like i should've taken joint response on ext/fileinfo long ago

7 years agoIt looks like i should've taken joint response on ext/fileinfo long ago
Anatol Belski [Wed, 11 Oct 2017 20:21:34 +0000 (22:21 +0200)]
It looks like i should've taken joint response on ext/fileinfo long ago

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

* PHP-7.1:
  Put php-sdk-2.0.12beta1 for AppVeyor

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

* PHP-7.0:
  Put php-sdk-2.0.12beta1 for AppVeyor

7 years agoPut php-sdk-2.0.12beta1 for AppVeyor
Anatol Belski [Wed, 11 Oct 2017 18:27:27 +0000 (20:27 +0200)]
Put php-sdk-2.0.12beta1 for AppVeyor

Quite some tool upgrades there, especially re2c 1.0.2

7 years ago[ci skip] update NEWS
Anatol Belski [Wed, 11 Oct 2017 17:02:51 +0000 (19:02 +0200)]
[ci skip] update NEWS

7 years agoCleanup irrelevant info
Anatol Belski [Wed, 11 Oct 2017 16:40:16 +0000 (18:40 +0200)]
Cleanup irrelevant info

7 years agoUpgrade bundled libmagic to 5.31
Anatol Belski [Wed, 11 Oct 2017 16:18:55 +0000 (18:18 +0200)]
Upgrade bundled libmagic to 5.31

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

* PHP-7.1:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 11 Oct 2017 15:29:02 +0000 (17:29 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add

7 years agoMerge branch 'pull-request/2798' into PHP-7.0
Christoph M. Becker [Wed, 11 Oct 2017 15:05:53 +0000 (17:05 +0200)]
Merge branch 'pull-request/2798' into PHP-7.0

* pull-request/2798:
  Fix Bug #75299 Wrong reflection on inflate_init and inflate_add

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Wed, 11 Oct 2017 12:44:19 +0000 (14:44 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Use PHP_VERSION for exif

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Wed, 11 Oct 2017 12:43:30 +0000 (14:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Use PHP_VERSION for exif

7 years agoMerge branch 'pull-request/2799' into PHP-7.0
Christoph M. Becker [Wed, 11 Oct 2017 12:42:02 +0000 (14:42 +0200)]
Merge branch 'pull-request/2799' into PHP-7.0

* pull-request/2799:
  Use PHP_VERSION for exif

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

* PHP-7.1:
  bump version

7 years agoFix datatype
Anatol Belski [Wed, 11 Oct 2017 06:58:59 +0000 (08:58 +0200)]
Fix datatype

7 years agoFixed cleanup after optimization passes
Dmitry Stogov [Tue, 10 Oct 2017 16:25:51 +0000 (19:25 +0300)]
Fixed cleanup after optimization passes

7 years agoRevert "Update NEWS for PHP 7.2.0RC4"
Sara Golemon [Tue, 10 Oct 2017 15:55:50 +0000 (11:55 -0400)]
Revert "Update NEWS for PHP 7.2.0RC4"

This reverts commit 1ea657c65e64d8338e47ead04cfe64c88bf47f2c.

7 years agoRevert "Update NEWS for 7.2.0RC5"
Sara Golemon [Tue, 10 Oct 2017 15:55:41 +0000 (11:55 -0400)]
Revert "Update NEWS for 7.2.0RC5"

This reverts commit ef25e56ae6a9df1d8fe409707c208d71c067f285.

7 years agoUpdate NEWS for 7.2.0RC5
Sara Golemon [Tue, 10 Oct 2017 15:49:16 +0000 (15:49 +0000)]
Update NEWS for 7.2.0RC5

7 years agoUpdate NEWS for PHP 7.2.0RC4
Sara Golemon [Tue, 10 Oct 2017 15:27:31 +0000 (15:27 +0000)]
Update NEWS for PHP 7.2.0RC4

7 years agobump version
Joe Watkins [Tue, 10 Oct 2017 15:12:36 +0000 (16:12 +0100)]
bump version

7 years agoFix path in makefile fragment
Anatol Belski [Tue, 10 Oct 2017 12:32:02 +0000 (14:32 +0200)]
Fix path in makefile fragment

7 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Tue, 10 Oct 2017 11:59:09 +0000 (13:59 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  [ci skip] Add NEWS entry for bug #75349

7 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 10 Oct 2017 11:55:45 +0000 (13:55 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ci skip] Add NEWS entry for bug #75349

7 years ago[ci skip] Add NEWS entry for bug #75349
Christoph M. Becker [Tue, 10 Oct 2017 11:54:52 +0000 (13:54 +0200)]
[ci skip] Add NEWS entry for bug #75349