granicus.if.org Git

commit | commitdiff | tree

Anatol Belski [Sat, 7 Jan 2017 11:48:03 +0000 (12:48 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
  update UPGRADING
  fix wrong version
  extend UPGRADING

commit | commitdiff | tree

Anatol Belski [Sat, 7 Jan 2017 11:46:45 +0000 (12:46 +0100)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Sat, 7 Jan 2017 11:43:56 +0000 (12:43 +0100)]

commit | commitdiff | tree

Anatol Belski [Sat, 7 Jan 2017 11:43:19 +0000 (12:43 +0100)]

commit | commitdiff | tree

Anatol Belski [Sat, 7 Jan 2017 11:37:50 +0000 (12:37 +0100)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Evgeniy Makhrov [Fri, 2 Oct 2015 19:51:58 +0000 (22:51 +0300)]

add 'e' flag for fopen() to enable CLOEXEC

commit | commitdiff | tree

Joe Watkins [Sat, 7 Jan 2017 10:15:37 +0000 (10:15 +0000)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Leigh [Sat, 7 Jan 2017 09:43:05 +0000 (09:43 +0000)]

Remove superfluous variable reinit

commit | commitdiff | tree

Joe Watkins [Sat, 7 Jan 2017 08:08:25 +0000 (08:08 +0000)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Craig Duncan [Sun, 20 Nov 2016 16:43:46 +0000 (16:43 +0000)]

PR #2211 don't supress warnings in tests

commit | commitdiff | tree

Mitch Hagstrand [Fri, 6 Jan 2017 07:22:36 +0000 (23:22 -0800)]

Fixes for session and fpm tests to make them more reliable in Travis CI

1. Increased the timeout on sapi/fpm tests to match the cli server
2. Fixed user session GC function to return number of sessions removed
3. Disabled session GC in session_set_save_handler_basic.phpt

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Sat, 7 Jan 2017 01:49:44 +0000 (02:49 +0100)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Sat, 7 Jan 2017 01:25:00 +0000 (02:25 +0100)]

/guard is also a security flag

commit | commitdiff | tree

Anatol Belski [Sat, 7 Jan 2017 01:07:07 +0000 (02:07 +0100)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Sat, 7 Jan 2017 00:17:18 +0000 (01:17 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix edge case leak

commit | commitdiff | tree

Anatol Belski [Sat, 7 Jan 2017 00:15:49 +0000 (01:15 +0100)]

commit | commitdiff | tree

Anatol Belski [Sat, 7 Jan 2017 00:10:56 +0000 (01:10 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Fixed bug #73877 readlink() returns garbage for UTF-8 paths

commit | commitdiff | tree

Anatol Belski [Sat, 7 Jan 2017 00:09:17 +0000 (01:09 +0100)]

Fixed bug #73877 readlink() returns garbage for UTF-8 paths

commit | commitdiff | tree

Anatol Belski [Fri, 6 Jan 2017 17:56:26 +0000 (18:56 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix typo
fix typo

commit | commitdiff | tree

Anatol Belski [Fri, 6 Jan 2017 17:55:12 +0000 (18:55 +0100)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Fri, 6 Jan 2017 17:53:30 +0000 (18:53 +0100)]

commit | commitdiff | tree

Anatol Belski [Fri, 6 Jan 2017 17:40:57 +0000 (18:40 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
update NEWS and UPGRADING
update NEWS and UPGRADING

commit | commitdiff | tree

Anatol Belski [Fri, 6 Jan 2017 17:39:47 +0000 (18:39 +0100)]

update NEWS and UPGRADING

commit | commitdiff | tree

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

commit | commitdiff | tree

Anatol Belski [Fri, 6 Jan 2017 17:32:33 +0000 (18:32 +0100)]

update NEWS and UPGRADING

commit | commitdiff | tree

Anatol Belski [Fri, 6 Jan 2017 17:15:02 +0000 (18:15 +0100)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 16:34:20 +0000 (16:34 +0000)]

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 16:24:10 +0000 (16:24 +0000)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 16:18:24 +0000 (16:18 +0000)]

fix build broken by #2124

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 16:13:21 +0000 (16:13 +0000)]

fix acinclude, messed up by bad merge #2124

commit | commitdiff | tree

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

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 16:06:48 +0000 (16:06 +0000)]

fix broken build scripts #2124

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 16:04:52 +0000 (16:04 +0000)]

fix broken build scripts #2124

commit | commitdiff | tree

Leigh [Fri, 6 Jan 2017 15:49:15 +0000 (15:49 +0000)]

Some commentary, change free method

commit | commitdiff | tree

Leigh [Fri, 6 Jan 2017 15:24:37 +0000 (15:24 +0000)]

Conditionally free depending on how assignment happened

commit | commitdiff | tree

Leigh [Fri, 6 Jan 2017 14:58:54 +0000 (14:58 +0000)]

Fix memleaks from #1755 and some pre-existing ones

commit | commitdiff | tree

Christoph M. Becker [Fri, 6 Jan 2017 14:45:44 +0000 (15:45 +0100)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Christoph M. Becker [Fri, 6 Jan 2017 10:50:30 +0000 (11:50 +0100)]

Fix test case

Unmatched subpatterns are reported as NULL as of commit ee6aaee8, so we
adjust the test accordingly.

commit | commitdiff | tree

Christoph M. Becker [Fri, 6 Jan 2017 10:24:44 +0000 (11:24 +0100)]

Update UPGRADING wrt. PR 1303

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 08:15:01 +0000 (08:15 +0000)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 08:13:53 +0000 (08:13 +0000)]

Merge branch 'pull-request/2124'

* pull-request/2124:
Use AX_CHECK_COMPILE_FLAG macro to check for -fvisibility=hidden

commit | commitdiff | tree

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();

commit | commitdiff | tree

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();

commit | commitdiff | tree

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();

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 07:29:09 +0000 (07:29 +0000)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 07:27:31 +0000 (07:27 +0000)]

add stream_socket_sendto test from PR #1804

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 06:58:08 +0000 (06:58 +0000)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 06:07:31 +0000 (06:07 +0000)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 05:55:36 +0000 (05:55 +0000)]

Merge branch 'PHP-7.1'

* PHP-7.1:
fix inappropriate warning in FPM log

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 05:46:10 +0000 (05:46 +0000)]

Merge branch 'pull-request/1303'

* pull-request/1303:
Distinguish between unmatched subpatterns and empty matches in preg_*()
news entry for PR #1303

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 05:41:00 +0000 (05:41 +0000)]

Merge branch 'PHP-7.1'

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 05:33:49 +0000 (05:33 +0000)]

Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
add skip when json not loaded

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 05:33:22 +0000 (05:33 +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:
add skip when json not loaded

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 05:32:55 +0000 (05:32 +0000)]

Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:/php-src:
add skip when json not loaded

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 05:27:30 +0000 (05:27 +0000)]

Merge branch 'PHP-7.1'

* PHP-7.1:
Increase realpath_cache_size default value
add UPGRADING note for realpath_cache_size

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 05:27:04 +0000 (05:27 +0000)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Increase realpath_cache_size default value
add UPGRADING note for realpath_cache_size

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 05:25:49 +0000 (05:25 +0000)]

Merge branch 'realpath_cache_size_update' into PHP-7.0

* realpath_cache_size_update:
Increase realpath_cache_size default value
add UPGRADING note regarding realpath_cache_size

commit | commitdiff | tree

Remi Collet [Fri, 6 Jan 2017 05:27:39 +0000 (06:27 +0100)]

Merge branch 'PHP-7.1'

* PHP-7.1:
add skip when json not loaded

commit | commitdiff | tree

Remi Collet [Fri, 6 Jan 2017 05:27:25 +0000 (06:27 +0100)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
add skip when json not loaded

commit | commitdiff | tree

Remi Collet [Fri, 6 Jan 2017 05:27:08 +0000 (06:27 +0100)]

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
add skip when json not loaded

commit | commitdiff | tree

Joe Watkins [Fri, 6 Jan 2017 05:27:04 +0000 (05:27 +0000)]

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
Increase realpath_cache_size default value