]>
granicus.if.org Git - php/log
Yasuo Ohgaki [Fri, 23 Dec 2016 23:50:28 +0000 (08:50 +0900)]
Fix tests for appveyor
Bob Weinand [Thu, 22 Dec 2016 22:40:24 +0000 (23:40 +0100)]
Merge branch 'PHP-7.1'
Also inline alpn_ctx in openssl_netstream_data (no need for the extra allocation there)
Bob Weinand [Thu, 22 Dec 2016 22:34:51 +0000 (23:34 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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:31:58 +0000 (15:31 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Thu, 22 Dec 2016 14:31:39 +0000 (15:31 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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)
Anatol Belski [Thu, 22 Dec 2016 13:56:47 +0000 (14:56 +0100)]
Path handling related refactorings
Primarily related to the path handling datatypes, to avoid unnecessary
casts, where possible. Also some rework to avoid code dup. Probably
more places are to go, even not path related, primarily to have less
casts and unsigned integers where possible. That way, we've not only
less warnings and casts, but are also safer with regard to the
integer overflows. OFC it's not a panacea, but still significantly
reduces the vulnerability potential.
Anatol Belski [Thu, 22 Dec 2016 13:32:02 +0000 (14:32 +0100)]
Finish remaining replacement uint => uint32_t
Tthe core should be normalized now, no uints anymore
Nikita Popov [Thu, 22 Dec 2016 11:47:50 +0000 (12:47 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 22 Dec 2016 11:47:29 +0000 (12:47 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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.
Anatol Belski [Thu, 22 Dec 2016 11:40:58 +0000 (12:40 +0100)]
fix min supported versions
Yasuo Ohgaki [Thu, 22 Dec 2016 07:03:55 +0000 (16:03 +0900)]
Update NEWS
Yasuo Ohgaki [Thu, 22 Dec 2016 06:57:53 +0000 (15:57 +0900)]
Fix bug #73100 - Improve bug fix. Forbid to set 'user' save handler other than set_save_handler().
Kalle Sommer Nielsen [Thu, 22 Dec 2016 05:51:18 +0000 (06:51 +0100)]
Eliminate win95nt.h
- Most of this is builtin php.h now
- Removed some dead defines
- We now pass /D _USE_MATH_DEFINES for M_PI etc
Kalle Sommer Nielsen [Thu, 22 Dec 2016 04:53:13 +0000 (05:53 +0100)]
Hmm actually it seems to be the other way around, Anatol?
Kalle Sommer Nielsen [Thu, 22 Dec 2016 04:47:00 +0000 (05:47 +0100)]
Merge branch 'master' of git.php.net:php-src
Kalle Sommer Nielsen [Thu, 22 Dec 2016 04:46:12 +0000 (05:46 +0100)]
Sync the default value of --with-odbcver with the hardcoded default for ODBCVER
Anatol Belski [Thu, 22 Dec 2016 01:17:55 +0000 (02:17 +0100)]
move the defs to the right place
Bob Weinand [Wed, 21 Dec 2016 23:42:05 +0000 (00:42 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Wed, 21 Dec 2016 23:40:54 +0000 (00:40 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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 21:12:17 +0000 (22:12 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 21 Dec 2016 21:11:17 +0000 (22:11 +0100)]
Fix string extension in negate_num_string
Forgot to actually assign the reallocated string...
Nikita Popov [Wed, 21 Dec 2016 20:28:36 +0000 (21:28 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 21 Dec 2016 20:28:29 +0000 (21:28 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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.
Nikita Popov [Wed, 21 Dec 2016 20:19:28 +0000 (21:19 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 18 Dec 2016 16:13:21 +0000 (17:13 +0100)]
Drop some dead code in ext/reflection
Nikita Popov [Wed, 21 Dec 2016 20:18:55 +0000 (21:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
David Walker [Tue, 20 Dec 2016 22:48:43 +0000 (15:48 -0700)]
Fix #73753 - Unpacked Arrays and Duplication
Anatol Belski [Wed, 21 Dec 2016 17:00:45 +0000 (18:00 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
add folds
fix possible null dereference
Anatol Belski [Wed, 21 Dec 2016 16:59:45 +0000 (17:59 +0100)]
add folds
Anatol Belski [Wed, 21 Dec 2016 16:58:34 +0000 (17:58 +0100)]
fix possible null dereference
Anatol Belski [Wed, 21 Dec 2016 15:10:38 +0000 (16:10 +0100)]
add UPGRADING and NEWS items
Anatol Belski [Wed, 21 Dec 2016 14:59:45 +0000 (15:59 +0100)]
Raise the supported API to win7/server 2008r2
Xinchen Hui [Wed, 21 Dec 2016 06:27:13 +0000 (14:27 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt)
Xinchen Hui [Wed, 21 Dec 2016 06:24:14 +0000 (14:24 +0800)]
Revert "Reorder the oplines" (Break Zend/tests/return_types/bug71092.phpt)
This reverts commit
a12f43ee2c3d27a7eb9a3c873901643df5f7197e .
Bob Weinand [Wed, 21 Dec 2016 01:43:04 +0000 (02:43 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Wed, 21 Dec 2016 01:42:38 +0000 (02:42 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Wed, 21 Dec 2016 01:42:23 +0000 (02:42 +0100)]
Fix issue with -- in phpdbg command line
Yasuo Ohgaki [Tue, 20 Dec 2016 23:16:38 +0000 (08:16 +0900)]
Update NEWS and UPGRADING
Yasuo Ohgaki [Tue, 20 Dec 2016 23:07:49 +0000 (08:07 +0900)]
Merge branch 'pull-request/2233'
* pull-request/2233:
Remove "register_globals" support codes from php/php_binary serializers. As a result, users may use PS_UNDEF_MAKER(=!) char for session variable name.
Yasuo Ohgaki [Wed, 7 Dec 2016 09:23:11 +0000 (18:23 +0900)]
Remove "register_globals" support codes from php/php_binary serializers.
As a result, users may use PS_UNDEF_MAKER(=!) char for session variable name.
Bob Weinand [Tue, 20 Dec 2016 19:18:53 +0000 (20:18 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Tue, 20 Dec 2016 19:18:36 +0000 (20:18 +0100)]
Fixed bug #73794 (Crash (out of memory) when using run and # command separator)
Bob Weinand [Tue, 20 Dec 2016 18:49:25 +0000 (19:49 +0100)]
Merge branch 'PHP-7.1'
Bob Weinand [Tue, 20 Dec 2016 18:48:59 +0000 (19:48 +0100)]
Fix segfault in ZTS mode when just printing and exiting in phpdbg
Adam Baratz [Tue, 20 Dec 2016 14:59:39 +0000 (09:59 -0500)]
Add "Sent SQL" to debug dump for emulated prepares
Adam Baratz [Tue, 20 Dec 2016 14:58:50 +0000 (09:58 -0500)]
Remove PDOStatement::activeQueryString()
Dmitry Stogov [Tue, 20 Dec 2016 13:54:53 +0000 (16:54 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Dmitry Stogov [Tue, 20 Dec 2016 13:54:28 +0000 (16:54 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73792 (invalid foreach loop hangs script)
Fixed bug #73789 (Strange behavior of class constants in switch/case block)
Dmitry Stogov [Tue, 20 Dec 2016 13:53:06 +0000 (16:53 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73792 (invalid foreach loop hangs script)
Dmitry Stogov [Tue, 20 Dec 2016 13:48:57 +0000 (16:48 +0300)]
Fixed bug #73792 (invalid foreach loop hangs script)
Xinchen Hui [Tue, 20 Dec 2016 13:01:38 +0000 (21:01 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73789 (Strange behavior of class constants in switch/case block)
Xinchen Hui [Tue, 20 Dec 2016 13:01:21 +0000 (21:01 +0800)]
Fixed bug #73789 (Strange behavior of class constants in switch/case block)
Anatol Belski [Tue, 20 Dec 2016 01:44:40 +0000 (02:44 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
deliver the real cp also if a constant is passed
Anatol Belski [Tue, 20 Dec 2016 01:40:44 +0000 (02:40 +0100)]
deliver the real cp also if a constant is passed
Dmitry Stogov [Mon, 19 Dec 2016 12:36:37 +0000 (15:36 +0300)]
Few micro-optimizations
Dmitry Stogov [Mon, 19 Dec 2016 08:13:21 +0000 (11:13 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed arginfo
Dmitry Stogov [Mon, 19 Dec 2016 08:13:02 +0000 (11:13 +0300)]
Fixed arginfo
Anatol Belski [Mon, 19 Dec 2016 00:10:58 +0000 (01:10 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
update NEWS
update NEWS
Compatibility with Firebird & Oracle select syntax.
Anatol Belski [Mon, 19 Dec 2016 00:08:44 +0000 (01:08 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
update NEWS
Compatibility with Firebird & Oracle select syntax.
Anatol Belski [Mon, 19 Dec 2016 00:08:19 +0000 (01:08 +0100)]
update NEWS
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:53:17 +0000 (00:53 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix proto
Anatol Belski [Sun, 18 Dec 2016 23:52:01 +0000 (00:52 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 18 Dec 2016 23:50:29 +0000 (00:50 +0100)]
fix proto
Anatol Belski [Sun, 18 Dec 2016 20:56:56 +0000 (21:56 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Cursor is not opened on singleton selects.
fix arg spec and datatype, follow up on 73594
Anatol Belski [Sun, 18 Dec 2016 20:55:30 +0000 (21:55 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Cursor is not opened on singleton selects.
fix arg spec and datatype, follow up on 73594
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
Anatol Belski [Sun, 18 Dec 2016 19:54:27 +0000 (20:54 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73594
Anatol Belski [Sun, 18 Dec 2016 19:47:02 +0000 (20:47 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #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:11:01 +0000 (17:11 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 18 Dec 2016 16:10:54 +0000 (17:10 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 18 Dec 2016 16:10:19 +0000 (17:10 +0100)]
Fix bug #46103
Nikita Popov [Sun, 18 Dec 2016 13:58:49 +0000 (14:58 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 18 Dec 2016 13:58:38 +0000 (14:58 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
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 [Sun, 18 Dec 2016 00:11:28 +0000 (01:11 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
extend UPGRADING
update NEWS
Anatol Belski [Sun, 18 Dec 2016 00:08:58 +0000 (01:08 +0100)]
extend UPGRADING
Anatol Belski [Sun, 18 Dec 2016 00:03:00 +0000 (01:03 +0100)]
update NEWS
Anatol Belski [Sat, 17 Dec 2016 19:47:05 +0000 (20:47 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix C89 compat
Anatol Belski [Sat, 17 Dec 2016 19:46:09 +0000 (20:46 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix C89 compat
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:15:32 +0000 (13:15 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
replace default appveyor build version
Anatol Belski [Sat, 17 Dec 2016 12:14:12 +0000 (13:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
replace default appveyor build version
Anatol Belski [Sat, 17 Dec 2016 12:12:34 +0000 (13:12 +0100)]
replace default appveyor build version
Xinchen Hui [Sat, 17 Dec 2016 12:09:49 +0000 (20:09 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Reorder the oplines
Xinchen Hui [Sat, 17 Dec 2016 12:09:34 +0000 (20:09 +0800)]
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 Appveyor fast_fail
improve error check
turn mcrypt back on for Appveyor runs
add build status badge
add scripts for AppVeyor integration
Silence warning from unhandled enum
fix leaking streams and memory mapped files
turn mcrypt back on for Appveyor runs
add build status badge
add scripts for AppVeyor integration
Silence warning from unhandled enum
fix leaking streams and memory mapped files
Fix stack management in ini scanner
chance CLI codepage, only when SAPI is initialized
Xinchen Hui [Sat, 17 Dec 2016 12:06:18 +0000 (20:06 +0800)]
Reorder the oplines
1. we should only do the return type checking when it is really about to
return
2. for 029.php, actually, the exception threw should be discard while it
jmp into finally(it could be observed by change the return to return an array)
3. after this fix, the test 029.phpt behavior consistently with 7.0
4. good for optimizer too
Anatol Belski [Sat, 17 Dec 2016 10:27:51 +0000 (11:27 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
add Appveyor fast_fail
improve error check
Anatol Belski [Sat, 17 Dec 2016 10:27:17 +0000 (11:27 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
add Appveyor fast_fail
improve error check
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