]> granicus.if.org Git - php/log
php
8 years agomerge PR #2290: enable opcache in CLI in 7.1+
Joe Watkins [Mon, 9 Jan 2017 11:00:05 +0000 (11:00 +0000)]
merge PR #2290: enable opcache in CLI in 7.1+

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 9 Jan 2017 10:56:54 +0000 (10:56 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  set more suitable defaults for opcache in ini and code

8 years agoMerge branch 'pull-request/2291' into PHP-7.0
Joe Watkins [Mon, 9 Jan 2017 10:54:57 +0000 (10:54 +0000)]
Merge branch 'pull-request/2291' into PHP-7.0

* pull-request/2291:
  set more suitable defaults for opcache in ini and code

8 years agoset more suitable defaults for opcache in ini and code
Markus Staab [Mon, 9 Jan 2017 10:33:05 +0000 (11:33 +0100)]
set more suitable defaults for opcache in ini and code

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Mon, 9 Jan 2017 08:30:48 +0000 (16:30 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73854 (Always true condition in php_openssl_sockop_io)

8 years agoFixed bug #73854 (Always true condition in php_openssl_sockop_io)
Xinchen Hui [Mon, 9 Jan 2017 08:30:00 +0000 (16:30 +0800)]
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 9 Jan 2017 05:32:22 +0000 (05:32 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #72979 money_format stores wrong length on AIX

8 years agoFixed bug #72979 money_format stores wrong length on AIX
Joe Watkins [Mon, 9 Jan 2017 05:31:41 +0000 (05:31 +0000)]
Fixed bug #72979 money_format stores wrong length on AIX

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 9 Jan 2017 05:25:17 +0000 (05:25 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update ip2long_varation2 test to skip for AIX, see bug #72973

8 years agoupdate ip2long_varation2 test to skip for AIX, see bug #72973
Joe Watkins [Mon, 9 Jan 2017 05:24:44 +0000 (05:24 +0000)]
update ip2long_varation2 test to skip for AIX, see bug #72973

8 years ago[ci skip] news entry for issue #72974
Joe Watkins [Mon, 9 Jan 2017 05:20:42 +0000 (05:20 +0000)]
[ci skip] news entry for issue #72974

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 9 Jan 2017 05:15:34 +0000 (05:15 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #72974 imap is undefined service on AIX

8 years agoFixed #72974 imap is undefined service on AIX
Joe Watkins [Mon, 9 Jan 2017 05:13:46 +0000 (05:13 +0000)]
Fixed #72974 imap is undefined service on AIX

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Mon, 9 Jan 2017 00:36:57 +0000 (00:36 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix FTP tests for Travis CI.

8 years agoFix FTP tests for Travis CI.
Mitch Hagstrand [Sun, 8 Jan 2017 21:25:46 +0000 (13:25 -0800)]
Fix FTP tests for Travis CI.

This suppresses the errors from stream_socket_server() until
server.inc will not make anymore attempts.

8 years agoimprove and generalize the recognition of a cli sapi
Anatol Belski [Sun, 8 Jan 2017 22:54:58 +0000 (23:54 +0100)]
improve and generalize the recognition of a cli sapi

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Sun, 8 Jan 2017 21:05:24 +0000 (21:05 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Use proper file extension for the README

8 years agoUse proper file extension for the README
Markus Staab [Sun, 8 Jan 2017 21:02:50 +0000 (22:02 +0100)]
Use proper file extension for the README

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Sun, 8 Jan 2017 20:28:05 +0000 (20:28 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix 404 links in Litespeed README - Bug 73890

8 years agoFix 404 links in Litespeed README - Bug 73890
Peter Kokot [Sun, 8 Jan 2017 20:24:25 +0000 (21:24 +0100)]
Fix 404 links in Litespeed README - Bug 73890

8 years agoupdate NEWS
Anatol Belski [Sun, 8 Jan 2017 19:13:27 +0000 (20:13 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 8 Jan 2017 19:12:53 +0000 (20:12 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS

8 years agoupdate NEWS
Anatol Belski [Sun, 8 Jan 2017 19:07:16 +0000 (20:07 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Sun, 8 Jan 2017 19:03:10 +0000 (19:03 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  improve FPM tests (mostly for systemd build)

8 years agoimprove FPM tests (mostly for systemd build)
Remi Collet [Sun, 8 Jan 2017 18:55:30 +0000 (19:55 +0100)]
improve FPM tests (mostly for systemd build)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 8 Jan 2017 17:54:28 +0000 (18:54 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  [ast] Fix exporting **= in expansion of assign op

8 years ago[ast] Fix exporting **= in expansion of assign op
Sara Golemon [Sat, 6 Aug 2016 22:12:09 +0000 (15:12 -0700)]
[ast] Fix exporting **= in expansion of assign op

(cherry picked from commit 9c3865eb6a72a6f369ba524c5a87b4896a3a9acb)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 8 Jan 2017 12:48:48 +0000 (13:48 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agodeflate_add(): Don't add unnecessary +1 to size
Nikita Popov [Sun, 8 Jan 2017 12:47:20 +0000 (13:47 +0100)]
deflate_add(): Don't add unnecessary +1 to size

zend_string_realloc will do this by itself.

8 years agoupdate NEWS
Anatol Belski [Sun, 8 Jan 2017 00:22:00 +0000 (01:22 +0100)]
update NEWS

8 years agomove various places to the centralized OpenSSL setup routine
Anatol Belski [Sat, 7 Jan 2017 23:17:31 +0000 (00:17 +0100)]
move various places to the centralized OpenSSL setup routine

8 years agouse the new API for opaque symbol in OpenSSL 1.1.x
Anatol Belski [Sat, 7 Jan 2017 23:07:54 +0000 (00:07 +0100)]
use the new API for opaque symbol in OpenSSL 1.1.x

8 years agoimplement basic config support for OpenSSL 1.1.x
Anatol Belski [Sat, 7 Jan 2017 22:47:04 +0000 (23:47 +0100)]
implement basic config support for OpenSSL 1.1.x

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 7 Jan 2017 23:02:33 +0000 (00:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix OOB read introduced by previous commit
Nikita Popov [Sat, 7 Jan 2017 23:01:05 +0000 (00:01 +0100)]
Fix OOB read introduced by previous commit

Ooops...

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 7 Jan 2017 22:55:20 +0000 (23:55 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agohttp_fopen_wrapper.c - Handle HTTP headers with varying white space
Rowan Collins [Wed, 30 Mar 2016 22:12:03 +0000 (22:12 +0000)]
http_fopen_wrapper.c - Handle HTTP headers with varying white space

The stream handler assumed all HTTP headers contained exactly one space,
but the standard says there may be zero or more. Should fix Bug #47021,
and any other edge cases caused by a web server sending unusual spacing,
e.g. the MIME type discovered from Content-Type: can no longer contain
leading whitespace.

We strip trailing whitespace from the headers added into
$http_response_header as well.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 7 Jan 2017 21:54:16 +0000 (22:54 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed bug #67583
Nikita Popov [Sat, 7 Jan 2017 21:51:18 +0000 (22:51 +0100)]
Fixed bug #67583

As fcgi_request is an opaque struct as of PHP 7, expose a new API
function fcgi_end() which does fcgi_flush() with end=1 and checks/
sets the ->ended flag.

8 years agoRename fcgi_request.closed to .ended
Nikita Popov [Sat, 7 Jan 2017 21:42:45 +0000 (22:42 +0100)]
Rename fcgi_request.closed to .ended

"closed" refers to whether FCGI_END_REQUEST has been sent, while
the "close" operation does something entirely different. It gets
extra confusing when fcgi_is_closed() does not actually return
fcgi_request.closed...

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Sat, 7 Jan 2017 16:46:01 +0000 (16:46 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Adapts the readme to the new test-possibility

8 years agoMerge branch '1391' into PHP-7.0
Joe Watkins [Sat, 7 Jan 2017 16:45:33 +0000 (16:45 +0000)]
Merge branch '1391' into PHP-7.0

* 1391:
  Adapts the readme to the new test-possibility

8 years agoAdapts the readme to the new test-possibility
Andreas Heigl [Mon, 6 Jul 2015 08:54:07 +0000 (10:54 +0200)]
Adapts the readme to the new test-possibility

This commit introduces a way to use a vagrant setup to test against a
known LDAP without the need to setup an LDAP on your own machine

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 7 Jan 2017 14:40:00 +0000 (15:40 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Implement github PR #1736

8 years agoImplement github PR #1736
Anatol Belski [Sat, 7 Jan 2017 14:36:14 +0000 (15:36 +0100)]
Implement github PR #1736

This fixes leak issues on *BSD systems, as described in the PR.

8 years agoupdate UPGRADING
Anatol Belski [Sat, 7 Jan 2017 11:46:45 +0000 (12:46 +0100)]
update UPGRADING

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 7 Jan 2017 11:44:56 +0000 (12:44 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix wrong version
  extend UPGRADING

8 years agofix wrong version
Anatol Belski [Sat, 7 Jan 2017 11:43:56 +0000 (12:43 +0100)]
fix wrong version

8 years agoextend UPGRADING
Anatol Belski [Sat, 7 Jan 2017 11:43:19 +0000 (12:43 +0100)]
extend UPGRADING

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 7 Jan 2017 11:36:09 +0000 (12:36 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add 'e' flag for fopen() to enable CLOEXEC

8 years agoadd 'e' flag for fopen() to enable CLOEXEC
Evgeniy Makhrov [Fri, 2 Oct 2015 19:51:58 +0000 (22:51 +0300)]
add 'e' flag for fopen() to enable CLOEXEC

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Sat, 7 Jan 2017 10:15:15 +0000 (10:15 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix memleaks from #1755 and some pre-existing ones

8 years agoMerge branch 'pull-request/2283' into PHP-7.0
Joe Watkins [Sat, 7 Jan 2017 10:14:36 +0000 (10:14 +0000)]
Merge branch 'pull-request/2283' into PHP-7.0

* pull-request/2283:
  Fix memleaks from #1755 and some pre-existing ones

8 years agoRemove superfluous variable reinit
Leigh [Sat, 7 Jan 2017 09:43:05 +0000 (09:43 +0000)]
Remove superfluous variable reinit

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Sat, 7 Jan 2017 08:08:09 +0000 (08:08 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  PR #2211 don't supress warnings in tests

8 years agoMerge branch '2211' into PHP-7.0
Joe Watkins [Sat, 7 Jan 2017 08:07:17 +0000 (08:07 +0000)]
Merge branch '2211' into PHP-7.0

* pull-request/2211:
  PR #2211 don't supress warnings in DOM tests

8 years agoPR #2211 don't supress warnings in tests
Craig Duncan [Sun, 20 Nov 2016 16:43:46 +0000 (16:43 +0000)]
PR #2211 don't supress warnings in tests

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Sat, 7 Jan 2017 07:10:46 +0000 (07:10 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixes for session and fpm tests in PHP7.0 branch

8 years agoMerge branch 'pull-request/2284' into PHP-7.0
Joe Watkins [Sat, 7 Jan 2017 07:10:23 +0000 (07:10 +0000)]
Merge branch 'pull-request/2284' into PHP-7.0

* pull-request/2284:
  Fixes for session and fpm tests in PHP7.0 branch

8 years agoFixes for session and fpm tests in PHP7.0 branch
Mitch Hagstrand [Sat, 7 Jan 2017 03:55:31 +0000 (19:55 -0800)]
Fixes for session and fpm tests in PHP7.0 branch

1. Increased the timeout on sapi/fpm tests to match the cli server
2. Disabled session GC in session_set_save_handler_basic.phpt
3. Fixed GC in save_handler.inc to delete files based on age

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 7 Jan 2017 01:48:14 +0000 (02:48 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  /guard is also a security flag

8 years ago/guard is also a security flag
Anatol Belski [Sat, 7 Jan 2017 01:25:00 +0000 (02:25 +0100)]
/guard is also a security flag

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sat, 7 Jan 2017 01:05:37 +0000 (02:05 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1

8 years agoRevert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1
Mitch Hagstrand [Fri, 6 Jan 2017 21:58:50 +0000 (13:58 -0800)]
Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1

This reverts commit e55e93a1e335bec39b7edb28f0b8470fa974f4e3.
This change should only apply to master. Not PHP-7.0 or PHP-7.1

8 years agofix edge case leak
Anatol Belski [Sat, 7 Jan 2017 00:15:49 +0000 (01:15 +0100)]
fix edge case leak

8 years agoFixed bug #73877 readlink() returns garbage for UTF-8 paths
Anatol Belski [Sat, 7 Jan 2017 00:09:17 +0000 (01:09 +0100)]
Fixed bug #73877 readlink() returns garbage for UTF-8 paths

8 years agofix typo
Anatol Belski [Fri, 6 Jan 2017 17:55:12 +0000 (18:55 +0100)]
fix typo

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 6 Jan 2017 17:54:50 +0000 (18:54 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix typo

8 years agofix typo
Anatol Belski [Fri, 6 Jan 2017 17:53:30 +0000 (18:53 +0100)]
fix typo

8 years agoupdate NEWS and UPGRADING
Anatol Belski [Fri, 6 Jan 2017 17:39:47 +0000 (18:39 +0100)]
update NEWS and UPGRADING

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 6 Jan 2017 17:37:50 +0000 (18:37 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS and UPGRADING

8 years agoupdate NEWS and UPGRADING
Anatol Belski [Fri, 6 Jan 2017 17:32:33 +0000 (18:32 +0100)]
update NEWS and UPGRADING

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Fri, 6 Jan 2017 17:12:52 +0000 (18:12 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Return integer field types as native integers instead of strings

8 years agoReturn integer field types as native integers instead of strings
Dorin Marcoci [Mon, 2 Jan 2017 14:46:09 +0000 (16:46 +0200)]
Return integer field types as native integers instead of strings

Use another define for better compatibility

Test case for #72583 Feature. Small optimisations.

Adjust conditional directives according to coding standards

Add more compatibility for "end of line" on multiple environements

Updated execute.phpt test after switching to integer mapping

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Fri, 6 Jan 2017 16:22:58 +0000 (16:22 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Test request47456.phpt for PR 1303

8 years agoTest request47456.phpt for PR 1303
Mitch Hagstrand [Fri, 6 Jan 2017 08:27:06 +0000 (00:27 -0800)]
Test request47456.phpt for PR 1303

After merging PR 1303 unmatched subpatterns are set to NULL

8 years agofix build broken by #2124
Joe Watkins [Fri, 6 Jan 2017 16:18:24 +0000 (16:18 +0000)]
fix build broken by #2124

8 years agofix acinclude, messed up by bad merge #2124
Joe Watkins [Fri, 6 Jan 2017 16:13:21 +0000 (16:13 +0000)]
fix acinclude, messed up by bad merge #2124

8 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Joe Watkins [Fri, 6 Jan 2017 16:07:12 +0000 (16:07 +0000)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  Fix #70103: Fix bug 70103 when ZTS is enabled

8 years agofix broken build scripts #2124
Joe Watkins [Fri, 6 Jan 2017 16:06:48 +0000 (16:06 +0000)]
fix broken build scripts #2124

8 years agoSome commentary, change free method
Leigh [Fri, 6 Jan 2017 15:49:15 +0000 (15:49 +0000)]
Some commentary, change free method

8 years agoConditionally free depending on how assignment happened
Leigh [Fri, 6 Jan 2017 15:24:37 +0000 (15:24 +0000)]
Conditionally free depending on how assignment happened

8 years agoFix memleaks from #1755 and some pre-existing ones
Leigh [Fri, 6 Jan 2017 14:58:54 +0000 (14:58 +0000)]
Fix memleaks from #1755 and some pre-existing ones

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 6 Jan 2017 14:39:33 +0000 (15:39 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #70103: Fix bug 70103 when ZTS is enabled

8 years agoFix #70103: Fix bug 70103 when ZTS is enabled
Mitch Hagstrand [Fri, 6 Jan 2017 10:14:12 +0000 (02:14 -0800)]
Fix #70103: Fix bug 70103 when ZTS is enabled

Used snprintf to copy the basename string before it is freed

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Fri, 6 Jan 2017 08:14:29 +0000 (08:14 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Use AX_CHECK_COMPILE_FLAG macro to check for -fvisibility=hidden

8 years agoMerge branch 'pull-request/1809'
Joe Watkins [Fri, 6 Jan 2017 08:04:49 +0000 (08:04 +0000)]
Merge branch 'pull-request/1809'

* pull-request/1809:
  test for function curl_multi_info_read();

8 years agoMerge branch 'pull-request/1809'
Joe Watkins [Fri, 6 Jan 2017 08:04:49 +0000 (08:04 +0000)]
Merge branch 'pull-request/1809'

* pull-request/1809:
  test for function curl_multi_info_read();

8 years agoMerge branch 'pull-request/1755'
Joe Watkins [Fri, 6 Jan 2017 07:40:20 +0000 (07:40 +0000)]
Merge branch 'pull-request/1755'

* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse

8 years agoMerge branch 'pull-request/1755'
Joe Watkins [Fri, 6 Jan 2017 07:40:20 +0000 (07:40 +0000)]
Merge branch 'pull-request/1755'

* pull-request/1755:
  Fix bug #71519 Add 'serialNumberHex' variable to openssl_x509_parse

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Fri, 6 Jan 2017 07:28:56 +0000 (07:28 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  add stream_socket_sendto test from PR #1804

8 years agoadd stream_socket_sendto test from PR #1804
Joe Watkins [Fri, 6 Jan 2017 07:27:31 +0000 (07:27 +0000)]
add stream_socket_sendto test from PR #1804

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Fri, 6 Jan 2017 06:57:35 +0000 (06:57 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #69442 closing of fd incorrect when PTS enabled

8 years agoMerge branch 'pull-request/1588' into PHP-7.0
Joe Watkins [Fri, 6 Jan 2017 06:55:09 +0000 (06:55 +0000)]
Merge branch 'pull-request/1588' into PHP-7.0

* pull-request/1588:
  Fixed #69442 closing of fd incorrect when PTS enabled

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Fri, 6 Jan 2017 06:05:38 +0000 (06:05 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #69582 session not readable by root in CLI

8 years agoMerge branch 'pull-request/1360' into PHP-7.0
Joe Watkins [Fri, 6 Jan 2017 06:02:36 +0000 (06:02 +0000)]
Merge branch 'pull-request/1360' into PHP-7.0

* pull-request/1360:
  Fixed bug #69582 session not readable by root in CLI
  news entry for PR #1360

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Fri, 6 Jan 2017 05:55:14 +0000 (05:55 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix inappropriate warning in FPM log

8 years agoMerge branch 'pull-request/1311' into PHP-7.0
Joe Watkins [Fri, 6 Jan 2017 05:54:42 +0000 (05:54 +0000)]
Merge branch 'pull-request/1311' into PHP-7.0

* pull-request/1311:
  fix inappropriate warning in FPM log

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Joe Watkins [Fri, 6 Jan 2017 05:40:08 +0000 (05:40 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR #1430

8 years agoMerge branch 'pull-request/1430' into PHP-7.0
Joe Watkins [Fri, 6 Jan 2017 05:38:47 +0000 (05:38 +0000)]
Merge branch 'pull-request/1430' into PHP-7.0

* pull-request/1430:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR 1430