]>
granicus.if.org Git - php/log
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
Markus Staab [Mon, 9 Jan 2017 10:33:05 +0000 (11:33 +0100)]
set more suitable defaults for opcache in ini and code
Xinchen Hui [Mon, 9 Jan 2017 08:30:00 +0000 (16:30 +0800)]
Fixed bug #73854 (Always true condition in php_openssl_sockop_io)
Joe Watkins [Mon, 9 Jan 2017 05:31:41 +0000 (05:31 +0000)]
Fixed bug #72979 money_format stores wrong length on AIX
Joe Watkins [Mon, 9 Jan 2017 05:24:44 +0000 (05:24 +0000)]
update ip2long_varation2 test to skip for AIX, see bug #72973
Joe Watkins [Mon, 9 Jan 2017 05:13:46 +0000 (05:13 +0000)]
Fixed #72974 imap is undefined service on AIX
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.
Markus Staab [Sun, 8 Jan 2017 21:02:50 +0000 (22:02 +0100)]
Use proper file extension for the README
Peter Kokot [Sun, 8 Jan 2017 20:24:25 +0000 (21:24 +0100)]
Fix 404 links in Litespeed README - Bug 73890
Anatol Belski [Sun, 8 Jan 2017 19:07:16 +0000 (20:07 +0100)]
update NEWS
Remi Collet [Sun, 8 Jan 2017 18:55:30 +0000 (19:55 +0100)]
improve FPM tests (mostly for systemd build)
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 )
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.
Nikita Popov [Sat, 7 Jan 2017 23:01:05 +0000 (00:01 +0100)]
Fix OOB read introduced by previous commit
Ooops...
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.
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.
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...
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
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
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.
Anatol Belski [Sat, 7 Jan 2017 11:43:56 +0000 (12:43 +0100)]
fix wrong version
Anatol Belski [Sat, 7 Jan 2017 11:43:19 +0000 (12:43 +0100)]
extend UPGRADING
Evgeniy Makhrov [Fri, 2 Oct 2015 19:51:58 +0000 (22:51 +0300)]
add 'e' flag for fopen() to enable CLOEXEC
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
Leigh [Sat, 7 Jan 2017 09:43:05 +0000 (09:43 +0000)]
Remove superfluous variable reinit
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
Craig Duncan [Sun, 20 Nov 2016 16:43:46 +0000 (16:43 +0000)]
PR #2211 don't supress warnings in tests
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
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
Anatol Belski [Sat, 7 Jan 2017 01:25:00 +0000 (02:25 +0100)]
/guard is also a security flag
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 [Fri, 6 Jan 2017 17:53:30 +0000 (18:53 +0100)]
fix typo
Anatol Belski [Fri, 6 Jan 2017 17:32:33 +0000 (18:32 +0100)]
update NEWS and UPGRADING
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
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
Leigh [Fri, 6 Jan 2017 15:49:15 +0000 (15:49 +0000)]
Some commentary, change free method
Leigh [Fri, 6 Jan 2017 15:24:37 +0000 (15:24 +0000)]
Conditionally free depending on how assignment happened
Leigh [Fri, 6 Jan 2017 14:58:54 +0000 (14:58 +0000)]
Fix memleaks from #1755 and some pre-existing ones
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
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:27:31 +0000 (07:27 +0000)]
add stream_socket_sendto test from PR #1804
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: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: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: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: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: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:08 +0000 (06:27 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
add skip when json not loaded
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:32:09 +0000 (02:32 +0100)]
fix deps dir for test data preparations
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:24:41 +0000 (01:24 +0100)]
don't use separate deps for release branches
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, 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 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: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: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:49:36 +0000 (01:49 +0100)]
quick fix for the base branch version parsing, not perfect still
Anatol Belski [Thu, 5 Jan 2017 00:12:18 +0000 (01:12 +0100)]
move dev to next
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: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: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 12:31:38 +0000 (13:31 +0100)]
switch to the beta1 SDK for AppVeyor build
Joe Watkins [Wed, 4 Jan 2017 14:50:59 +0000 (14:50 +0000)]
remove duplicate test
Joe Watkins [Wed, 4 Jan 2017 14:36:18 +0000 (14:36 +0000)]
fix test
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
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:25:16 +0000 (13:25 +0100)]
better skip on files
some more could be added
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
Rasmus Lerdorf [Tue, 3 Jan 2017 06:30:28 +0000 (22:30 -0800)]
Fix opcache test dependencies
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:44 +0000 (21:59 -0800)]
Fix error reporting
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: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 00:56:27 +0000 (01:56 +0100)]
set exclude AppVeyor branches and ignore builds on NEWS updates
Nikita Popov [Tue, 3 Jan 2017 01:12:28 +0000 (02:12 +0100)]
Fix early free
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.
Nikita Popov [Mon, 2 Jan 2017 22:35:27 +0000 (23:35 +0100)]
Add NEWS entries
Nikita Popov [Thu, 15 Dec 2016 16:22:08 +0000 (17:22 +0100)]
Optimize get_browser() using prefix and contains checks
Avoid expensive regex compilations by checking for prefix
and contained segments beforehand.
Nikita Popov [Thu, 15 Dec 2016 14:12:48 +0000 (15:12 +0100)]
Optimize browscap loading and representation
Avoid many string duplications, use interning (browscap-local, of
course), reduce pattern size, use more compact key-value
representation, build result array only on demand.
Nikita Popov [Sun, 1 Jan 2017 21:19:01 +0000 (22:19 +0100)]
Add get_browser() test against larger corpus
Testing corpus provided by Anatol against current browscap.ini lite.
About 30% of all agents are not recognized by this browscap.ini,
but this should give us decent coverage.
Mitch Hagstrand [Mon, 2 Jan 2017 15:49:32 +0000 (07:49 -0800)]
Fix for nowait.phpt failing intermittently
The parent process was releasing the child semaphore
after the child process continued execution. Now
the child semaphore is released before the child
process continues execution.
vanviegen [Wed, 21 Dec 2016 15:37:17 +0000 (16:37 +0100)]
Fix for sporadic segfault with MYSQLI_OPT_INT_AND_FLOAT_NATIVE
Fixes bug #73800
news entry for PR #2250
Joe Watkins [Mon, 2 Jan 2017 11:57:45 +0000 (11:57 +0000)]
news entry for PR #2267
Arnout Boks [Mon, 2 Jan 2017 10:47:49 +0000 (11:47 +0100)]
Fixed #67474 (getElementsByTagNameNS and default namespace)
This bug was caused by the fact that dom_get_elements_by_tag_name_ns_raw
uses an empty string to filter on the default namespace (as NULL means
'no filter'), whereas in the node itself the default namespace is
signalled by nodep->ns being null.