]>
granicus.if.org Git - php/log
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
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
Anatol Belski [Sat, 7 Jan 2017 01:25:00 +0000 (02:25 +0100)]
/guard is also a security flag
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
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
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
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
Anatol Belski [Sat, 7 Jan 2017 00:15:49 +0000 (01:15 +0100)]
fix edge case leak
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
Anatol Belski [Sat, 7 Jan 2017 00:09:17 +0000 (01:09 +0100)]
Fixed bug #73877 readlink() returns garbage for UTF-8 paths
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
Anatol Belski [Fri, 6 Jan 2017 17:55:12 +0000 (18:55 +0100)]
fix typo
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
Anatol Belski [Fri, 6 Jan 2017 17:53:30 +0000 (18:53 +0100)]
fix typo
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
Anatol Belski [Fri, 6 Jan 2017 17:39:47 +0000 (18:39 +0100)]
update NEWS and UPGRADING
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
Anatol Belski [Fri, 6 Jan 2017 17:32:33 +0000 (18:32 +0100)]
update NEWS and UPGRADING
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
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
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
Joe Watkins [Fri, 6 Jan 2017 16:34:20 +0000 (16:34 +0000)]
fix bad merge
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
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
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
Joe Watkins [Fri, 6 Jan 2017 16:18:24 +0000 (16:18 +0000)]
fix build broken by #2124
Joe Watkins [Fri, 6 Jan 2017 16:13:21 +0000 (16:13 +0000)]
fix acinclude, messed up by bad merge #2124
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
Joe Watkins [Fri, 6 Jan 2017 16:06:48 +0000 (16:06 +0000)]
fix broken build scripts #2124
Joe Watkins [Fri, 6 Jan 2017 16:04:52 +0000 (16:04 +0000)]
fix broken build scripts #2124
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
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
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
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.
Christoph M. Becker [Fri, 6 Jan 2017 10:24:44 +0000 (11:24 +0100)]
Update UPGRADING wrt. PR 1303
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
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
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
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();
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();
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();
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
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
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
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
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
Joe Watkins [Fri, 6 Jan 2017 07:27:31 +0000 (07:27 +0000)]
add stream_socket_sendto test from PR #1804
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Markus Staab [Thu, 5 Jan 2017 15:12:17 +0000 (16:12 +0100)]
Update php.ini-development
Markus Staab [Thu, 5 Jan 2017 15:11:30 +0000 (16:11 +0100)]
Update php.ini-production
Markus Staab [Thu, 5 Jan 2017 09:18:48 +0000 (10:18 +0100)]
updated default per proposal
TODO: adjust php.ini defaults
Markus Staab [Tue, 3 Jan 2017 08:25:11 +0000 (09:25 +0100)]
Increase realpath_cache_size default value
Remi Collet [Fri, 6 Jan 2017 05:23:59 +0000 (06:23 +0100)]
add skip when json not loaded
Anatol Belski [Fri, 6 Jan 2017 01:39:53 +0000 (02:39 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix deps dir for test data preparations
Anatol Belski [Fri, 6 Jan 2017 01:37:10 +0000 (02:37 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix deps dir for test data preparations
Anatol Belski [Fri, 6 Jan 2017 01:32:09 +0000 (02:32 +0100)]
fix deps dir for test data preparations
Ferenc Kovacs [Fri, 6 Jan 2017 00:52:12 +0000 (01:52 +0100)]
Merge branch 'PHP-7.1'
Ferenc Kovacs [Fri, 6 Jan 2017 00:50:08 +0000 (01:50 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Fri, 6 Jan 2017 00:48:24 +0000 (01:48 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Fri, 6 Jan 2017 00:43:11 +0000 (01:43 +0100)]
5.6.31 is next
Anatol Belski [Fri, 6 Jan 2017 00:32:40 +0000 (01:32 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
don't use separate deps for release branches
Anatol Belski [Fri, 6 Jan 2017 00:29:45 +0000 (01:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
don't use separate deps for release branches
Anatol Belski [Fri, 6 Jan 2017 00:24:41 +0000 (01:24 +0100)]
don't use separate deps for release branches
Anatol Belski [Thu, 5 Jan 2017 22:42:15 +0000 (23:42 +0100)]
reenable appveyor cache
Anatol Belski [Thu, 5 Jan 2017 22:40:56 +0000 (23:40 +0100)]
clean appveyor cache
Anatol Belski [Thu, 5 Jan 2017 22:32:30 +0000 (23:32 +0100)]
sync libmagic.patch
Anatol Belski [Thu, 5 Jan 2017 22:26:20 +0000 (23:26 +0100)]
revert year change on bundled lib files
Anatol Belski [Thu, 5 Jan 2017 22:16:09 +0000 (23:16 +0100)]
add missing condition
Christoph M. Becker [Thu, 5 Jan 2017 17:52:03 +0000 (18:52 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix #70417: PharData::compress() doesn't close temp file
Christoph M. Becker [Thu, 5 Jan 2017 17:50:31 +0000 (18:50 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix #70417: PharData::compress() doesn't close temp file
Christoph M. Becker [Thu, 5 Jan 2017 17:45:16 +0000 (18:45 +0100)]
Merge branch 'pull-request/2278' into PHP-7.0
* pull-request/2278:
Fix #70417: PharData::compress() doesn't close temp file
Christoph M. Becker [Thu, 5 Jan 2017 17:42:58 +0000 (18:42 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
wrong version
# Conflicts:
# main/php_version.h
Joe Watkins [Thu, 5 Jan 2017 17:00:40 +0000 (17:00 +0000)]
wrong version
Joe Watkins [Thu, 5 Jan 2017 16:59:23 +0000 (16:59 +0000)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Joe Watkins [Thu, 5 Jan 2017 16:58:46 +0000 (16:58 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
merge PHP-7.1.1RC1
Joe Watkins [Thu, 5 Jan 2017 16:56:26 +0000 (16:56 +0000)]
I am bad at counting (wrong date in news)
projects / php / log