]>
granicus.if.org Git - php/log
Joe Watkins [Fri, 6 Jan 2017 16:06:48 +0000 (16:06 +0000)]
fix broken build scripts #2124
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: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: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: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: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: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: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: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: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: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: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: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: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: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
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
Joe Watkins [Thu, 5 Jan 2017 17:00:40 +0000 (17:00 +0000)]
wrong version
Joe Watkins [Thu, 5 Jan 2017 16:56:26 +0000 (16:56 +0000)]
I am bad at counting (wrong date in news)
Joe Watkins [Thu, 5 Jan 2017 16:50:52 +0000 (16:50 +0000)]
bump version after release
Christoph M. Becker [Thu, 3 Sep 2015 14:37:29 +0000 (16:37 +0200)]
Fix #70417: PharData::compress() doesn't close temp file
According to the comment, it has not been deemed necessary to close compressed
files. However, we don't want to keep unclosed file handles to save ressources.
So we're also closing compressed archives, if they're not aliased.
Anatol Belski [Thu, 5 Jan 2017 13:02:43 +0000 (14:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
Anatol Belski [Thu, 5 Jan 2017 12:59:01 +0000 (13:59 +0100)]
Revert "Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0"
This reverts commit
a8931df672bb173ef81c10e4fc2a5de23789c935 , reversing
changes made to
f2f35a2b27d0074ab015b8a37d6563eec74147d5 .
Nikita Popov [Thu, 5 Jan 2017 10:38:17 +0000 (11:38 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 5 Jan 2017 10:38:05 +0000 (11:38 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Thu, 5 Jan 2017 10:37:06 +0000 (11:37 +0100)]
Fix printf modifier
Joe Watkins [Thu, 5 Jan 2017 06:54:37 +0000 (06:54 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix php-fpm.service.in
Joe Watkins [Thu, 5 Jan 2017 06:54:19 +0000 (06:54 +0000)]
Merge branch 'pull-request/1256' into PHP-7.0
* pull-request/1256:
Fix php-fpm.service.in
Anatol Belski [Thu, 5 Jan 2017 00:52:37 +0000 (01:52 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
quick fix for the base branch version parsing, not perfect still
Anatol Belski [Thu, 5 Jan 2017 00:49:36 +0000 (01:49 +0100)]
quick fix for the base branch version parsing, not perfect still
Anatol Belski [Thu, 5 Jan 2017 00:14:27 +0000 (01:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
move dev to next
Anatol Belski [Thu, 5 Jan 2017 00:12:18 +0000 (01:12 +0100)]
move dev to next
Nikita Popov [Wed, 4 Jan 2017 23:49:19 +0000 (00:49 +0100)]
Add Z_EXTRA macro
For use with u2 values which don't deserve a custom macro...
Nikita Popov [Wed, 4 Jan 2017 23:28:21 +0000 (00:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Wed, 4 Jan 2017 23:22:25 +0000 (00:22 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Wed, 4 Jan 2017 23:20:56 +0000 (00:20 +0100)]
Add tests for delayed __wakeup()
Nikita Popov [Wed, 4 Jan 2017 23:19:26 +0000 (00:19 +0100)]
Implement delayed __wakeup
Joe Watkins [Wed, 4 Jan 2017 22:25:45 +0000 (22:25 +0000)]
Merge branch 'pull-request/2274' into PHP-7.1
* pull-request/2274:
Update copyright headers to 2017
Joe Watkins [Wed, 4 Jan 2017 22:24:34 +0000 (22:24 +0000)]
Merge branch 'pull-request/2273' into PHP-7.0
* pull-request/2273:
Update copyright headers to 2017
Sammy Kaye Powers [Wed, 4 Jan 2017 17:24:25 +0000 (11:24 -0600)]
Update copyright header to 2017 in calendar.c
Sammy Kaye Powers [Wed, 4 Jan 2017 17:23:42 +0000 (11:23 -0600)]
Update copyright headers to 2017
Sammy Kaye Powers [Wed, 4 Jan 2017 17:15:47 +0000 (11:15 -0600)]
Update copyright header to 2017 in calendar.c
Sammy Kaye Powers [Wed, 4 Jan 2017 17:14:55 +0000 (11:14 -0600)]
Update copyright headers to 2017
Anatol Belski [Wed, 4 Jan 2017 16:21:34 +0000 (17:21 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
switch to the beta1 SDK for AppVeyor build
Anatol Belski [Wed, 4 Jan 2017 12:31:38 +0000 (13:31 +0100)]
switch to the beta1 SDK for AppVeyor build
Joe Watkins [Wed, 4 Jan 2017 14:51:21 +0000 (14:51 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
remove duplicate test
Joe Watkins [Wed, 4 Jan 2017 14:50:59 +0000 (14:50 +0000)]
remove duplicate test
Joe Watkins [Wed, 4 Jan 2017 14:36:37 +0000 (14:36 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test
Joe Watkins [Wed, 4 Jan 2017 14:36:18 +0000 (14:36 +0000)]
fix test
Joe Watkins [Wed, 4 Jan 2017 13:35:01 +0000 (13:35 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
get_defined_functions additional parameter to exclude disabled functions
news entry for PR #1312
Joe Watkins [Wed, 4 Jan 2017 13:32:37 +0000 (13:32 +0000)]
Merge branch 'pull-request/1312' into PHP-7.0
* pull-request/1312:
get_defined_functions extra parameter to exclude disabled functions
news entry for PR #1312
Anatol Belski [Tue, 3 Jan 2017 16:54:46 +0000 (17:54 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix PDO tests to match SQL standard syntax and pass Firebird tests.
Dorin Marcoci [Mon, 2 Jan 2017 17:02:11 +0000 (19:02 +0200)]
Fix PDO tests to match SQL standard syntax and pass Firebird tests.
Anatol Belski [Tue, 3 Jan 2017 12:27:06 +0000 (13:27 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
better skip on files
Anatol Belski [Tue, 3 Jan 2017 12:25:16 +0000 (13:25 +0100)]
better skip on files
some more could be added
Nikita Popov [Tue, 3 Jan 2017 11:18:33 +0000 (12:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 3 Jan 2017 11:16:35 +0000 (12:16 +0100)]
Fix build
Vince [Tue, 8 Nov 2016 22:23:04 +0000 (14:23 -0800)]
Fix Bug #73462 - Persistent connections don't set $connect_errno
Persistent connections skipped resetting $connect_error and $connect_errno values
This adds the "clear error" line to persistent connections for consistency
Joe Watkins [Tue, 3 Jan 2017 10:48:42 +0000 (10:48 +0000)]
Merge branch 'pull-request/1905'
* pull-request/1905:
pack()/unpack() for Big Endian float/double and Little Endian float/double
Joe Watkins [Tue, 3 Jan 2017 10:48:42 +0000 (10:48 +0000)]
Merge branch 'pull-request/1905'
* pull-request/1905:
pack()/unpack() for Big Endian float/double and Little Endian float/double
Rasmus Lerdorf [Tue, 3 Jan 2017 06:30:28 +0000 (22:30 -0800)]
Fix opcache test dependencies
Rasmus Lerdorf [Tue, 3 Jan 2017 06:21:12 +0000 (22:21 -0800)]
Fix opcache test dependencies
Stanislav Malyshev [Tue, 3 Jan 2017 06:08:42 +0000 (22:08 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Use correct string release function
Stanislav Malyshev [Tue, 3 Jan 2017 06:08:25 +0000 (22:08 -0800)]
Use correct string release function
Stanislav Malyshev [Tue, 3 Jan 2017 05:59:59 +0000 (21:59 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix error reporting
Stanislav Malyshev [Tue, 3 Jan 2017 05:59:44 +0000 (21:59 -0800)]
Fix error reporting
Stanislav Malyshev [Tue, 3 Jan 2017 05:37:06 +0000 (21:37 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix #73832 - leave the table in a safe state if the size is too big.
Fix bug #73831 - NULL Pointer Dereference while unserialize php object
Stanislav Malyshev [Tue, 3 Jan 2017 05:35:42 +0000 (21:35 -0800)]
Merge branch 'PHP-7.0.15' into PHP-7.0
* PHP-7.0.15:
Fix #73832 - leave the table in a safe state if the size is too big.
Fix bug #73831 - NULL Pointer Dereference while unserialize php object
Stanislav Malyshev [Tue, 3 Jan 2017 05:07:01 +0000 (21:07 -0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug #73737 FPE when parsing a tag format
Fix bug #73773 - Seg fault when loading hostile phar
Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
Fix bug #73768 - Memory corruption when loading hostile phar
Fix int overflows in phar (bug #73764)
Stanislav Malyshev [Tue, 3 Jan 2017 05:01:35 +0000 (21:01 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #73737 FPE when parsing a tag format
Fix bug #73773 - Seg fault when loading hostile phar
Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
Fix bug #73768 - Memory corruption when loading hostile phar
Fix int overflows in phar (bug #73764)
Stanislav Malyshev [Tue, 3 Jan 2017 04:56:32 +0000 (20:56 -0800)]
Merge branch 'PHP-5.6.30' into PHP-5.6
* PHP-5.6.30:
Fix bug #73737 FPE when parsing a tag format
Fix bug #73773 - Seg fault when loading hostile phar
Fix bug #73825 - Heap out of bounds read on unserialize in finish_nested_data()
Fix bug #73768 - Memory corruption when loading hostile phar
Fix int overflows in phar (bug #73764)
Stanislav Malyshev [Tue, 3 Jan 2017 04:14:05 +0000 (20:14 -0800)]
Fix #73832 - leave the table in a safe state if the size is too big.
Anatol Belski [Tue, 3 Jan 2017 01:24:23 +0000 (02:24 +0100)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
Nikita Popov [Tue, 3 Jan 2017 01:18:00 +0000 (02:18 +0100)]
Fix test after mail.log change
Anatol Belski [Tue, 3 Jan 2017 01:17:44 +0000 (02:17 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
set exclude AppVeyor branches and ignore builds on NEWS updates
Anatol Belski [Tue, 3 Jan 2017 00:56:27 +0000 (01:56 +0100)]
set exclude AppVeyor branches and ignore builds on NEWS updates
Nikita Popov [Tue, 3 Jan 2017 01:13:04 +0000 (02:13 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 3 Jan 2017 01:12:28 +0000 (02:12 +0100)]
Fix early free
Anatol Belski [Tue, 3 Jan 2017 00:11:41 +0000 (01:11 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Disable pdb generation for AppVeyor
Anatol Belski [Tue, 3 Jan 2017 00:07:55 +0000 (01:07 +0100)]
Disable pdb generation for AppVeyor
It is not needed for the test runs and would speedup the compilation
phase.