]>
granicus.if.org Git - php/log
Mitch Hagstrand [Thu, 29 Dec 2016 03:29:36 +0000 (19:29 -0800)]
Make Opcache tests using the cli server more reliable
Same fix already applied to ext/curl/tests/server.inc
and sapi/cli/tests/php_cli_server.inc
1. Increases the amount of time for the PHP built-in server to accept a connection
2. Outputs an error if the PHP built-in server fails
Christoph M. Becker [Thu, 29 Dec 2016 12:31:18 +0000 (13:31 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Revert "Fix #73530: Unsetting result set may reset other result set"
# Conflicts:
# ext/sqlite3/sqlite3.c
Christoph M. Becker [Thu, 29 Dec 2016 11:41:39 +0000 (12:41 +0100)]
Revert "Fix #73530: Unsetting result set may reset other result set"
This reverts commit
eb570294a289b45d0dd38efc71065d6b0d314c4b .
That commit caused a regression, so it's probably best to revert it, and
to tackle the issue for the next minor release.
Xinchen Hui [Thu, 29 Dec 2016 07:46:47 +0000 (15:46 +0800)]
Merge branch 'bugfix_timeout_61471' of https://github.com/axot/php-src into PHP-7.0
* 'bugfix_timeout_61471' of https://github.com/axot/php-src:
define php_ap_map_http_request_error function for older httpd only
add old versions of httpd support
typo fixed
bug fixed #61471 in apache2handler
Zheng SHAO [Thu, 29 Dec 2016 04:00:31 +0000 (13:00 +0900)]
define php_ap_map_http_request_error function for older httpd only
Zheng SHAO [Wed, 28 Dec 2016 10:02:41 +0000 (19:02 +0900)]
add old versions of httpd support
Nikita Popov [Tue, 27 Dec 2016 21:20:40 +0000 (22:20 +0100)]
Disable AppVeyor fast_finish
As NTS and TS fail in different ways, we want to see both.
Mitch Hagstrand [Fri, 23 Dec 2016 20:07:47 +0000 (12:07 -0800)]
Makes the sapi web server and curl tests more reliable
1. Increased the time for the sapi/cli/tests/php_cli_server.inc to accept connections.
2. sapi/cli/tests/php_cli_server.inc has errors messages and a `stop` function.
3. bug67429.phpt uses the `stop` function to shutdown the webserver before starting a new one.
4. Removed ext/curl/tests/bug48203_multi-win32.phpt test now that ext/curl/tests/bug48203_multi.phpt
runs on Windows also.
Mitch Hagstrand [Tue, 20 Dec 2016 10:37:48 +0000 (02:37 -0800)]
Fixes the curl tests to be more reliable in Travis CI
1. Increases the amount of time for the PHP built-in server to accept a connection
2. Outputs an error if the PHP built-in server fails
3. In bug48203_multi.phpt the test no longer starts and stops multiple PHP built-in servers
dedal.qq [Tue, 13 Dec 2016 21:52:16 +0000 (00:52 +0300)]
Interpretation of curl_setopt values for boolean parameters
Dorin Marcoci [Sat, 24 Dec 2016 11:57:03 +0000 (13:57 +0200)]
Fixes #65689. PDO_Firebrid / exec() does not free allocated statement.
Bob Weinand [Thu, 22 Dec 2016 22:34:07 +0000 (23:34 +0100)]
Fix alpn_ctx leaking in openssl
Bob Weinand [Thu, 22 Dec 2016 14:29:17 +0000 (15:29 +0100)]
Fixed bug #73373 (deflate_add does not verify that output was not truncated)
Sébastien Santoro [Wed, 21 Dec 2016 21:14:04 +0000 (21:14 +0000)]
Fix IS_UNDEF comparisons in opcache
These conditions were formerly `!q->pData` and `!p->pData`, and should
now be detected as undefined variables, using the special type IS_UNDEF.
Incidentally, this syntax raised a logical-not-parentheses compiler
warning, now gone.
Bob Weinand [Wed, 21 Dec 2016 23:38:47 +0000 (00:38 +0100)]
Fixed bug #73704 (phpdbg shows the wrong line in files with shebang)
Nikita Popov [Wed, 21 Dec 2016 20:27:47 +0000 (21:27 +0100)]
Increase timing quota for small string concat test
Test is regularly failing on Travis.
David Walker [Tue, 20 Dec 2016 22:48:43 +0000 (15:48 -0700)]
Fix #73753 - Unpacked Arrays and Duplication
Bob Weinand [Wed, 21 Dec 2016 01:42:23 +0000 (02:42 +0100)]
Fix issue with -- in phpdbg command line
Dmitry Stogov [Tue, 20 Dec 2016 13:48:57 +0000 (16:48 +0300)]
Fixed bug #73792 (invalid foreach loop hangs script)
Zheng SHAO [Mon, 19 Dec 2016 15:57:22 +0000 (00:57 +0900)]
Fixed NEWS conflicts
Anatol Belski [Mon, 19 Dec 2016 00:07:08 +0000 (01:07 +0100)]
update NEWS
Dorin Marcoci [Sat, 17 Dec 2016 19:34:32 +0000 (21:34 +0200)]
Compatibility with Firebird & Oracle select syntax.
Anatol Belski [Sun, 18 Dec 2016 23:50:29 +0000 (00:50 +0100)]
fix proto
Dorin Marcoci [Thu, 15 Dec 2016 08:57:45 +0000 (10:57 +0200)]
Cursor is not opened on singleton selects.
Test case for unregistered bug on FB3 singleton selects
Set error mode to warning instead of exception.
Anatol Belski [Sun, 18 Dec 2016 20:16:35 +0000 (21:16 +0100)]
fix arg spec and datatype, follow up on 73594
Bruce Weirdan [Fri, 25 Nov 2016 02:14:14 +0000 (04:14 +0200)]
Fixed bug #73594
Skip the tests when local resolver does not behave
* Added SKIPIF sections to check local resolver
* Added test to check $authns parameter
Nikita Popov [Sun, 18 Dec 2016 16:10:19 +0000 (17:10 +0100)]
Fix bug #46103
Nikita Popov [Sun, 18 Dec 2016 12:16:25 +0000 (13:16 +0100)]
Add test for get_browser() in object mode
All other tests only check array return values...
Anatol Belski [Sat, 17 Dec 2016 19:45:22 +0000 (20:45 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix C89 compat
Anatol Belski [Sat, 17 Dec 2016 19:43:32 +0000 (20:43 +0100)]
fix C89 compat
Anatol Belski [Sat, 17 Dec 2016 12:12:34 +0000 (13:12 +0100)]
replace default appveyor build version
Zheng SHAO [Sat, 17 Dec 2016 11:26:09 +0000 (20:26 +0900)]
typo fixed
Anatol Belski [Sat, 17 Dec 2016 10:26:13 +0000 (11:26 +0100)]
add Appveyor fast_fail
Anatol Belski [Sat, 17 Dec 2016 10:25:06 +0000 (11:25 +0100)]
improve error check
Zheng SHAO [Sat, 17 Dec 2016 04:37:58 +0000 (13:37 +0900)]
bug fixed #61471 in apache2handler
Anatol Belski [Fri, 16 Dec 2016 21:59:47 +0000 (22:59 +0100)]
turn mcrypt back on for Appveyor runs
(cherry picked from commit
fca2312fbecbc8eb44639d5141bfeae48976206b )
Anatol Belski [Fri, 16 Dec 2016 10:53:41 +0000 (11:53 +0100)]
add build status badge
(cherry picked from commit
3a886c9d20f450545a0d93bb4fc974e28a50df85 )
Anatol Belski [Fri, 16 Dec 2016 10:48:08 +0000 (11:48 +0100)]
add scripts for AppVeyor integration
(cherry picked from commit
c737d6fb495ee986f7819472db861aa9e1bf42b1 )
Sara Golemon [Tue, 13 Dec 2016 05:46:49 +0000 (21:46 -0800)]
Silence warning from unhandled enum
(cherry picked from commit
57bbe2c140752f491b1fa24336b817bd48f65a93 )
Anatol Belski [Sun, 11 Dec 2016 01:52:02 +0000 (02:52 +0100)]
fix leaking streams and memory mapped files
(cherry picked from commit
f1ff23095b1a4fe6d6a65331dda7832ae02eb1a1 )
Nikita Popov [Thu, 15 Dec 2016 21:16:44 +0000 (22:16 +0100)]
Fix stack management in ini scanner
Anatol Belski [Thu, 15 Dec 2016 11:20:37 +0000 (12:20 +0100)]
make timing check more forgiving in these tests
Particularly on slower VMs, the sporadic fails can still happen.
The timing is kept in an uncritical range, but allows the tests
pass there. Mayby, it'd make sense to introduce a new group for
this kind of tests, so tests requiring exact time measurement
can be avoided on unsuitable environments.
Matteo Beccati [Thu, 15 Dec 2016 08:31:54 +0000 (09:31 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Skip tests when secure_file_priv dir not writable
Matteo Beccati [Thu, 15 Dec 2016 08:31:00 +0000 (09:31 +0100)]
Skip tests when secure_file_priv dir not writable
Yasuo Ohgaki [Thu, 15 Dec 2016 07:16:45 +0000 (16:16 +0900)]
Add missing UPGRADING entry. Manual is updated before 7.0 release.
Anatol Belski [Wed, 14 Dec 2016 18:53:55 +0000 (19:53 +0100)]
extend skip section
The day light offset is calculated based on the system TZ, so with
an unsuitable one there's no way to workaround the false positives.
Nikita Popov [Wed, 14 Dec 2016 17:10:36 +0000 (18:10 +0100)]
Partially fix bug #70492
The libmagic portion is missing.
Anatol Belski [Wed, 14 Dec 2016 11:33:13 +0000 (12:33 +0100)]
cleanup temporary data
Nikita Popov [Tue, 13 Dec 2016 16:54:30 +0000 (17:54 +0100)]
More fixes for bug #73089
Insert a lot more DEREFs. Some may not be necessary, but better
safe than sorry. I'm thinking the soap_hash_str_find_deref function
should become part of the zend_hash API -- we need this in many
places.
Andrey Hristov [Mon, 12 Dec 2016 19:52:36 +0000 (21:52 +0200)]
Add a bit more test cases (edge cases) to the BIT test case
Andrey Hristov [Mon, 12 Dec 2016 19:28:33 +0000 (21:28 +0200)]
Add a test case to test fetching of multiple rows with bit values.
Andrey Hristov [Mon, 12 Dec 2016 19:11:02 +0000 (21:11 +0200)]
Fix off by 1 problem.
The problem was manifestated only with BIT columns and only when more than
one row was fetched. The problem was coming from the fact that in pre-7.0
times mysqlnd was using a no-copy optimization. This optimization kept the
strings (and also the BIT mask equivalents as strings) in the packet and the
zval referred to them. 7.0+ zvals cannot use no-copy and always copy. Because
of this the allocated memory for the packet was reduced by 1 by the person who
ported the driver, but the starting address of the bit area wasn't reduced.
Because of this the bit_area started at wrong address and the length decoded
wrong.
Anatol Belski [Mon, 12 Dec 2016 00:54:22 +0000 (01:54 +0100)]
better way to get ACP
Anatol Belski [Mon, 12 Dec 2016 00:26:06 +0000 (01:26 +0100)]
fix datatype for zpp, yet a followup on bug #73679
Anatol Belski [Sun, 11 Dec 2016 16:39:08 +0000 (17:39 +0100)]
update NEWS
Anatol Belski [Sun, 11 Dec 2016 16:06:55 +0000 (17:06 +0100)]
Fixed bug #73679 DOTNET read access violation using invalid codepage
Anatol Belski [Thu, 8 Dec 2016 16:15:06 +0000 (17:15 +0100)]
fix uninitialized member
Ferenc Kovacs [Thu, 8 Dec 2016 06:09:41 +0000 (07:09 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Thu, 8 Dec 2016 06:05:32 +0000 (07:05 +0100)]
update NEWS
Anatol Belski [Thu, 8 Dec 2016 02:24:18 +0000 (03:24 +0100)]
git clean section
Anatol Belski [Wed, 7 Dec 2016 20:22:34 +0000 (21:22 +0100)]
update NEWS
Dorin Marcoci [Wed, 7 Dec 2016 20:06:11 +0000 (21:06 +0100)]
Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement
Markus Staab [Mon, 5 Dec 2016 19:57:03 +0000 (20:57 +0100)]
Fixed typo in skipif error message
Dmitry Stogov [Wed, 7 Dec 2016 12:10:59 +0000 (15:10 +0300)]
Check if PHP is in execution state.
Anatol Belski [Tue, 6 Dec 2016 19:25:27 +0000 (20:25 +0100)]
update NEWS
Bob Weinand [Tue, 6 Dec 2016 17:27:31 +0000 (18:27 +0100)]
Fixed issue getting executable lines from custom wrappers
See also krakjoe/phpdbg#161
Anatol Belski [Tue, 6 Dec 2016 15:17:28 +0000 (16:17 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak, take 2
Anatol Belski [Tue, 6 Dec 2016 15:12:39 +0000 (16:12 +0100)]
fix leak, take 2
Anatol Belski [Tue, 6 Dec 2016 13:42:59 +0000 (14:42 +0100)]
fix leak, take on 7.x
Anatol Belski [Tue, 6 Dec 2016 13:36:52 +0000 (14:36 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak, take on 5.6
Anatol Belski [Tue, 6 Dec 2016 13:34:27 +0000 (14:34 +0100)]
fix leak, take on 5.6
Xinchen Hui [Tue, 6 Dec 2016 09:17:59 +0000 (17:17 +0800)]
Fixed bug #73663 ("Invalid opcode 65/16/8" occurs with a variable created with list())
Stanislav Malyshev [Tue, 6 Dec 2016 06:33:33 +0000 (22:33 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
Stanislav Malyshev [Tue, 6 Dec 2016 06:32:59 +0000 (22:32 -0800)]
This still leaks memory, I don't have enough knowledge in WDDX code to fix them :(
Stanislav Malyshev [Tue, 6 Dec 2016 06:16:00 +0000 (22:16 -0800)]
Fix bug #73645 - int/size_t confusion
Stanislav Malyshev [Tue, 6 Dec 2016 05:58:55 +0000 (21:58 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #73631 - Invalid read when wddx decodes empty boolean element
Stanislav Malyshev [Tue, 6 Dec 2016 05:40:55 +0000 (21:40 -0800)]
Fix bug #73631 - Invalid read when wddx decodes empty boolean element
Dmitry Stogov [Mon, 5 Dec 2016 18:45:08 +0000 (21:45 +0300)]
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Anatol Belski [Sun, 4 Dec 2016 21:42:39 +0000 (22:42 +0100)]
fix test
This test depends on connection flags modifable from teh env,
that can affect the exact function called.
Anatol Belski [Sun, 4 Dec 2016 21:27:17 +0000 (22:27 +0100)]
fix test
On Windows, either doubled backslashes or forward slashes are supported
on the server side.
Anatol Belski [Sun, 4 Dec 2016 19:59:12 +0000 (20:59 +0100)]
fix ident
Anatol Belski [Sun, 4 Dec 2016 16:28:43 +0000 (17:28 +0100)]
fix test
Anatol Belski [Sun, 4 Dec 2016 13:01:40 +0000 (14:01 +0100)]
enforce the test ini usage for the child process
Bob Weinand [Sat, 3 Dec 2016 22:37:23 +0000 (23:37 +0100)]
Fix PHP-7.0 build (wrong fix for the branch)
Bob Weinand [Sat, 3 Dec 2016 17:23:58 +0000 (18:23 +0100)]
Fix leak when using $this outside of object context
Christoph M. Becker [Sat, 3 Dec 2016 13:18:00 +0000 (14:18 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Adrien Crivelli [Wed, 30 Nov 2016 09:19:35 +0000 (18:19 +0900)]
Fix minor typo
Nikita Popov [Fri, 2 Dec 2016 16:03:05 +0000 (17:03 +0100)]
Fix leak in shift_right_function
Bob Weinand [Fri, 2 Dec 2016 14:41:47 +0000 (15:41 +0100)]
Fix test of wrong operator in self_xor.phpt
Dmitry Stogov [Fri, 2 Dec 2016 12:39:33 +0000 (15:39 +0300)]
Eliminated useless exception check
Dmitry Stogov [Fri, 2 Dec 2016 12:13:55 +0000 (15:13 +0300)]
Fixed behavior of failing compound assignments (they shouldn't change the source value when exception thrown during type converion).
Dmitry Stogov [Fri, 2 Dec 2016 10:58:44 +0000 (13:58 +0300)]
Fixed behavior of failing compound assignments (they shouldn't change the source value).
Dmitry Stogov [Fri, 2 Dec 2016 09:34:46 +0000 (12:34 +0300)]
Fixed possible memory leak in &=, |=, ^=.
Bob Weinand [Thu, 1 Dec 2016 14:21:28 +0000 (15:21 +0100)]
Fix valgrind issue when throwing due to yield from aborted generator
Anatol Belski [Thu, 1 Dec 2016 13:52:18 +0000 (14:52 +0100)]
fork tests
Dmitry Stogov [Thu, 1 Dec 2016 13:21:57 +0000 (16:21 +0300)]
Fixed bad merge
Dmitry Stogov [Thu, 1 Dec 2016 12:50:05 +0000 (15:50 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Workaround for GCC-4.9.2 bug
oops, changed in wrong place
Dmitry Stogov [Thu, 1 Dec 2016 12:46:52 +0000 (15:46 +0300)]
Workaround for GCC-4.9.2 bug
Anatol Belski [Thu, 1 Dec 2016 12:32:10 +0000 (13:32 +0100)]
improve skipif
Dmitry Stogov [Thu, 1 Dec 2016 07:30:02 +0000 (10:30 +0300)]
Simpler overflow check